guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. v2.1.0-310-gb8bc86b


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, master, updated. v2.1.0-310-gb8bc86b
Date: Fri, 22 Jun 2012 16:55:37 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=b8bc86bce147cf280ca2a60d36c8b6493cbf11e8

The branch, master has been updated
       via  b8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (commit)
       via  afc74c2920d2f8f8424db9d6f554a91866cbac01 (commit)
       via  83e7c58408ad227b38cc8c2e0542a514ebcdc2c8 (commit)
      from  0dd7c5407599b65a1a3da4b9bd8feccc715b51f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 doc/ref/compiler.texi                 |   27 +-
 libguile/Makefile.am                  |    1 +
 libguile/elf.h                        | 2794 +++++++++++++++++++++++++++++++++
 libguile/objcodes.c                   |  796 +++++++---
 libguile/objcodes.h                   |   12 +-
 libguile/vm.c                         |    7 +-
 module/Makefile.am                    |    4 +-
 module/language/bytecode/spec.scm     |    7 +-
 module/language/objcode/elf.scm       |   94 ++
 module/language/objcode/spec.scm      |    1 +
 module/scripts/disassemble.scm        |    4 +-
 module/system/repl/command.scm        |    4 +-
 module/system/vm/elf.scm              | 1255 +++++++++++++++
 module/system/vm/objcode.scm          |    4 +-
 test-suite/tests/asm-to-bytecode.test |   24 +-
 15 files changed, 4753 insertions(+), 281 deletions(-)
 create mode 100644 libguile/elf.h
 create mode 100644 module/language/objcode/elf.scm
 create mode 100644 module/system/vm/elf.scm

diff --git a/doc/ref/compiler.texi b/doc/ref/compiler.texi
index 692cb36..d95cd02 100644
--- a/doc/ref/compiler.texi
+++ b/doc/ref/compiler.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  2008, 2009, 2010, 2011
address@hidden Copyright (C)  2008, 2009, 2010, 2011, 2012
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -800,29 +800,36 @@ objcode)} module.
 Returns @code{#f} iff @var{obj} is object code, @code{#f} otherwise.
 @end deffn
 
address@hidden {Scheme Procedure} bytecode->objcode bytecode
address@hidden {Scheme Procedure} bytecode->objcode bytecode [endianness]
 @deffnx {C Function} scm_bytecode_to_objcode (bytecode)
 Makes a bytecode object from @var{bytecode}, which should be a
-bytevector. @xref{Bytevectors}.
+bytevector. @xref{Bytevectors}.  By default, the embedded length fields
+in the bytevector are interpreted in the native byte order.
 @end deffn
 
address@hidden {Scheme Variable} load-objcode file
address@hidden {C Function} scm_load_objcode (file)
address@hidden {Scheme Variable} load-thunk-from-file file
address@hidden {C Function} scm_load_thunk_from_file (file)
 Load object code from a file named @var{file}. The file will be mapped
 into memory via @code{mmap}, so this is a very fast operation.
 
-On disk, object code has an sixteen-byte cookie prepended to it, to
-prevent accidental loading of arbitrary garbage.
+On disk, object code is embedded in ELF, a flexible container format
+created for use in UNIX systems.  Guile has its own ELF linker and
+loader, so it uses the ELF format on all systems.
 @end deffn
 
 @deffn {Scheme Variable} write-objcode objcode file
 @deffnx {C Function} scm_write_objcode (objcode)
-Write object code out to a file, prepending the sixteen-byte cookie.
+Embed object code into an ELF container, and write it out to a file.
+
+This procedure is part of a separate module, @code{(language objcode
+elf)}.
 @end deffn
 
address@hidden {Scheme Variable} objcode->bytecode objcode
address@hidden {Scheme Variable} objcode->bytecode objcode [endianness]
 @deffnx {C Function} scm_objcode_to_bytecode (objcode)
-Copy object code out to a bytevector for analysis by Scheme.
+Copy object code out to a bytevector for analysis by Scheme.  By
+default, the length fields in the @code{struct scm_objcode} are
+interpreted in the native byte order.
 @end deffn
 
 The following procedure is actually in @code{(system vm program)}, but
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 68d503e..e098825 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -455,6 +455,7 @@ install-exec-hook:
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
 noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c            \
+                 elf.h                                         \
                  srfi-14.i.c                                   \
                  quicksort.i.c                                  \
                  win32-uname.h win32-socket.h                  \
diff --git a/libguile/elf.h b/libguile/elf.h
new file mode 100644
index 0000000..9d53721
--- /dev/null
+++ b/libguile/elf.h
@@ -0,0 +1,2794 @@
+/* This file defines standard ELF types, structures, and macros.
+   Copyright (C) 1995-2003,2004,2005,2006,2007,2008,2009,2010
+       Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _ELF_H
+#define        _ELF_H 1
+
+/* Standard ELF types.  */
+
+#include <stdint.h>
+
+/* Type for a 16-bit quantity.  */
+typedef uint16_t Elf32_Half;
+typedef uint16_t Elf64_Half;
+
+/* Types for signed and unsigned 32-bit quantities.  */
+typedef uint32_t Elf32_Word;
+typedef        int32_t  Elf32_Sword;
+typedef uint32_t Elf64_Word;
+typedef        int32_t  Elf64_Sword;
+
+/* Types for signed and unsigned 64-bit quantities.  */
+typedef uint64_t Elf32_Xword;
+typedef        int64_t  Elf32_Sxword;
+typedef uint64_t Elf64_Xword;
+typedef        int64_t  Elf64_Sxword;
+
+/* Type of addresses.  */
+typedef uint32_t Elf32_Addr;
+typedef uint64_t Elf64_Addr;
+
+/* Type of file offsets.  */
+typedef uint32_t Elf32_Off;
+typedef uint64_t Elf64_Off;
+
+/* Type for section indices, which are 16-bit quantities.  */
+typedef uint16_t Elf32_Section;
+typedef uint16_t Elf64_Section;
+
+/* Type for version symbol information.  */
+typedef Elf32_Half Elf32_Versym;
+typedef Elf64_Half Elf64_Versym;
+
+
+/* The ELF file header.  This appears at the start of every ELF file.  */
+
+#define EI_NIDENT (16)
+
+typedef struct
+{
+  unsigned char        e_ident[EI_NIDENT];     /* Magic number and other info 
*/
+  Elf32_Half   e_type;                 /* Object file type */
+  Elf32_Half   e_machine;              /* Architecture */
+  Elf32_Word   e_version;              /* Object file version */
+  Elf32_Addr   e_entry;                /* Entry point virtual address */
+  Elf32_Off    e_phoff;                /* Program header table file offset */
+  Elf32_Off    e_shoff;                /* Section header table file offset */
+  Elf32_Word   e_flags;                /* Processor-specific flags */
+  Elf32_Half   e_ehsize;               /* ELF header size in bytes */
+  Elf32_Half   e_phentsize;            /* Program header table entry size */
+  Elf32_Half   e_phnum;                /* Program header table entry count */
+  Elf32_Half   e_shentsize;            /* Section header table entry size */
+  Elf32_Half   e_shnum;                /* Section header table entry count */
+  Elf32_Half   e_shstrndx;             /* Section header string table index */
+} Elf32_Ehdr;
+
+typedef struct
+{
+  unsigned char        e_ident[EI_NIDENT];     /* Magic number and other info 
*/
+  Elf64_Half   e_type;                 /* Object file type */
+  Elf64_Half   e_machine;              /* Architecture */
+  Elf64_Word   e_version;              /* Object file version */
+  Elf64_Addr   e_entry;                /* Entry point virtual address */
+  Elf64_Off    e_phoff;                /* Program header table file offset */
+  Elf64_Off    e_shoff;                /* Section header table file offset */
+  Elf64_Word   e_flags;                /* Processor-specific flags */
+  Elf64_Half   e_ehsize;               /* ELF header size in bytes */
+  Elf64_Half   e_phentsize;            /* Program header table entry size */
+  Elf64_Half   e_phnum;                /* Program header table entry count */
+  Elf64_Half   e_shentsize;            /* Section header table entry size */
+  Elf64_Half   e_shnum;                /* Section header table entry count */
+  Elf64_Half   e_shstrndx;             /* Section header string table index */
+} Elf64_Ehdr;
+
+/* Fields in the e_ident array.  The EI_* macros are indices into the
+   array.  The macros under each EI_* macro are the values the byte
+   may have.  */
+
+#define EI_MAG0                0               /* File identification byte 0 
index */
+#define ELFMAG0                0x7f            /* Magic number byte 0 */
+
+#define EI_MAG1                1               /* File identification byte 1 
index */
+#define ELFMAG1                'E'             /* Magic number byte 1 */
+
+#define EI_MAG2                2               /* File identification byte 2 
index */
+#define ELFMAG2                'L'             /* Magic number byte 2 */
+
+#define EI_MAG3                3               /* File identification byte 3 
index */
+#define ELFMAG3                'F'             /* Magic number byte 3 */
+
+/* Conglomeration of the identification bytes, for easy testing as a word.  */
+#define        ELFMAG          "\177ELF"
+#define        SELFMAG         4
+
+#define EI_CLASS       4               /* File class byte index */
+#define ELFCLASSNONE   0               /* Invalid class */
+#define ELFCLASS32     1               /* 32-bit objects */
+#define ELFCLASS64     2               /* 64-bit objects */
+#define ELFCLASSNUM    3
+
+#define EI_DATA                5               /* Data encoding byte index */
+#define ELFDATANONE    0               /* Invalid data encoding */
+#define ELFDATA2LSB    1               /* 2's complement, little endian */
+#define ELFDATA2MSB    2               /* 2's complement, big endian */
+#define ELFDATANUM     3
+
+#define EI_VERSION     6               /* File version byte index */
+                                       /* Value must be EV_CURRENT */
+
+#define EI_OSABI       7               /* OS ABI identification */
+#define ELFOSABI_NONE          0       /* UNIX System V ABI */
+#define ELFOSABI_SYSV          0       /* Alias.  */
+#define ELFOSABI_HPUX          1       /* HP-UX */
+#define ELFOSABI_NETBSD                2       /* NetBSD.  */
+#define ELFOSABI_GNU           3       /* GNU.  */
+#define ELFOSABI_LINUX         3       /* Alias for ELFOSABI_GNU.  */
+#define ELFOSABI_SOLARIS       6       /* Sun Solaris.  */
+#define ELFOSABI_AIX           7       /* IBM AIX.  */
+#define ELFOSABI_IRIX          8       /* SGI Irix.  */
+#define ELFOSABI_FREEBSD       9       /* FreeBSD.  */
+#define ELFOSABI_TRU64         10      /* Compaq TRU64 UNIX.  */
+#define ELFOSABI_MODESTO       11      /* Novell Modesto.  */
+#define ELFOSABI_OPENBSD       12      /* OpenBSD.  */
+#define ELFOSABI_ARM_AEABI     64      /* ARM EABI */
+#define ELFOSABI_ARM           97      /* ARM */
+#define ELFOSABI_STANDALONE    255     /* Standalone (embedded) application */
+
+#define EI_ABIVERSION  8               /* ABI version */
+
+#define EI_PAD         9               /* Byte index of padding bytes */
+
+/* Legal values for e_type (object file type).  */
+
+#define ET_NONE                0               /* No file type */
+#define ET_REL         1               /* Relocatable file */
+#define ET_EXEC                2               /* Executable file */
+#define ET_DYN         3               /* Shared object file */
+#define ET_CORE                4               /* Core file */
+#define        ET_NUM          5               /* Number of defined types */
+#define ET_LOOS                0xfe00          /* OS-specific range start */
+#define ET_HIOS                0xfeff          /* OS-specific range end */
+#define ET_LOPROC      0xff00          /* Processor-specific range start */
+#define ET_HIPROC      0xffff          /* Processor-specific range end */
+
+/* Legal values for e_machine (architecture).  */
+
+#define EM_NONE                 0              /* No machine */
+#define EM_M32          1              /* AT&T WE 32100 */
+#define EM_SPARC        2              /* SUN SPARC */
+#define EM_386          3              /* Intel 80386 */
+#define EM_68K          4              /* Motorola m68k family */
+#define EM_88K          5              /* Motorola m88k family */
+#define EM_860          7              /* Intel 80860 */
+#define EM_MIPS                 8              /* MIPS R3000 big-endian */
+#define EM_S370                 9              /* IBM System/370 */
+#define EM_MIPS_RS3_LE 10              /* MIPS R3000 little-endian */
+
+#define EM_PARISC      15              /* HPPA */
+#define EM_VPP500      17              /* Fujitsu VPP500 */
+#define EM_SPARC32PLUS 18              /* Sun's "v8plus" */
+#define EM_960         19              /* Intel 80960 */
+#define EM_PPC         20              /* PowerPC */
+#define EM_PPC64       21              /* PowerPC 64-bit */
+#define EM_S390                22              /* IBM S390 */
+
+#define EM_V800                36              /* NEC V800 series */
+#define EM_FR20                37              /* Fujitsu FR20 */
+#define EM_RH32                38              /* TRW RH-32 */
+#define EM_RCE         39              /* Motorola RCE */
+#define EM_ARM         40              /* ARM */
+#define EM_FAKE_ALPHA  41              /* Digital Alpha */
+#define EM_SH          42              /* Hitachi SH */
+#define EM_SPARCV9     43              /* SPARC v9 64-bit */
+#define EM_TRICORE     44              /* Siemens Tricore */
+#define EM_ARC         45              /* Argonaut RISC Core */
+#define EM_H8_300      46              /* Hitachi H8/300 */
+#define EM_H8_300H     47              /* Hitachi H8/300H */
+#define EM_H8S         48              /* Hitachi H8S */
+#define EM_H8_500      49              /* Hitachi H8/500 */
+#define EM_IA_64       50              /* Intel Merced */
+#define EM_MIPS_X      51              /* Stanford MIPS-X */
+#define EM_COLDFIRE    52              /* Motorola Coldfire */
+#define EM_68HC12      53              /* Motorola M68HC12 */
+#define EM_MMA         54              /* Fujitsu MMA Multimedia Accelerator*/
+#define EM_PCP         55              /* Siemens PCP */
+#define EM_NCPU                56              /* Sony nCPU embeeded RISC */
+#define EM_NDR1                57              /* Denso NDR1 microprocessor */
+#define EM_STARCORE    58              /* Motorola Start*Core processor */
+#define EM_ME16                59              /* Toyota ME16 processor */
+#define EM_ST100       60              /* STMicroelectronic ST100 processor */
+#define EM_TINYJ       61              /* Advanced Logic Corp. Tinyj emb.fam*/
+#define EM_X86_64      62              /* AMD x86-64 architecture */
+#define EM_PDSP                63              /* Sony DSP Processor */
+
+#define EM_FX66                66              /* Siemens FX66 microcontroller 
*/
+#define EM_ST9PLUS     67              /* STMicroelectronics ST9+ 8/16 mc */
+#define EM_ST7         68              /* STmicroelectronics ST7 8 bit mc */
+#define EM_68HC16      69              /* Motorola MC68HC16 microcontroller */
+#define EM_68HC11      70              /* Motorola MC68HC11 microcontroller */
+#define EM_68HC08      71              /* Motorola MC68HC08 microcontroller */
+#define EM_68HC05      72              /* Motorola MC68HC05 microcontroller */
+#define EM_SVX         73              /* Silicon Graphics SVx */
+#define EM_ST19                74              /* STMicroelectronics ST19 8 
bit mc */
+#define EM_VAX         75              /* Digital VAX */
+#define EM_CRIS                76              /* Axis Communications 32-bit 
embedded processor */
+#define EM_JAVELIN     77              /* Infineon Technologies 32-bit 
embedded processor */
+#define EM_FIREPATH    78              /* Element 14 64-bit DSP Processor */
+#define EM_ZSP         79              /* LSI Logic 16-bit DSP Processor */
+#define EM_MMIX                80              /* Donald Knuth's educational 
64-bit processor */
+#define EM_HUANY       81              /* Harvard University 
machine-independent object files */
+#define EM_PRISM       82              /* SiTera Prism */
+#define EM_AVR         83              /* Atmel AVR 8-bit microcontroller */
+#define EM_FR30                84              /* Fujitsu FR30 */
+#define EM_D10V                85              /* Mitsubishi D10V */
+#define EM_D30V                86              /* Mitsubishi D30V */
+#define EM_V850                87              /* NEC v850 */
+#define EM_M32R                88              /* Mitsubishi M32R */
+#define EM_MN10300     89              /* Matsushita MN10300 */
+#define EM_MN10200     90              /* Matsushita MN10200 */
+#define EM_PJ          91              /* picoJava */
+#define EM_OPENRISC    92              /* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5      93              /* ARC Cores Tangent-A5 */
+#define EM_XTENSA      94              /* Tensilica Xtensa Architecture */
+#define EM_NUM         95
+
+/* If it is necessary to assign new unofficial EM_* values, please
+   pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
+   chances of collision with official or non-GNU unofficial values.  */
+
+#define EM_ALPHA       0x9026
+
+/* Legal values for e_version (version).  */
+
+#define EV_NONE                0               /* Invalid ELF version */
+#define EV_CURRENT     1               /* Current version */
+#define EV_NUM         2
+
+/* Section header.  */
+
+typedef struct
+{
+  Elf32_Word   sh_name;                /* Section name (string tbl index) */
+  Elf32_Word   sh_type;                /* Section type */
+  Elf32_Word   sh_flags;               /* Section flags */
+  Elf32_Addr   sh_addr;                /* Section virtual addr at execution */
+  Elf32_Off    sh_offset;              /* Section file offset */
+  Elf32_Word   sh_size;                /* Section size in bytes */
+  Elf32_Word   sh_link;                /* Link to another section */
+  Elf32_Word   sh_info;                /* Additional section information */
+  Elf32_Word   sh_addralign;           /* Section alignment */
+  Elf32_Word   sh_entsize;             /* Entry size if section holds table */
+} Elf32_Shdr;
+
+typedef struct
+{
+  Elf64_Word   sh_name;                /* Section name (string tbl index) */
+  Elf64_Word   sh_type;                /* Section type */
+  Elf64_Xword  sh_flags;               /* Section flags */
+  Elf64_Addr   sh_addr;                /* Section virtual addr at execution */
+  Elf64_Off    sh_offset;              /* Section file offset */
+  Elf64_Xword  sh_size;                /* Section size in bytes */
+  Elf64_Word   sh_link;                /* Link to another section */
+  Elf64_Word   sh_info;                /* Additional section information */
+  Elf64_Xword  sh_addralign;           /* Section alignment */
+  Elf64_Xword  sh_entsize;             /* Entry size if section holds table */
+} Elf64_Shdr;
+
+/* Special section indices.  */
+
+#define SHN_UNDEF      0               /* Undefined section */
+#define SHN_LORESERVE  0xff00          /* Start of reserved indices */
+#define SHN_LOPROC     0xff00          /* Start of processor-specific */
+#define SHN_BEFORE     0xff00          /* Order section before all others
+                                          (Solaris).  */
+#define SHN_AFTER      0xff01          /* Order section after all others
+                                          (Solaris).  */
+#define SHN_HIPROC     0xff1f          /* End of processor-specific */
+#define SHN_LOOS       0xff20          /* Start of OS-specific */
+#define SHN_HIOS       0xff3f          /* End of OS-specific */
+#define SHN_ABS                0xfff1          /* Associated symbol is 
absolute */
+#define SHN_COMMON     0xfff2          /* Associated symbol is common */
+#define SHN_XINDEX     0xffff          /* Index is in extra table.  */
+#define SHN_HIRESERVE  0xffff          /* End of reserved indices */
+
+/* Legal values for sh_type (section type).  */
+
+#define SHT_NULL         0             /* Section header table entry unused */
+#define SHT_PROGBITS     1             /* Program data */
+#define SHT_SYMTAB       2             /* Symbol table */
+#define SHT_STRTAB       3             /* String table */
+#define SHT_RELA         4             /* Relocation entries with addends */
+#define SHT_HASH         5             /* Symbol hash table */
+#define SHT_DYNAMIC      6             /* Dynamic linking information */
+#define SHT_NOTE         7             /* Notes */
+#define SHT_NOBITS       8             /* Program space with no data (bss) */
+#define SHT_REL                  9             /* Relocation entries, no 
addends */
+#define SHT_SHLIB        10            /* Reserved */
+#define SHT_DYNSYM       11            /* Dynamic linker symbol table */
+#define SHT_INIT_ARRAY   14            /* Array of constructors */
+#define SHT_FINI_ARRAY   15            /* Array of destructors */
+#define SHT_PREINIT_ARRAY 16           /* Array of pre-constructors */
+#define SHT_GROUP        17            /* Section group */
+#define SHT_SYMTAB_SHNDX  18           /* Extended section indeces */
+#define        SHT_NUM           19            /* Number of defined types.  */
+#define SHT_LOOS         0x60000000    /* Start OS-specific.  */
+#define SHT_GNU_ATTRIBUTES 0x6ffffff5  /* Object attributes.  */
+#define SHT_GNU_HASH     0x6ffffff6    /* GNU-style hash table.  */
+#define SHT_GNU_LIBLIST          0x6ffffff7    /* Prelink library list */
+#define SHT_CHECKSUM     0x6ffffff8    /* Checksum for DSO content.  */
+#define SHT_LOSUNW       0x6ffffffa    /* Sun-specific low bound.  */
+#define SHT_SUNW_move    0x6ffffffa
+#define SHT_SUNW_COMDAT   0x6ffffffb
+#define SHT_SUNW_syminfo  0x6ffffffc
+#define SHT_GNU_verdef   0x6ffffffd    /* Version definition section.  */
+#define SHT_GNU_verneed          0x6ffffffe    /* Version needs section.  */
+#define SHT_GNU_versym   0x6fffffff    /* Version symbol table.  */
+#define SHT_HISUNW       0x6fffffff    /* Sun-specific high bound.  */
+#define SHT_HIOS         0x6fffffff    /* End OS-specific type */
+#define SHT_LOPROC       0x70000000    /* Start of processor-specific */
+#define SHT_HIPROC       0x7fffffff    /* End of processor-specific */
+#define SHT_LOUSER       0x80000000    /* Start of application-specific */
+#define SHT_HIUSER       0x8fffffff    /* End of application-specific */
+
+/* Legal values for sh_flags (section flags).  */
+
+#define SHF_WRITE           (1 << 0)   /* Writable */
+#define SHF_ALLOC           (1 << 1)   /* Occupies memory during execution */
+#define SHF_EXECINSTR       (1 << 2)   /* Executable */
+#define SHF_MERGE           (1 << 4)   /* Might be merged */
+#define SHF_STRINGS         (1 << 5)   /* Contains nul-terminated strings */
+#define SHF_INFO_LINK       (1 << 6)   /* `sh_info' contains SHT index */
+#define SHF_LINK_ORDER      (1 << 7)   /* Preserve order after combining */
+#define SHF_OS_NONCONFORMING (1 << 8)  /* Non-standard OS specific handling
+                                          required */
+#define SHF_GROUP           (1 << 9)   /* Section is member of a group.  */
+#define SHF_TLS                     (1 << 10)  /* Section hold thread-local 
data.  */
+#define SHF_MASKOS          0x0ff00000 /* OS-specific.  */
+#define SHF_MASKPROC        0xf0000000 /* Processor-specific */
+#define SHF_ORDERED         (1 << 30)  /* Special ordering requirement
+                                          (Solaris).  */
+#define SHF_EXCLUDE         (1 << 31)  /* Section is excluded unless
+                                          referenced or allocated (Solaris).*/
+
+/* Section group handling.  */
+#define GRP_COMDAT     0x1             /* Mark group as COMDAT.  */
+
+/* Symbol table entry.  */
+
+typedef struct
+{
+  Elf32_Word   st_name;                /* Symbol name (string tbl index) */
+  Elf32_Addr   st_value;               /* Symbol value */
+  Elf32_Word   st_size;                /* Symbol size */
+  unsigned char        st_info;                /* Symbol type and binding */
+  unsigned char        st_other;               /* Symbol visibility */
+  Elf32_Section        st_shndx;               /* Section index */
+} Elf32_Sym;
+
+typedef struct
+{
+  Elf64_Word   st_name;                /* Symbol name (string tbl index) */
+  unsigned char        st_info;                /* Symbol type and binding */
+  unsigned char st_other;              /* Symbol visibility */
+  Elf64_Section        st_shndx;               /* Section index */
+  Elf64_Addr   st_value;               /* Symbol value */
+  Elf64_Xword  st_size;                /* Symbol size */
+} Elf64_Sym;
+
+/* The syminfo section if available contains additional information about
+   every dynamic symbol.  */
+
+typedef struct
+{
+  Elf32_Half si_boundto;               /* Direct bindings, symbol bound to */
+  Elf32_Half si_flags;                 /* Per symbol flags */
+} Elf32_Syminfo;
+
+typedef struct
+{
+  Elf64_Half si_boundto;               /* Direct bindings, symbol bound to */
+  Elf64_Half si_flags;                 /* Per symbol flags */
+} Elf64_Syminfo;
+
+/* Possible values for si_boundto.  */
+#define SYMINFO_BT_SELF                0xffff  /* Symbol bound to self */
+#define SYMINFO_BT_PARENT      0xfffe  /* Symbol bound to parent */
+#define SYMINFO_BT_LOWRESERVE  0xff00  /* Beginning of reserved entries */
+
+/* Possible bitmasks for si_flags.  */
+#define SYMINFO_FLG_DIRECT     0x0001  /* Direct bound symbol */
+#define SYMINFO_FLG_PASSTHRU   0x0002  /* Pass-thru symbol for translator */
+#define SYMINFO_FLG_COPY       0x0004  /* Symbol is a copy-reloc */
+#define SYMINFO_FLG_LAZYLOAD   0x0008  /* Symbol bound to object to be lazy
+                                          loaded */
+/* Syminfo version values.  */
+#define SYMINFO_NONE           0
+#define SYMINFO_CURRENT                1
+#define SYMINFO_NUM            2
+
+
+/* How to extract and insert information held in the st_info field.  */
+
+#define ELF32_ST_BIND(val)             (((unsigned char) (val)) >> 4)
+#define ELF32_ST_TYPE(val)             ((val) & 0xf)
+#define ELF32_ST_INFO(bind, type)      (((bind) << 4) + ((type) & 0xf))
+
+/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field.  */
+#define ELF64_ST_BIND(val)             ELF32_ST_BIND (val)
+#define ELF64_ST_TYPE(val)             ELF32_ST_TYPE (val)
+#define ELF64_ST_INFO(bind, type)      ELF32_ST_INFO ((bind), (type))
+
+/* Legal values for ST_BIND subfield of st_info (symbol binding).  */
+
+#define STB_LOCAL      0               /* Local symbol */
+#define STB_GLOBAL     1               /* Global symbol */
+#define STB_WEAK       2               /* Weak symbol */
+#define        STB_NUM         3               /* Number of defined types.  */
+#define STB_LOOS       10              /* Start of OS-specific */
+#define STB_GNU_UNIQUE 10              /* Unique symbol.  */
+#define STB_HIOS       12              /* End of OS-specific */
+#define STB_LOPROC     13              /* Start of processor-specific */
+#define STB_HIPROC     15              /* End of processor-specific */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_NOTYPE     0               /* Symbol type is unspecified */
+#define STT_OBJECT     1               /* Symbol is a data object */
+#define STT_FUNC       2               /* Symbol is a code object */
+#define STT_SECTION    3               /* Symbol associated with a section */
+#define STT_FILE       4               /* Symbol's name is file name */
+#define STT_COMMON     5               /* Symbol is a common data object */
+#define STT_TLS                6               /* Symbol is thread-local data 
object*/
+#define        STT_NUM         7               /* Number of defined types.  */
+#define STT_LOOS       10              /* Start of OS-specific */
+#define STT_GNU_IFUNC  10              /* Symbol is indirect code object */
+#define STT_HIOS       12              /* End of OS-specific */
+#define STT_LOPROC     13              /* Start of processor-specific */
+#define STT_HIPROC     15              /* End of processor-specific */
+
+
+/* Symbol table indices are found in the hash buckets and chain table
+   of a symbol hash table section.  This special index value indicates
+   the end of a chain, meaning no further symbols are found in that bucket.  */
+
+#define STN_UNDEF      0               /* End of a chain.  */
+
+
+/* How to extract and insert information held in the st_other field.  */
+
+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03)
+
+/* For ELF64 the definitions are the same.  */
+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o)
+
+/* Symbol visibility specification encoded in the st_other field.  */
+#define STV_DEFAULT    0               /* Default symbol visibility rules */
+#define STV_INTERNAL   1               /* Processor specific hidden class */
+#define STV_HIDDEN     2               /* Sym unavailable in other modules */
+#define STV_PROTECTED  3               /* Not preemptible, not exported */
+
+
+/* Relocation table entry without addend (in section of type SHT_REL).  */
+
+typedef struct
+{
+  Elf32_Addr   r_offset;               /* Address */
+  Elf32_Word   r_info;                 /* Relocation type and symbol index */
+} Elf32_Rel;
+
+/* I have seen two different definitions of the Elf64_Rel and
+   Elf64_Rela structures, so we'll leave them out until Novell (or
+   whoever) gets their act together.  */
+/* The following, at least, is used on Sparc v9, MIPS, and Alpha.  */
+
+typedef struct
+{
+  Elf64_Addr   r_offset;               /* Address */
+  Elf64_Xword  r_info;                 /* Relocation type and symbol index */
+} Elf64_Rel;
+
+/* Relocation table entry with addend (in section of type SHT_RELA).  */
+
+typedef struct
+{
+  Elf32_Addr   r_offset;               /* Address */
+  Elf32_Word   r_info;                 /* Relocation type and symbol index */
+  Elf32_Sword  r_addend;               /* Addend */
+} Elf32_Rela;
+
+typedef struct
+{
+  Elf64_Addr   r_offset;               /* Address */
+  Elf64_Xword  r_info;                 /* Relocation type and symbol index */
+  Elf64_Sxword r_addend;               /* Addend */
+} Elf64_Rela;
+
+/* How to extract and insert information held in the r_info field.  */
+
+#define ELF32_R_SYM(val)               ((val) >> 8)
+#define ELF32_R_TYPE(val)              ((val) & 0xff)
+#define ELF32_R_INFO(sym, type)                (((sym) << 8) + ((type) & 0xff))
+
+#define ELF64_R_SYM(i)                 ((i) >> 32)
+#define ELF64_R_TYPE(i)                        ((i) & 0xffffffff)
+#define ELF64_R_INFO(sym,type)         ((((Elf64_Xword) (sym)) << 32) + (type))
+
+/* Program segment header.  */
+
+typedef struct
+{
+  Elf32_Word   p_type;                 /* Segment type */
+  Elf32_Off    p_offset;               /* Segment file offset */
+  Elf32_Addr   p_vaddr;                /* Segment virtual address */
+  Elf32_Addr   p_paddr;                /* Segment physical address */
+  Elf32_Word   p_filesz;               /* Segment size in file */
+  Elf32_Word   p_memsz;                /* Segment size in memory */
+  Elf32_Word   p_flags;                /* Segment flags */
+  Elf32_Word   p_align;                /* Segment alignment */
+} Elf32_Phdr;
+
+typedef struct
+{
+  Elf64_Word   p_type;                 /* Segment type */
+  Elf64_Word   p_flags;                /* Segment flags */
+  Elf64_Off    p_offset;               /* Segment file offset */
+  Elf64_Addr   p_vaddr;                /* Segment virtual address */
+  Elf64_Addr   p_paddr;                /* Segment physical address */
+  Elf64_Xword  p_filesz;               /* Segment size in file */
+  Elf64_Xword  p_memsz;                /* Segment size in memory */
+  Elf64_Xword  p_align;                /* Segment alignment */
+} Elf64_Phdr;
+
+/* Special value for e_phnum.  This indicates that the real number of
+   program headers is too large to fit into e_phnum.  Instead the real
+   value is in the field sh_info of section 0.  */
+
+#define PN_XNUM                0xffff
+
+/* Legal values for p_type (segment type).  */
+
+#define        PT_NULL         0               /* Program header table entry 
unused */
+#define PT_LOAD                1               /* Loadable program segment */
+#define PT_DYNAMIC     2               /* Dynamic linking information */
+#define PT_INTERP      3               /* Program interpreter */
+#define PT_NOTE                4               /* Auxiliary information */
+#define PT_SHLIB       5               /* Reserved */
+#define PT_PHDR                6               /* Entry for header table 
itself */
+#define PT_TLS         7               /* Thread-local storage segment */
+#define        PT_NUM          8               /* Number of defined types */
+#define PT_LOOS                0x60000000      /* Start of OS-specific */
+#define PT_GNU_EH_FRAME        0x6474e550      /* GCC .eh_frame_hdr segment */
+#define PT_GNU_STACK   0x6474e551      /* Indicates stack executability */
+#define PT_GNU_RELRO   0x6474e552      /* Read-only after relocation */
+#define PT_LOSUNW      0x6ffffffa
+#define PT_SUNWBSS     0x6ffffffa      /* Sun Specific segment */
+#define PT_SUNWSTACK   0x6ffffffb      /* Stack segment */
+#define PT_HISUNW      0x6fffffff
+#define PT_HIOS                0x6fffffff      /* End of OS-specific */
+#define PT_LOPROC      0x70000000      /* Start of processor-specific */
+#define PT_HIPROC      0x7fffffff      /* End of processor-specific */
+
+/* Legal values for p_flags (segment flags).  */
+
+#define PF_X           (1 << 0)        /* Segment is executable */
+#define PF_W           (1 << 1)        /* Segment is writable */
+#define PF_R           (1 << 2)        /* Segment is readable */
+#define PF_MASKOS      0x0ff00000      /* OS-specific */
+#define PF_MASKPROC    0xf0000000      /* Processor-specific */
+
+/* Legal values for note segment descriptor types for core files. */
+
+#define NT_PRSTATUS    1               /* Contains copy of prstatus struct */
+#define NT_FPREGSET    2               /* Contains copy of fpregset struct */
+#define NT_PRPSINFO    3               /* Contains copy of prpsinfo struct */
+#define NT_PRXREG      4               /* Contains copy of prxregset struct */
+#define NT_TASKSTRUCT  4               /* Contains copy of task structure */
+#define NT_PLATFORM    5               /* String from sysinfo(SI_PLATFORM) */
+#define NT_AUXV                6               /* Contains copy of auxv array 
*/
+#define NT_GWINDOWS    7               /* Contains copy of gwindows struct */
+#define NT_ASRS                8               /* Contains copy of asrset 
struct */
+#define NT_PSTATUS     10              /* Contains copy of pstatus struct */
+#define NT_PSINFO      13              /* Contains copy of psinfo struct */
+#define NT_PRCRED      14              /* Contains copy of prcred struct */
+#define NT_UTSNAME     15              /* Contains copy of utsname struct */
+#define NT_LWPSTATUS   16              /* Contains copy of lwpstatus struct */
+#define NT_LWPSINFO    17              /* Contains copy of lwpinfo struct */
+#define NT_PRFPXREG    20              /* Contains copy of fprxregset struct */
+#define NT_PRXFPREG    0x46e62b7f      /* Contains copy of user_fxsr_struct */
+#define NT_PPC_VMX     0x100           /* PowerPC Altivec/VMX registers */
+#define NT_PPC_SPE     0x101           /* PowerPC SPE/EVR registers */
+#define NT_PPC_VSX     0x102           /* PowerPC VSX registers */
+#define NT_386_TLS     0x200           /* i386 TLS slots (struct user_desc) */
+#define NT_386_IOPERM  0x201           /* x86 io permission bitmap (1=deny) */
+#define NT_X86_XSTATE  0x202           /* x86 extended state using xsave */
+
+/* Legal values for the note segment descriptor types for object files.  */
+
+#define NT_VERSION     1               /* Contains a version string.  */
+
+
+/* Dynamic section entry.  */
+
+typedef struct
+{
+  Elf32_Sword  d_tag;                  /* Dynamic entry type */
+  union
+    {
+      Elf32_Word d_val;                        /* Integer value */
+      Elf32_Addr d_ptr;                        /* Address value */
+    } d_un;
+} Elf32_Dyn;
+
+typedef struct
+{
+  Elf64_Sxword d_tag;                  /* Dynamic entry type */
+  union
+    {
+      Elf64_Xword d_val;               /* Integer value */
+      Elf64_Addr d_ptr;                        /* Address value */
+    } d_un;
+} Elf64_Dyn;
+
+/* Legal values for d_tag (dynamic entry type).  */
+
+#define DT_NULL                0               /* Marks end of dynamic section 
*/
+#define DT_NEEDED      1               /* Name of needed library */
+#define DT_PLTRELSZ    2               /* Size in bytes of PLT relocs */
+#define DT_PLTGOT      3               /* Processor defined value */
+#define DT_HASH                4               /* Address of symbol hash table 
*/
+#define DT_STRTAB      5               /* Address of string table */
+#define DT_SYMTAB      6               /* Address of symbol table */
+#define DT_RELA                7               /* Address of Rela relocs */
+#define DT_RELASZ      8               /* Total size of Rela relocs */
+#define DT_RELAENT     9               /* Size of one Rela reloc */
+#define DT_STRSZ       10              /* Size of string table */
+#define DT_SYMENT      11              /* Size of one symbol table entry */
+#define DT_INIT                12              /* Address of init function */
+#define DT_FINI                13              /* Address of termination 
function */
+#define DT_SONAME      14              /* Name of shared object */
+#define DT_RPATH       15              /* Library search path (deprecated) */
+#define DT_SYMBOLIC    16              /* Start symbol search here */
+#define DT_REL         17              /* Address of Rel relocs */
+#define DT_RELSZ       18              /* Total size of Rel relocs */
+#define DT_RELENT      19              /* Size of one Rel reloc */
+#define DT_PLTREL      20              /* Type of reloc in PLT */
+#define DT_DEBUG       21              /* For debugging; unspecified */
+#define DT_TEXTREL     22              /* Reloc might modify .text */
+#define DT_JMPREL      23              /* Address of PLT relocs */
+#define        DT_BIND_NOW     24              /* Process relocations of 
object */
+#define        DT_INIT_ARRAY   25              /* Array with addresses of init 
fct */
+#define        DT_FINI_ARRAY   26              /* Array with addresses of fini 
fct */
+#define        DT_INIT_ARRAYSZ 27              /* Size in bytes of 
DT_INIT_ARRAY */
+#define        DT_FINI_ARRAYSZ 28              /* Size in bytes of 
DT_FINI_ARRAY */
+#define DT_RUNPATH     29              /* Library search path */
+#define DT_FLAGS       30              /* Flags for the object being loaded */
+#define DT_ENCODING    32              /* Start of encoded range */
+#define DT_PREINIT_ARRAY 32            /* Array with addresses of preinit fct*/
+#define DT_PREINIT_ARRAYSZ 33          /* size in bytes of DT_PREINIT_ARRAY */
+#define        DT_NUM          34              /* Number used */
+#define DT_LOOS                0x6000000d      /* Start of OS-specific */
+#define DT_HIOS                0x6ffff000      /* End of OS-specific */
+#define DT_LOPROC      0x70000000      /* Start of processor-specific */
+#define DT_HIPROC      0x7fffffff      /* End of processor-specific */
+#define        DT_PROCNUM      DT_MIPS_NUM     /* Most used by any processor */
+
+/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
+   Dyn.d_un.d_val field of the Elf*_Dyn structure.  This follows Sun's
+   approach.  */
+#define DT_VALRNGLO    0x6ffffd00
+#define DT_GNU_PRELINKED 0x6ffffdf5    /* Prelinking timestamp */
+#define DT_GNU_CONFLICTSZ 0x6ffffdf6   /* Size of conflict section */
+#define DT_GNU_LIBLISTSZ 0x6ffffdf7    /* Size of library list */
+#define DT_CHECKSUM    0x6ffffdf8
+#define DT_PLTPADSZ    0x6ffffdf9
+#define DT_MOVEENT     0x6ffffdfa
+#define DT_MOVESZ      0x6ffffdfb
+#define DT_FEATURE_1   0x6ffffdfc      /* Feature selection (DTF_*).  */
+#define DT_POSFLAG_1   0x6ffffdfd      /* Flags for DT_* entries, effecting
+                                          the following DT_* entry.  */
+#define DT_SYMINSZ     0x6ffffdfe      /* Size of syminfo table (in bytes) */
+#define DT_SYMINENT    0x6ffffdff      /* Entry size of syminfo */
+#define DT_VALRNGHI    0x6ffffdff
+#define DT_VALTAGIDX(tag)      (DT_VALRNGHI - (tag))   /* Reverse order! */
+#define DT_VALNUM 12
+
+/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
+   Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
+
+   If any adjustment is made to the ELF object after it has been
+   built these entries will need to be adjusted.  */
+#define DT_ADDRRNGLO   0x6ffffe00
+#define DT_GNU_HASH    0x6ffffef5      /* GNU-style hash table.  */
+#define DT_TLSDESC_PLT 0x6ffffef6
+#define DT_TLSDESC_GOT 0x6ffffef7
+#define DT_GNU_CONFLICT        0x6ffffef8      /* Start of conflict section */
+#define DT_GNU_LIBLIST 0x6ffffef9      /* Library list */
+#define DT_CONFIG      0x6ffffefa      /* Configuration information.  */
+#define DT_DEPAUDIT    0x6ffffefb      /* Dependency auditing.  */
+#define DT_AUDIT       0x6ffffefc      /* Object auditing.  */
+#define        DT_PLTPAD       0x6ffffefd      /* PLT padding.  */
+#define        DT_MOVETAB      0x6ffffefe      /* Move table.  */
+#define DT_SYMINFO     0x6ffffeff      /* Syminfo table.  */
+#define DT_ADDRRNGHI   0x6ffffeff
+#define DT_ADDRTAGIDX(tag)     (DT_ADDRRNGHI - (tag))  /* Reverse order! */
+#define DT_ADDRNUM 11
+
+/* The versioning entry types.  The next are defined as part of the
+   GNU extension.  */
+#define DT_VERSYM      0x6ffffff0
+
+#define DT_RELACOUNT   0x6ffffff9
+#define DT_RELCOUNT    0x6ffffffa
+
+/* These were chosen by Sun.  */
+#define DT_FLAGS_1     0x6ffffffb      /* State flags, see DF_1_* below.  */
+#define        DT_VERDEF       0x6ffffffc      /* Address of version definition
+                                          table */
+#define        DT_VERDEFNUM    0x6ffffffd      /* Number of version 
definitions */
+#define        DT_VERNEED      0x6ffffffe      /* Address of table with needed
+                                          versions */
+#define        DT_VERNEEDNUM   0x6fffffff      /* Number of needed versions */
+#define DT_VERSIONTAGIDX(tag)  (DT_VERNEEDNUM - (tag)) /* Reverse order! */
+#define DT_VERSIONTAGNUM 16
+
+/* Sun added these machine-independent extensions in the "processor-specific"
+   range.  Be compatible.  */
+#define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
+#define DT_FILTER       0x7fffffff      /* Shared object to get values from */
+#define DT_EXTRATAGIDX(tag)    ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
+#define DT_EXTRANUM    3
+
+/* Values of `d_un.d_val' in the DT_FLAGS entry.  */
+#define DF_ORIGIN      0x00000001      /* Object may use DF_ORIGIN */
+#define DF_SYMBOLIC    0x00000002      /* Symbol resolutions starts here */
+#define DF_TEXTREL     0x00000004      /* Object contains text relocations */
+#define DF_BIND_NOW    0x00000008      /* No lazy binding for this object */
+#define DF_STATIC_TLS  0x00000010      /* Module uses the static TLS model */
+
+/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
+   entry in the dynamic section.  */
+#define DF_1_NOW       0x00000001      /* Set RTLD_NOW for this object.  */
+#define DF_1_GLOBAL    0x00000002      /* Set RTLD_GLOBAL for this object.  */
+#define DF_1_GROUP     0x00000004      /* Set RTLD_GROUP for this object.  */
+#define DF_1_NODELETE  0x00000008      /* Set RTLD_NODELETE for this object.*/
+#define DF_1_LOADFLTR  0x00000010      /* Trigger filtee loading at runtime.*/
+#define DF_1_INITFIRST 0x00000020      /* Set RTLD_INITFIRST for this object*/
+#define DF_1_NOOPEN    0x00000040      /* Set RTLD_NOOPEN for this object.  */
+#define DF_1_ORIGIN    0x00000080      /* $ORIGIN must be handled.  */
+#define DF_1_DIRECT    0x00000100      /* Direct binding enabled.  */
+#define DF_1_TRANS     0x00000200
+#define DF_1_INTERPOSE 0x00000400      /* Object is used to interpose.  */
+#define DF_1_NODEFLIB  0x00000800      /* Ignore default lib search path.  */
+#define DF_1_NODUMP    0x00001000      /* Object can't be dldump'ed.  */
+#define DF_1_CONFALT   0x00002000      /* Configuration alternative created.*/
+#define DF_1_ENDFILTEE 0x00004000      /* Filtee terminates filters search. */
+#define        DF_1_DISPRELDNE 0x00008000      /* Disp reloc applied at build 
time. */
+#define        DF_1_DISPRELPND 0x00010000      /* Disp reloc applied at 
run-time.  */
+
+/* Flags for the feature selection in DT_FEATURE_1.  */
+#define DTF_1_PARINIT  0x00000001
+#define DTF_1_CONFEXP  0x00000002
+
+/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry.  */
+#define DF_P1_LAZYLOAD 0x00000001      /* Lazyload following object.  */
+#define DF_P1_GROUPPERM        0x00000002      /* Symbols from next object are 
not
+                                          generally available.  */
+
+/* Version definition sections.  */
+
+typedef struct
+{
+  Elf32_Half   vd_version;             /* Version revision */
+  Elf32_Half   vd_flags;               /* Version information */
+  Elf32_Half   vd_ndx;                 /* Version Index */
+  Elf32_Half   vd_cnt;                 /* Number of associated aux entries */
+  Elf32_Word   vd_hash;                /* Version name hash value */
+  Elf32_Word   vd_aux;                 /* Offset in bytes to verdaux array */
+  Elf32_Word   vd_next;                /* Offset in bytes to next verdef
+                                          entry */
+} Elf32_Verdef;
+
+typedef struct
+{
+  Elf64_Half   vd_version;             /* Version revision */
+  Elf64_Half   vd_flags;               /* Version information */
+  Elf64_Half   vd_ndx;                 /* Version Index */
+  Elf64_Half   vd_cnt;                 /* Number of associated aux entries */
+  Elf64_Word   vd_hash;                /* Version name hash value */
+  Elf64_Word   vd_aux;                 /* Offset in bytes to verdaux array */
+  Elf64_Word   vd_next;                /* Offset in bytes to next verdef
+                                          entry */
+} Elf64_Verdef;
+
+
+/* Legal values for vd_version (version revision).  */
+#define VER_DEF_NONE   0               /* No version */
+#define VER_DEF_CURRENT        1               /* Current version */
+#define VER_DEF_NUM    2               /* Given version number */
+
+/* Legal values for vd_flags (version information flags).  */
+#define VER_FLG_BASE   0x1             /* Version definition of file itself */
+#define VER_FLG_WEAK   0x2             /* Weak version identifier */
+
+/* Versym symbol index values.  */
+#define        VER_NDX_LOCAL           0       /* Symbol is local.  */
+#define        VER_NDX_GLOBAL          1       /* Symbol is global.  */
+#define        VER_NDX_LORESERVE       0xff00  /* Beginning of reserved 
entries.  */
+#define        VER_NDX_ELIMINATE       0xff01  /* Symbol is to be eliminated.  
*/
+
+/* Auxialiary version information.  */
+
+typedef struct
+{
+  Elf32_Word   vda_name;               /* Version or dependency names */
+  Elf32_Word   vda_next;               /* Offset in bytes to next verdaux
+                                          entry */
+} Elf32_Verdaux;
+
+typedef struct
+{
+  Elf64_Word   vda_name;               /* Version or dependency names */
+  Elf64_Word   vda_next;               /* Offset in bytes to next verdaux
+                                          entry */
+} Elf64_Verdaux;
+
+
+/* Version dependency section.  */
+
+typedef struct
+{
+  Elf32_Half   vn_version;             /* Version of structure */
+  Elf32_Half   vn_cnt;                 /* Number of associated aux entries */
+  Elf32_Word   vn_file;                /* Offset of filename for this
+                                          dependency */
+  Elf32_Word   vn_aux;                 /* Offset in bytes to vernaux array */
+  Elf32_Word   vn_next;                /* Offset in bytes to next verneed
+                                          entry */
+} Elf32_Verneed;
+
+typedef struct
+{
+  Elf64_Half   vn_version;             /* Version of structure */
+  Elf64_Half   vn_cnt;                 /* Number of associated aux entries */
+  Elf64_Word   vn_file;                /* Offset of filename for this
+                                          dependency */
+  Elf64_Word   vn_aux;                 /* Offset in bytes to vernaux array */
+  Elf64_Word   vn_next;                /* Offset in bytes to next verneed
+                                          entry */
+} Elf64_Verneed;
+
+
+/* Legal values for vn_version (version revision).  */
+#define VER_NEED_NONE   0              /* No version */
+#define VER_NEED_CURRENT 1             /* Current version */
+#define VER_NEED_NUM    2              /* Given version number */
+
+/* Auxiliary needed version information.  */
+
+typedef struct
+{
+  Elf32_Word   vna_hash;               /* Hash value of dependency name */
+  Elf32_Half   vna_flags;              /* Dependency specific information */
+  Elf32_Half   vna_other;              /* Unused */
+  Elf32_Word   vna_name;               /* Dependency name string offset */
+  Elf32_Word   vna_next;               /* Offset in bytes to next vernaux
+                                          entry */
+} Elf32_Vernaux;
+
+typedef struct
+{
+  Elf64_Word   vna_hash;               /* Hash value of dependency name */
+  Elf64_Half   vna_flags;              /* Dependency specific information */
+  Elf64_Half   vna_other;              /* Unused */
+  Elf64_Word   vna_name;               /* Dependency name string offset */
+  Elf64_Word   vna_next;               /* Offset in bytes to next vernaux
+                                          entry */
+} Elf64_Vernaux;
+
+
+/* Legal values for vna_flags.  */
+#define VER_FLG_WEAK   0x2             /* Weak version identifier */
+
+
+/* Auxiliary vector.  */
+
+/* This vector is normally only used by the program interpreter.  The
+   usual definition in an ABI supplement uses the name auxv_t.  The
+   vector is not usually defined in a standard <elf.h> file, but it
+   can't hurt.  We rename it to avoid conflicts.  The sizes of these
+   types are an arrangement between the exec server and the program
+   interpreter, so we don't fully specify them here.  */
+
+typedef struct
+{
+  uint32_t a_type;             /* Entry type */
+  union
+    {
+      uint32_t a_val;          /* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+        though, since it does not work when using 32-bit definitions
+        on 64-bit platforms and vice versa.  */
+    } a_un;
+} Elf32_auxv_t;
+
+typedef struct
+{
+  uint64_t a_type;             /* Entry type */
+  union
+    {
+      uint64_t a_val;          /* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+        though, since it does not work when using 32-bit definitions
+        on 64-bit platforms and vice versa.  */
+    } a_un;
+} Elf64_auxv_t;
+
+/* Legal values for a_type (entry type).  */
+
+#define AT_NULL                0               /* End of vector */
+#define AT_IGNORE      1               /* Entry should be ignored */
+#define AT_EXECFD      2               /* File descriptor of program */
+#define AT_PHDR                3               /* Program headers for program 
*/
+#define AT_PHENT       4               /* Size of program header entry */
+#define AT_PHNUM       5               /* Number of program headers */
+#define AT_PAGESZ      6               /* System page size */
+#define AT_BASE                7               /* Base address of interpreter 
*/
+#define AT_FLAGS       8               /* Flags */
+#define AT_ENTRY       9               /* Entry point of program */
+#define AT_NOTELF      10              /* Program is not ELF */
+#define AT_UID         11              /* Real uid */
+#define AT_EUID                12              /* Effective uid */
+#define AT_GID         13              /* Real gid */
+#define AT_EGID                14              /* Effective gid */
+#define AT_CLKTCK      17              /* Frequency of times() */
+
+/* Some more special a_type values describing the hardware.  */
+#define AT_PLATFORM    15              /* String identifying platform.  */
+#define AT_HWCAP       16              /* Machine dependent hints about
+                                          processor capabilities.  */
+
+/* This entry gives some information about the FPU initialization
+   performed by the kernel.  */
+#define AT_FPUCW       18              /* Used FPU control word.  */
+
+/* Cache block sizes.  */
+#define AT_DCACHEBSIZE 19              /* Data cache block size.  */
+#define AT_ICACHEBSIZE 20              /* Instruction cache block size.  */
+#define AT_UCACHEBSIZE 21              /* Unified cache block size.  */
+
+/* A special ignored value for PPC, used by the kernel to control the
+   interpretation of the AUXV. Must be > 16.  */
+#define AT_IGNOREPPC   22              /* Entry should be ignored.  */
+
+#define        AT_SECURE       23              /* Boolean, was exec 
setuid-like?  */
+
+#define AT_BASE_PLATFORM 24            /* String identifying real platforms.*/
+
+#define AT_RANDOM      25              /* Address of 16 random bytes.  */
+
+#define AT_EXECFN      31              /* Filename of executable.  */
+
+/* Pointer to the global system page used for system calls and other
+   nice things.  */
+#define AT_SYSINFO     32
+#define AT_SYSINFO_EHDR        33
+
+/* Shapes of the caches.  Bits 0-3 contains associativity; bits 4-7 contains
+   log2 of line size; mask those to get cache size.  */
+#define AT_L1I_CACHESHAPE      34
+#define AT_L1D_CACHESHAPE      35
+#define AT_L2_CACHESHAPE       36
+#define AT_L3_CACHESHAPE       37
+
+/* Note section contents.  Each entry in the note section begins with
+   a header of a fixed form.  */
+
+typedef struct
+{
+  Elf32_Word n_namesz;                 /* Length of the note's name.  */
+  Elf32_Word n_descsz;                 /* Length of the note's descriptor.  */
+  Elf32_Word n_type;                   /* Type of the note.  */
+} Elf32_Nhdr;
+
+typedef struct
+{
+  Elf64_Word n_namesz;                 /* Length of the note's name.  */
+  Elf64_Word n_descsz;                 /* Length of the note's descriptor.  */
+  Elf64_Word n_type;                   /* Type of the note.  */
+} Elf64_Nhdr;
+
+/* Known names of notes.  */
+
+/* Solaris entries in the note section have this name.  */
+#define ELF_NOTE_SOLARIS       "SUNW Solaris"
+
+/* Note entries for GNU systems have this name.  */
+#define ELF_NOTE_GNU           "GNU"
+
+
+/* Defined types of notes for Solaris.  */
+
+/* Value of descriptor (one word) is desired pagesize for the binary.  */
+#define ELF_NOTE_PAGESIZE_HINT 1
+
+
+/* Defined note types for GNU systems.  */
+
+/* ABI information.  The descriptor consists of words:
+   word 0: OS descriptor
+   word 1: major version of the ABI
+   word 2: minor version of the ABI
+   word 3: subminor version of the ABI
+*/
+#define NT_GNU_ABI_TAG 1
+#define ELF_NOTE_ABI   NT_GNU_ABI_TAG /* Old name.  */
+
+/* Known OSes.  These values can appear in word 0 of an
+   NT_GNU_ABI_TAG note section entry.  */
+#define ELF_NOTE_OS_LINUX      0
+#define ELF_NOTE_OS_GNU                1
+#define ELF_NOTE_OS_SOLARIS2   2
+#define ELF_NOTE_OS_FREEBSD    3
+
+/* Synthetic hwcap information.  The descriptor begins with two words:
+   word 0: number of entries
+   word 1: bitmask of enabled entries
+   Then follow variable-length entries, one byte followed by a
+   '\0'-terminated hwcap name string.  The byte gives the bit
+   number to test if enabled, (1U << bit) & bitmask.  */
+#define NT_GNU_HWCAP   2
+
+/* Build ID bits as generated by ld --build-id.
+   The descriptor consists of any nonzero number of bytes.  */
+#define NT_GNU_BUILD_ID        3
+
+/* Version note generated by GNU gold containing a version string.  */
+#define NT_GNU_GOLD_VERSION    4
+
+
+/* Move records.  */
+typedef struct
+{
+  Elf32_Xword m_value;         /* Symbol value.  */
+  Elf32_Word m_info;           /* Size and index.  */
+  Elf32_Word m_poffset;                /* Symbol offset.  */
+  Elf32_Half m_repeat;         /* Repeat count.  */
+  Elf32_Half m_stride;         /* Stride info.  */
+} Elf32_Move;
+
+typedef struct
+{
+  Elf64_Xword m_value;         /* Symbol value.  */
+  Elf64_Xword m_info;          /* Size and index.  */
+  Elf64_Xword m_poffset;       /* Symbol offset.  */
+  Elf64_Half m_repeat;         /* Repeat count.  */
+  Elf64_Half m_stride;         /* Stride info.  */
+} Elf64_Move;
+
+/* Macro to construct move records.  */
+#define ELF32_M_SYM(info)      ((info) >> 8)
+#define ELF32_M_SIZE(info)     ((unsigned char) (info))
+#define ELF32_M_INFO(sym, size)        (((sym) << 8) + (unsigned char) (size))
+
+#define ELF64_M_SYM(info)      ELF32_M_SYM (info)
+#define ELF64_M_SIZE(info)     ELF32_M_SIZE (info)
+#define ELF64_M_INFO(sym, size)        ELF32_M_INFO (sym, size)
+
+
+/* Motorola 68k specific definitions.  */
+
+/* Values for Elf32_Ehdr.e_flags.  */
+#define EF_CPU32       0x00810000
+
+/* m68k relocs.  */
+
+#define R_68K_NONE     0               /* No reloc */
+#define R_68K_32       1               /* Direct 32 bit  */
+#define R_68K_16       2               /* Direct 16 bit  */
+#define R_68K_8                3               /* Direct 8 bit  */
+#define R_68K_PC32     4               /* PC relative 32 bit */
+#define R_68K_PC16     5               /* PC relative 16 bit */
+#define R_68K_PC8      6               /* PC relative 8 bit */
+#define R_68K_GOT32    7               /* 32 bit PC relative GOT entry */
+#define R_68K_GOT16    8               /* 16 bit PC relative GOT entry */
+#define R_68K_GOT8     9               /* 8 bit PC relative GOT entry */
+#define R_68K_GOT32O   10              /* 32 bit GOT offset */
+#define R_68K_GOT16O   11              /* 16 bit GOT offset */
+#define R_68K_GOT8O    12              /* 8 bit GOT offset */
+#define R_68K_PLT32    13              /* 32 bit PC relative PLT address */
+#define R_68K_PLT16    14              /* 16 bit PC relative PLT address */
+#define R_68K_PLT8     15              /* 8 bit PC relative PLT address */
+#define R_68K_PLT32O   16              /* 32 bit PLT offset */
+#define R_68K_PLT16O   17              /* 16 bit PLT offset */
+#define R_68K_PLT8O    18              /* 8 bit PLT offset */
+#define R_68K_COPY     19              /* Copy symbol at runtime */
+#define R_68K_GLOB_DAT 20              /* Create GOT entry */
+#define R_68K_JMP_SLOT 21              /* Create PLT entry */
+#define R_68K_RELATIVE 22              /* Adjust by program base */
+#define R_68K_TLS_GD32      25          /* 32 bit GOT offset for GD */
+#define R_68K_TLS_GD16      26          /* 16 bit GOT offset for GD */
+#define R_68K_TLS_GD8       27          /* 8 bit GOT offset for GD */
+#define R_68K_TLS_LDM32     28          /* 32 bit GOT offset for LDM */
+#define R_68K_TLS_LDM16     29          /* 16 bit GOT offset for LDM */
+#define R_68K_TLS_LDM8      30          /* 8 bit GOT offset for LDM */
+#define R_68K_TLS_LDO32     31          /* 32 bit module-relative offset */
+#define R_68K_TLS_LDO16     32          /* 16 bit module-relative offset */
+#define R_68K_TLS_LDO8      33          /* 8 bit module-relative offset */
+#define R_68K_TLS_IE32      34          /* 32 bit GOT offset for IE */
+#define R_68K_TLS_IE16      35          /* 16 bit GOT offset for IE */
+#define R_68K_TLS_IE8       36          /* 8 bit GOT offset for IE */
+#define R_68K_TLS_LE32      37          /* 32 bit offset relative to
+                                          static TLS block */
+#define R_68K_TLS_LE16      38          /* 16 bit offset relative to
+                                          static TLS block */
+#define R_68K_TLS_LE8       39          /* 8 bit offset relative to
+                                          static TLS block */
+#define R_68K_TLS_DTPMOD32  40          /* 32 bit module number */
+#define R_68K_TLS_DTPREL32  41          /* 32 bit module-relative offset */
+#define R_68K_TLS_TPREL32   42          /* 32 bit TP-relative offset */
+/* Keep this the last entry.  */
+#define R_68K_NUM      43
+
+/* Intel 80386 specific definitions.  */
+
+/* i386 relocs.  */
+
+#define R_386_NONE        0            /* No reloc */
+#define R_386_32          1            /* Direct 32 bit  */
+#define R_386_PC32        2            /* PC relative 32 bit */
+#define R_386_GOT32       3            /* 32 bit GOT entry */
+#define R_386_PLT32       4            /* 32 bit PLT address */
+#define R_386_COPY        5            /* Copy symbol at runtime */
+#define R_386_GLOB_DAT    6            /* Create GOT entry */
+#define R_386_JMP_SLOT    7            /* Create PLT entry */
+#define R_386_RELATIVE    8            /* Adjust by program base */
+#define R_386_GOTOFF      9            /* 32 bit offset to GOT */
+#define R_386_GOTPC       10           /* 32 bit PC relative offset to GOT */
+#define R_386_32PLT       11
+#define R_386_TLS_TPOFF           14           /* Offset in static TLS block */
+#define R_386_TLS_IE      15           /* Address of GOT entry for static TLS
+                                          block offset */
+#define R_386_TLS_GOTIE           16           /* GOT entry for static TLS 
block
+                                          offset */
+#define R_386_TLS_LE      17           /* Offset relative to static TLS
+                                          block */
+#define R_386_TLS_GD      18           /* Direct 32 bit for GNU version of
+                                          general dynamic thread local data */
+#define R_386_TLS_LDM     19           /* Direct 32 bit for GNU version of
+                                          local dynamic thread local data
+                                          in LE code */
+#define R_386_16          20
+#define R_386_PC16        21
+#define R_386_8                   22
+#define R_386_PC8         23
+#define R_386_TLS_GD_32           24           /* Direct 32 bit for general 
dynamic
+                                          thread local data */
+#define R_386_TLS_GD_PUSH  25          /* Tag for pushl in GD TLS code */
+#define R_386_TLS_GD_CALL  26          /* Relocation for call to
+                                          __tls_get_addr() */
+#define R_386_TLS_GD_POP   27          /* Tag for popl in GD TLS code */
+#define R_386_TLS_LDM_32   28          /* Direct 32 bit for local dynamic
+                                          thread local data in LE code */
+#define R_386_TLS_LDM_PUSH 29          /* Tag for pushl in LDM TLS code */
+#define R_386_TLS_LDM_CALL 30          /* Relocation for call to
+                                          __tls_get_addr() in LDM code */
+#define R_386_TLS_LDM_POP  31          /* Tag for popl in LDM TLS code */
+#define R_386_TLS_LDO_32   32          /* Offset relative to TLS block */
+#define R_386_TLS_IE_32           33           /* GOT entry for negated static 
TLS
+                                          block offset */
+#define R_386_TLS_LE_32           34           /* Negated offset relative to 
static
+                                          TLS block */
+#define R_386_TLS_DTPMOD32 35          /* ID of module containing symbol */
+#define R_386_TLS_DTPOFF32 36          /* Offset in TLS block */
+#define R_386_TLS_TPOFF32  37          /* Negated offset in static TLS block */
+/* 38? */
+#define R_386_TLS_GOTDESC  39          /* GOT offset for TLS descriptor.  */
+#define R_386_TLS_DESC_CALL 40         /* Marker of call through TLS
+                                          descriptor for
+                                          relaxation.  */
+#define R_386_TLS_DESC     41          /* TLS descriptor containing
+                                          pointer to code and to
+                                          argument, returning the TLS
+                                          offset for the symbol.  */
+#define R_386_IRELATIVE           42           /* Adjust indirectly by program 
base */
+/* Keep this the last entry.  */
+#define R_386_NUM         43
+
+/* SUN SPARC specific definitions.  */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_SPARC_REGISTER     13      /* Global register reserved to app. */
+
+/* Values for Elf64_Ehdr.e_flags.  */
+
+#define EF_SPARCV9_MM          3
+#define EF_SPARCV9_TSO         0
+#define EF_SPARCV9_PSO         1
+#define EF_SPARCV9_RMO         2
+#define EF_SPARC_LEDATA                0x800000 /* little endian data */
+#define EF_SPARC_EXT_MASK      0xFFFF00
+#define EF_SPARC_32PLUS                0x000100 /* generic V8+ features */
+#define EF_SPARC_SUN_US1       0x000200 /* Sun UltraSPARC1 extensions */
+#define EF_SPARC_HAL_R1                0x000400 /* HAL R1 extensions */
+#define EF_SPARC_SUN_US3       0x000800 /* Sun UltraSPARCIII extensions */
+
+/* SPARC relocs.  */
+
+#define R_SPARC_NONE           0       /* No reloc */
+#define R_SPARC_8              1       /* Direct 8 bit */
+#define R_SPARC_16             2       /* Direct 16 bit */
+#define R_SPARC_32             3       /* Direct 32 bit */
+#define R_SPARC_DISP8          4       /* PC relative 8 bit */
+#define R_SPARC_DISP16         5       /* PC relative 16 bit */
+#define R_SPARC_DISP32         6       /* PC relative 32 bit */
+#define R_SPARC_WDISP30                7       /* PC relative 30 bit shifted */
+#define R_SPARC_WDISP22                8       /* PC relative 22 bit shifted */
+#define R_SPARC_HI22           9       /* High 22 bit */
+#define R_SPARC_22             10      /* Direct 22 bit */
+#define R_SPARC_13             11      /* Direct 13 bit */
+#define R_SPARC_LO10           12      /* Truncated 10 bit */
+#define R_SPARC_GOT10          13      /* Truncated 10 bit GOT entry */
+#define R_SPARC_GOT13          14      /* 13 bit GOT entry */
+#define R_SPARC_GOT22          15      /* 22 bit GOT entry shifted */
+#define R_SPARC_PC10           16      /* PC relative 10 bit truncated */
+#define R_SPARC_PC22           17      /* PC relative 22 bit shifted */
+#define R_SPARC_WPLT30         18      /* 30 bit PC relative PLT address */
+#define R_SPARC_COPY           19      /* Copy symbol at runtime */
+#define R_SPARC_GLOB_DAT       20      /* Create GOT entry */
+#define R_SPARC_JMP_SLOT       21      /* Create PLT entry */
+#define R_SPARC_RELATIVE       22      /* Adjust by program base */
+#define R_SPARC_UA32           23      /* Direct 32 bit unaligned */
+
+/* Additional Sparc64 relocs.  */
+
+#define R_SPARC_PLT32          24      /* Direct 32 bit ref to PLT entry */
+#define R_SPARC_HIPLT22                25      /* High 22 bit PLT entry */
+#define R_SPARC_LOPLT10                26      /* Truncated 10 bit PLT entry */
+#define R_SPARC_PCPLT32                27      /* PC rel 32 bit ref to PLT 
entry */
+#define R_SPARC_PCPLT22                28      /* PC rel high 22 bit PLT entry 
*/
+#define R_SPARC_PCPLT10                29      /* PC rel trunc 10 bit PLT 
entry */
+#define R_SPARC_10             30      /* Direct 10 bit */
+#define R_SPARC_11             31      /* Direct 11 bit */
+#define R_SPARC_64             32      /* Direct 64 bit */
+#define R_SPARC_OLO10          33      /* 10bit with secondary 13bit addend */
+#define R_SPARC_HH22           34      /* Top 22 bits of direct 64 bit */
+#define R_SPARC_HM10           35      /* High middle 10 bits of ... */
+#define R_SPARC_LM22           36      /* Low middle 22 bits of ... */
+#define R_SPARC_PC_HH22                37      /* Top 22 bits of pc rel 64 bit 
*/
+#define R_SPARC_PC_HM10                38      /* High middle 10 bit of ... */
+#define R_SPARC_PC_LM22                39      /* Low miggle 22 bits of ... */
+#define R_SPARC_WDISP16                40      /* PC relative 16 bit shifted */
+#define R_SPARC_WDISP19                41      /* PC relative 19 bit shifted */
+#define R_SPARC_GLOB_JMP       42      /* was part of v9 ABI but was removed */
+#define R_SPARC_7              43      /* Direct 7 bit */
+#define R_SPARC_5              44      /* Direct 5 bit */
+#define R_SPARC_6              45      /* Direct 6 bit */
+#define R_SPARC_DISP64         46      /* PC relative 64 bit */
+#define R_SPARC_PLT64          47      /* Direct 64 bit ref to PLT entry */
+#define R_SPARC_HIX22          48      /* High 22 bit complemented */
+#define R_SPARC_LOX10          49      /* Truncated 11 bit complemented */
+#define R_SPARC_H44            50      /* Direct high 12 of 44 bit */
+#define R_SPARC_M44            51      /* Direct mid 22 of 44 bit */
+#define R_SPARC_L44            52      /* Direct low 10 of 44 bit */
+#define R_SPARC_REGISTER       53      /* Global register usage */
+#define R_SPARC_UA64           54      /* Direct 64 bit unaligned */
+#define R_SPARC_UA16           55      /* Direct 16 bit unaligned */
+#define R_SPARC_TLS_GD_HI22    56
+#define R_SPARC_TLS_GD_LO10    57
+#define R_SPARC_TLS_GD_ADD     58
+#define R_SPARC_TLS_GD_CALL    59
+#define R_SPARC_TLS_LDM_HI22   60
+#define R_SPARC_TLS_LDM_LO10   61
+#define R_SPARC_TLS_LDM_ADD    62
+#define R_SPARC_TLS_LDM_CALL   63
+#define R_SPARC_TLS_LDO_HIX22  64
+#define R_SPARC_TLS_LDO_LOX10  65
+#define R_SPARC_TLS_LDO_ADD    66
+#define R_SPARC_TLS_IE_HI22    67
+#define R_SPARC_TLS_IE_LO10    68
+#define R_SPARC_TLS_IE_LD      69
+#define R_SPARC_TLS_IE_LDX     70
+#define R_SPARC_TLS_IE_ADD     71
+#define R_SPARC_TLS_LE_HIX22   72
+#define R_SPARC_TLS_LE_LOX10   73
+#define R_SPARC_TLS_DTPMOD32   74
+#define R_SPARC_TLS_DTPMOD64   75
+#define R_SPARC_TLS_DTPOFF32   76
+#define R_SPARC_TLS_DTPOFF64   77
+#define R_SPARC_TLS_TPOFF32    78
+#define R_SPARC_TLS_TPOFF64    79
+#define R_SPARC_GOTDATA_HIX22  80
+#define R_SPARC_GOTDATA_LOX10  81
+#define R_SPARC_GOTDATA_OP_HIX22       82
+#define R_SPARC_GOTDATA_OP_LOX10       83
+#define R_SPARC_GOTDATA_OP     84
+#define R_SPARC_H34            85
+#define R_SPARC_SIZE32         86
+#define R_SPARC_SIZE64         87
+#define R_SPARC_JMP_IREL       248
+#define R_SPARC_IRELATIVE      249
+#define R_SPARC_GNU_VTINHERIT  250
+#define R_SPARC_GNU_VTENTRY    251
+#define R_SPARC_REV32          252
+/* Keep this the last entry.  */
+#define R_SPARC_NUM            253
+
+/* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
+
+#define DT_SPARC_REGISTER 0x70000001
+#define DT_SPARC_NUM   2
+
+/* Bits present in AT_HWCAP on SPARC.  */
+
+#define HWCAP_SPARC_FLUSH      1       /* The CPU supports flush insn.  */
+#define HWCAP_SPARC_STBAR      2
+#define HWCAP_SPARC_SWAP       4
+#define HWCAP_SPARC_MULDIV     8
+#define HWCAP_SPARC_V9         16      /* The CPU is v9, so v8plus is ok.  */
+#define HWCAP_SPARC_ULTRA3     32
+#define HWCAP_SPARC_BLKINIT    64      /* Sun4v with block-init/load-twin.  */
+#define HWCAP_SPARC_N2         128
+
+/* MIPS R3000 specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_MIPS_NOREORDER   1          /* A .noreorder directive was used */
+#define EF_MIPS_PIC        2           /* Contains PIC code */
+#define EF_MIPS_CPIC       4           /* Uses PIC calling sequence */
+#define EF_MIPS_XGOT       8
+#define EF_MIPS_64BIT_WHIRL 16
+#define EF_MIPS_ABI2       32
+#define EF_MIPS_ABI_ON32    64
+#define EF_MIPS_ARCH       0xf0000000  /* MIPS architecture level */
+
+/* Legal values for MIPS architecture level.  */
+
+#define EF_MIPS_ARCH_1     0x00000000  /* -mips1 code.  */
+#define EF_MIPS_ARCH_2     0x10000000  /* -mips2 code.  */
+#define EF_MIPS_ARCH_3     0x20000000  /* -mips3 code.  */
+#define EF_MIPS_ARCH_4     0x30000000  /* -mips4 code.  */
+#define EF_MIPS_ARCH_5     0x40000000  /* -mips5 code.  */
+#define EF_MIPS_ARCH_32            0x60000000  /* MIPS32 code.  */
+#define EF_MIPS_ARCH_64            0x70000000  /* MIPS64 code.  */
+
+/* The following are non-official names and should not be used.  */
+
+#define E_MIPS_ARCH_1    0x00000000    /* -mips1 code.  */
+#define E_MIPS_ARCH_2    0x10000000    /* -mips2 code.  */
+#define E_MIPS_ARCH_3    0x20000000    /* -mips3 code.  */
+#define E_MIPS_ARCH_4    0x30000000    /* -mips4 code.  */
+#define E_MIPS_ARCH_5    0x40000000    /* -mips5 code.  */
+#define E_MIPS_ARCH_32   0x60000000    /* MIPS32 code.  */
+#define E_MIPS_ARCH_64   0x70000000    /* MIPS64 code.  */
+
+/* Special section indices.  */
+
+#define SHN_MIPS_ACOMMON    0xff00     /* Allocated common symbols */
+#define SHN_MIPS_TEXT      0xff01      /* Allocated test symbols.  */
+#define SHN_MIPS_DATA      0xff02      /* Allocated data symbols.  */
+#define SHN_MIPS_SCOMMON    0xff03     /* Small common symbols */
+#define SHN_MIPS_SUNDEFINED 0xff04     /* Small undefined symbols */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_MIPS_LIBLIST       0x70000000 /* Shared objects used in link */
+#define SHT_MIPS_MSYM         0x70000001
+#define SHT_MIPS_CONFLICT      0x70000002 /* Conflicting symbols */
+#define SHT_MIPS_GPTAB        0x70000003 /* Global data area sizes */
+#define SHT_MIPS_UCODE        0x70000004 /* Reserved for SGI/MIPS compilers */
+#define SHT_MIPS_DEBUG        0x70000005 /* MIPS ECOFF debugging information*/
+#define SHT_MIPS_REGINFO       0x70000006 /* Register usage information */
+#define SHT_MIPS_PACKAGE       0x70000007
+#define SHT_MIPS_PACKSYM       0x70000008
+#define SHT_MIPS_RELD         0x70000009
+#define SHT_MIPS_IFACE         0x7000000b
+#define SHT_MIPS_CONTENT       0x7000000c
+#define SHT_MIPS_OPTIONS       0x7000000d /* Miscellaneous options.  */
+#define SHT_MIPS_SHDR         0x70000010
+#define SHT_MIPS_FDESC        0x70000011
+#define SHT_MIPS_EXTSYM               0x70000012
+#define SHT_MIPS_DENSE        0x70000013
+#define SHT_MIPS_PDESC        0x70000014
+#define SHT_MIPS_LOCSYM               0x70000015
+#define SHT_MIPS_AUXSYM               0x70000016
+#define SHT_MIPS_OPTSYM               0x70000017
+#define SHT_MIPS_LOCSTR               0x70000018
+#define SHT_MIPS_LINE         0x70000019
+#define SHT_MIPS_RFDESC               0x7000001a
+#define SHT_MIPS_DELTASYM      0x7000001b
+#define SHT_MIPS_DELTAINST     0x7000001c
+#define SHT_MIPS_DELTACLASS    0x7000001d
+#define SHT_MIPS_DWARF         0x7000001e /* DWARF debugging information.  */
+#define SHT_MIPS_DELTADECL     0x7000001f
+#define SHT_MIPS_SYMBOL_LIB    0x70000020
+#define SHT_MIPS_EVENTS               0x70000021 /* Event section.  */
+#define SHT_MIPS_TRANSLATE     0x70000022
+#define SHT_MIPS_PIXIE        0x70000023
+#define SHT_MIPS_XLATE        0x70000024
+#define SHT_MIPS_XLATE_DEBUG   0x70000025
+#define SHT_MIPS_WHIRL        0x70000026
+#define SHT_MIPS_EH_REGION     0x70000027
+#define SHT_MIPS_XLATE_OLD     0x70000028
+#define SHT_MIPS_PDR_EXCEPTION 0x70000029
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_MIPS_GPREL  0x10000000     /* Must be part of global data area */
+#define SHF_MIPS_MERGE  0x20000000
+#define SHF_MIPS_ADDR   0x40000000
+#define SHF_MIPS_STRINGS 0x80000000
+#define SHF_MIPS_NOSTRIP 0x08000000
+#define SHF_MIPS_LOCAL  0x04000000
+#define SHF_MIPS_NAMES  0x02000000
+#define SHF_MIPS_NODUPE         0x01000000
+
+
+/* Symbol tables.  */
+
+/* MIPS specific values for `st_other'.  */
+#define STO_MIPS_DEFAULT               0x0
+#define STO_MIPS_INTERNAL              0x1
+#define STO_MIPS_HIDDEN                        0x2
+#define STO_MIPS_PROTECTED             0x3
+#define STO_MIPS_PLT                   0x8
+#define STO_MIPS_SC_ALIGN_UNUSED       0xff
+
+/* MIPS specific values for `st_info'.  */
+#define STB_MIPS_SPLIT_COMMON          13
+
+/* Entries found in sections of type SHT_MIPS_GPTAB.  */
+
+typedef union
+{
+  struct
+    {
+      Elf32_Word gt_current_g_value;   /* -G value used for compilation */
+      Elf32_Word gt_unused;            /* Not used */
+    } gt_header;                       /* First entry in section */
+  struct
+    {
+      Elf32_Word gt_g_value;           /* If this value were used for -G */
+      Elf32_Word gt_bytes;             /* This many bytes would be used */
+    } gt_entry;                                /* Subsequent entries in 
section */
+} Elf32_gptab;
+
+/* Entry found in sections of type SHT_MIPS_REGINFO.  */
+
+typedef struct
+{
+  Elf32_Word   ri_gprmask;             /* General registers used */
+  Elf32_Word   ri_cprmask[4];          /* Coprocessor registers used */
+  Elf32_Sword  ri_gp_value;            /* $gp register value */
+} Elf32_RegInfo;
+
+/* Entries found in sections of type SHT_MIPS_OPTIONS.  */
+
+typedef struct
+{
+  unsigned char kind;          /* Determines interpretation of the
+                                  variable part of descriptor.  */
+  unsigned char size;          /* Size of descriptor, including header.  */
+  Elf32_Section section;       /* Section header index of section affected,
+                                  0 for global options.  */
+  Elf32_Word info;             /* Kind-specific information.  */
+} Elf_Options;
+
+/* Values for `kind' field in Elf_Options.  */
+
+#define ODK_NULL       0       /* Undefined.  */
+#define ODK_REGINFO    1       /* Register usage information.  */
+#define ODK_EXCEPTIONS 2       /* Exception processing options.  */
+#define ODK_PAD                3       /* Section padding options.  */
+#define ODK_HWPATCH    4       /* Hardware workarounds performed */
+#define ODK_FILL       5       /* record the fill value used by the linker. */
+#define ODK_TAGS       6       /* reserve space for desktop tools to write. */
+#define ODK_HWAND      7       /* HW workarounds.  'AND' bits when merging. */
+#define ODK_HWOR       8       /* HW workarounds.  'OR' bits when merging.  */
+
+/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries.  */
+
+#define OEX_FPU_MIN    0x1f    /* FPE's which MUST be enabled.  */
+#define OEX_FPU_MAX    0x1f00  /* FPE's which MAY be enabled.  */
+#define OEX_PAGE0      0x10000 /* page zero must be mapped.  */
+#define OEX_SMM                0x20000 /* Force sequential memory mode?  */
+#define OEX_FPDBUG     0x40000 /* Force floating point debug mode?  */
+#define OEX_PRECISEFP  OEX_FPDBUG
+#define OEX_DISMISS    0x80000 /* Dismiss invalid address faults?  */
+
+#define OEX_FPU_INVAL  0x10
+#define OEX_FPU_DIV0   0x08
+#define OEX_FPU_OFLO   0x04
+#define OEX_FPU_UFLO   0x02
+#define OEX_FPU_INEX   0x01
+
+/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry.  */
+
+#define OHW_R4KEOP     0x1     /* R4000 end-of-page patch.  */
+#define OHW_R8KPFETCH  0x2     /* may need R8000 prefetch patch.  */
+#define OHW_R5KEOP     0x4     /* R5000 end-of-page patch.  */
+#define OHW_R5KCVTL    0x8     /* R5000 cvt.[ds].l bug.  clean=1.  */
+
+#define OPAD_PREFIX    0x1
+#define OPAD_POSTFIX   0x2
+#define OPAD_SYMBOL    0x4
+
+/* Entry found in `.options' section.  */
+
+typedef struct
+{
+  Elf32_Word hwp_flags1;       /* Extra flags.  */
+  Elf32_Word hwp_flags2;       /* Extra flags.  */
+} Elf_Options_Hw;
+
+/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries.  */
+
+#define OHWA0_R4KEOP_CHECKED   0x00000001
+#define OHWA1_R4KEOP_CLEAN     0x00000002
+
+/* MIPS relocs.  */
+
+#define R_MIPS_NONE            0       /* No reloc */
+#define R_MIPS_16              1       /* Direct 16 bit */
+#define R_MIPS_32              2       /* Direct 32 bit */
+#define R_MIPS_REL32           3       /* PC relative 32 bit */
+#define R_MIPS_26              4       /* Direct 26 bit shifted */
+#define R_MIPS_HI16            5       /* High 16 bit */
+#define R_MIPS_LO16            6       /* Low 16 bit */
+#define R_MIPS_GPREL16         7       /* GP relative 16 bit */
+#define R_MIPS_LITERAL         8       /* 16 bit literal entry */
+#define R_MIPS_GOT16           9       /* 16 bit GOT entry */
+#define R_MIPS_PC16            10      /* PC relative 16 bit */
+#define R_MIPS_CALL16          11      /* 16 bit GOT entry for function */
+#define R_MIPS_GPREL32         12      /* GP relative 32 bit */
+
+#define R_MIPS_SHIFT5          16
+#define R_MIPS_SHIFT6          17
+#define R_MIPS_64              18
+#define R_MIPS_GOT_DISP                19
+#define R_MIPS_GOT_PAGE                20
+#define R_MIPS_GOT_OFST                21
+#define R_MIPS_GOT_HI16                22
+#define R_MIPS_GOT_LO16                23
+#define R_MIPS_SUB             24
+#define R_MIPS_INSERT_A                25
+#define R_MIPS_INSERT_B                26
+#define R_MIPS_DELETE          27
+#define R_MIPS_HIGHER          28
+#define R_MIPS_HIGHEST         29
+#define R_MIPS_CALL_HI16       30
+#define R_MIPS_CALL_LO16       31
+#define R_MIPS_SCN_DISP                32
+#define R_MIPS_REL16           33
+#define R_MIPS_ADD_IMMEDIATE   34
+#define R_MIPS_PJUMP           35
+#define R_MIPS_RELGOT          36
+#define R_MIPS_JALR            37
+#define R_MIPS_TLS_DTPMOD32    38      /* Module number 32 bit */
+#define R_MIPS_TLS_DTPREL32    39      /* Module-relative offset 32 bit */
+#define R_MIPS_TLS_DTPMOD64    40      /* Module number 64 bit */
+#define R_MIPS_TLS_DTPREL64    41      /* Module-relative offset 64 bit */
+#define R_MIPS_TLS_GD          42      /* 16 bit GOT offset for GD */
+#define R_MIPS_TLS_LDM         43      /* 16 bit GOT offset for LDM */
+#define R_MIPS_TLS_DTPREL_HI16 44      /* Module-relative offset, high 16 bits 
*/
+#define R_MIPS_TLS_DTPREL_LO16 45      /* Module-relative offset, low 16 bits 
*/
+#define R_MIPS_TLS_GOTTPREL    46      /* 16 bit GOT offset for IE */
+#define R_MIPS_TLS_TPREL32     47      /* TP-relative offset, 32 bit */
+#define R_MIPS_TLS_TPREL64     48      /* TP-relative offset, 64 bit */
+#define R_MIPS_TLS_TPREL_HI16  49      /* TP-relative offset, high 16 bits */
+#define R_MIPS_TLS_TPREL_LO16  50      /* TP-relative offset, low 16 bits */
+#define R_MIPS_GLOB_DAT                51
+#define R_MIPS_COPY            126
+#define R_MIPS_JUMP_SLOT        127
+/* Keep this the last entry.  */
+#define R_MIPS_NUM             128
+
+/* Legal values for p_type field of Elf32_Phdr.  */
+
+#define PT_MIPS_REGINFO        0x70000000      /* Register usage information */
+#define PT_MIPS_RTPROC  0x70000001     /* Runtime procedure table. */
+#define PT_MIPS_OPTIONS 0x70000002
+
+/* Special program header types.  */
+
+#define PF_MIPS_LOCAL  0x10000000
+
+/* Legal values for d_tag field of Elf32_Dyn.  */
+
+#define DT_MIPS_RLD_VERSION  0x70000001        /* Runtime linker interface 
version */
+#define DT_MIPS_TIME_STAMP   0x70000002        /* Timestamp */
+#define DT_MIPS_ICHECKSUM    0x70000003        /* Checksum */
+#define DT_MIPS_IVERSION     0x70000004        /* Version string (string tbl 
index) */
+#define DT_MIPS_FLAGS       0x70000005 /* Flags */
+#define DT_MIPS_BASE_ADDRESS 0x70000006        /* Base address */
+#define DT_MIPS_MSYM        0x70000007
+#define DT_MIPS_CONFLICT     0x70000008        /* Address of CONFLICT section 
*/
+#define DT_MIPS_LIBLIST             0x70000009 /* Address of LIBLIST section */
+#define DT_MIPS_LOCAL_GOTNO  0x7000000a        /* Number of local GOT entries 
*/
+#define DT_MIPS_CONFLICTNO   0x7000000b        /* Number of CONFLICT entries */
+#define DT_MIPS_LIBLISTNO    0x70000010        /* Number of LIBLIST entries */
+#define DT_MIPS_SYMTABNO     0x70000011        /* Number of DYNSYM entries */
+#define DT_MIPS_UNREFEXTNO   0x70000012        /* First external DYNSYM */
+#define DT_MIPS_GOTSYM      0x70000013 /* First GOT entry in DYNSYM */
+#define DT_MIPS_HIPAGENO     0x70000014        /* Number of GOT page table 
entries */
+#define DT_MIPS_RLD_MAP             0x70000016 /* Address of run time loader 
map.  */
+#define DT_MIPS_DELTA_CLASS  0x70000017        /* Delta C++ class definition.  
*/
+#define DT_MIPS_DELTA_CLASS_NO    0x70000018 /* Number of entries in
+                                               DT_MIPS_DELTA_CLASS.  */
+#define DT_MIPS_DELTA_INSTANCE    0x70000019 /* Delta C++ class instances.  */
+#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
+                                               DT_MIPS_DELTA_INSTANCE.  */
+#define DT_MIPS_DELTA_RELOC  0x7000001b /* Delta relocations.  */
+#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
+                                            DT_MIPS_DELTA_RELOC.  */
+#define DT_MIPS_DELTA_SYM    0x7000001d /* Delta symbols that Delta
+                                          relocations refer to.  */
+#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
+                                          DT_MIPS_DELTA_SYM.  */
+#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
+                                            class declaration.  */
+#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
+                                               DT_MIPS_DELTA_CLASSSYM.  */
+#define DT_MIPS_CXX_FLAGS    0x70000022 /* Flags indicating for C++ flavor.  */
+#define DT_MIPS_PIXIE_INIT   0x70000023
+#define DT_MIPS_SYMBOL_LIB   0x70000024
+#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
+#define DT_MIPS_LOCAL_GOTIDX 0x70000026
+#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
+#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
+#define DT_MIPS_OPTIONS             0x70000029 /* Address of .options.  */
+#define DT_MIPS_INTERFACE    0x7000002a /* Address of .interface.  */
+#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
+#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
+                                                   function stored in GOT.  */
+#define DT_MIPS_PERF_SUFFIX  0x7000002e /* Default suffix of dso to be added
+                                          by rld on dlopen() calls.  */
+#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
+#define DT_MIPS_GP_VALUE     0x70000030 /* GP value for aux GOTs.  */
+#define DT_MIPS_AUX_DYNAMIC  0x70000031 /* Address of aux .dynamic.  */
+/* The address of .got.plt in an executable using the new non-PIC ABI.  */
+#define DT_MIPS_PLTGOT      0x70000032
+/* The base of the PLT in an executable using the new non-PIC ABI if that
+   PLT is writable.  For a non-writable PLT, this is omitted or has a zero
+   value.  */
+#define DT_MIPS_RWPLT        0x70000034
+#define DT_MIPS_NUM         0x35
+
+/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry.  */
+
+#define RHF_NONE                  0            /* No flags */
+#define RHF_QUICKSTART            (1 << 0)     /* Use quickstart */
+#define RHF_NOTPOT                (1 << 1)     /* Hash size not power of 2 */
+#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)    /* Ignore LD_LIBRARY_PATH */
+#define RHF_NO_MOVE               (1 << 3)
+#define RHF_SGI_ONLY              (1 << 4)
+#define RHF_GUARANTEE_INIT        (1 << 5)
+#define RHF_DELTA_C_PLUS_PLUS     (1 << 6)
+#define RHF_GUARANTEE_START_INIT   (1 << 7)
+#define RHF_PIXIE                 (1 << 8)
+#define RHF_DEFAULT_DELAY_LOAD    (1 << 9)
+#define RHF_REQUICKSTART          (1 << 10)
+#define RHF_REQUICKSTARTED        (1 << 11)
+#define RHF_CORD                  (1 << 12)
+#define RHF_NO_UNRES_UNDEF        (1 << 13)
+#define RHF_RLD_ORDER_SAFE        (1 << 14)
+
+/* Entries found in sections of type SHT_MIPS_LIBLIST.  */
+
+typedef struct
+{
+  Elf32_Word l_name;           /* Name (string table index) */
+  Elf32_Word l_time_stamp;     /* Timestamp */
+  Elf32_Word l_checksum;       /* Checksum */
+  Elf32_Word l_version;                /* Interface version */
+  Elf32_Word l_flags;          /* Flags */
+} Elf32_Lib;
+
+typedef struct
+{
+  Elf64_Word l_name;           /* Name (string table index) */
+  Elf64_Word l_time_stamp;     /* Timestamp */
+  Elf64_Word l_checksum;       /* Checksum */
+  Elf64_Word l_version;                /* Interface version */
+  Elf64_Word l_flags;          /* Flags */
+} Elf64_Lib;
+
+
+/* Legal values for l_flags.  */
+
+#define LL_NONE                  0
+#define LL_EXACT_MATCH   (1 << 0)      /* Require exact match */
+#define LL_IGNORE_INT_VER (1 << 1)     /* Ignore interface version */
+#define LL_REQUIRE_MINOR  (1 << 2)
+#define LL_EXPORTS       (1 << 3)
+#define LL_DELAY_LOAD    (1 << 4)
+#define LL_DELTA         (1 << 5)
+
+/* Entries found in sections of type SHT_MIPS_CONFLICT.  */
+
+typedef Elf32_Addr Elf32_Conflict;
+
+
+/* HPPA specific definitions.  */
+
+/* Legal values for e_flags field of Elf32_Ehdr.  */
+
+#define EF_PARISC_TRAPNIL      0x00010000 /* Trap nil pointer dereference.  */
+#define EF_PARISC_EXT          0x00020000 /* Program uses arch. extensions. */
+#define EF_PARISC_LSB          0x00040000 /* Program expects little endian. */
+#define EF_PARISC_WIDE         0x00080000 /* Program expects wide mode.  */
+#define EF_PARISC_NO_KABP      0x00100000 /* No kernel assisted branch
+                                             prediction.  */
+#define EF_PARISC_LAZYSWAP     0x00400000 /* Allow lazy swapping.  */
+#define EF_PARISC_ARCH         0x0000ffff /* Architecture version.  */
+
+/* Defined values for `e_flags & EF_PARISC_ARCH' are:  */
+
+#define EFA_PARISC_1_0             0x020b /* PA-RISC 1.0 big-endian.  */
+#define EFA_PARISC_1_1             0x0210 /* PA-RISC 1.1 big-endian.  */
+#define EFA_PARISC_2_0             0x0214 /* PA-RISC 2.0 big-endian.  */
+
+/* Additional section indeces.  */
+
+#define SHN_PARISC_ANSI_COMMON 0xff00     /* Section for tenatively declared
+                                             symbols in ANSI C.  */
+#define SHN_PARISC_HUGE_COMMON 0xff01     /* Common blocks in huge model.  */
+
+/* Legal values for sh_type field of Elf32_Shdr.  */
+
+#define SHT_PARISC_EXT         0x70000000 /* Contains product specific ext. */
+#define SHT_PARISC_UNWIND      0x70000001 /* Unwind information.  */
+#define SHT_PARISC_DOC         0x70000002 /* Debug info for optimized code. */
+
+/* Legal values for sh_flags field of Elf32_Shdr.  */
+
+#define SHF_PARISC_SHORT       0x20000000 /* Section with short addressing. */
+#define SHF_PARISC_HUGE                0x40000000 /* Section far from gp.  */
+#define SHF_PARISC_SBP         0x80000000 /* Static branch prediction code. */
+
+/* Legal values for ST_TYPE subfield of st_info (symbol type).  */
+
+#define STT_PARISC_MILLICODE   13      /* Millicode function entry point.  */
+
+#define STT_HP_OPAQUE          (STT_LOOS + 0x1)
+#define STT_HP_STUB            (STT_LOOS + 0x2)
+
+/* HPPA relocs.  */
+
+#define R_PARISC_NONE          0       /* No reloc.  */
+#define R_PARISC_DIR32         1       /* Direct 32-bit reference.  */
+#define R_PARISC_DIR21L                2       /* Left 21 bits of eff. 
address.  */
+#define R_PARISC_DIR17R                3       /* Right 17 bits of eff. 
address.  */
+#define R_PARISC_DIR17F                4       /* 17 bits of eff. address.  */
+#define R_PARISC_DIR14R                6       /* Right 14 bits of eff. 
address.  */
+#define R_PARISC_PCREL32       9       /* 32-bit rel. address.  */
+#define R_PARISC_PCREL21L      10      /* Left 21 bits of rel. address.  */
+#define R_PARISC_PCREL17R      11      /* Right 17 bits of rel. address.  */
+#define R_PARISC_PCREL17F      12      /* 17 bits of rel. address.  */
+#define R_PARISC_PCREL14R      14      /* Right 14 bits of rel. address.  */
+#define R_PARISC_DPREL21L      18      /* Left 21 bits of rel. address.  */
+#define R_PARISC_DPREL14R      22      /* Right 14 bits of rel. address.  */
+#define R_PARISC_GPREL21L      26      /* GP-relative, left 21 bits.  */
+#define R_PARISC_GPREL14R      30      /* GP-relative, right 14 bits.  */
+#define R_PARISC_LTOFF21L      34      /* LT-relative, left 21 bits.  */
+#define R_PARISC_LTOFF14R      38      /* LT-relative, right 14 bits.  */
+#define R_PARISC_SECREL32      41      /* 32 bits section rel. address.  */
+#define R_PARISC_SEGBASE       48      /* No relocation, set segment base.  */
+#define R_PARISC_SEGREL32      49      /* 32 bits segment rel. address.  */
+#define R_PARISC_PLTOFF21L     50      /* PLT rel. address, left 21 bits.  */
+#define R_PARISC_PLTOFF14R     54      /* PLT rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_FPTR32  57      /* 32 bits LT-rel. function pointer. */
+#define R_PARISC_LTOFF_FPTR21L 58      /* LT-rel. fct ptr, left 21 bits. */
+#define R_PARISC_LTOFF_FPTR14R 62      /* LT-rel. fct ptr, right 14 bits. */
+#define R_PARISC_FPTR64                64      /* 64 bits function address.  */
+#define R_PARISC_PLABEL32      65      /* 32 bits function address.  */
+#define R_PARISC_PLABEL21L     66      /* Left 21 bits of fdesc address.  */
+#define R_PARISC_PLABEL14R     70      /* Right 14 bits of fdesc address.  */
+#define R_PARISC_PCREL64       72      /* 64 bits PC-rel. address.  */
+#define R_PARISC_PCREL22F      74      /* 22 bits PC-rel. address.  */
+#define R_PARISC_PCREL14WR     75      /* PC-rel. address, right 14 bits.  */
+#define R_PARISC_PCREL14DR     76      /* PC rel. address, right 14 bits.  */
+#define R_PARISC_PCREL16F      77      /* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16WF     78      /* 16 bits PC-rel. address.  */
+#define R_PARISC_PCREL16DF     79      /* 16 bits PC-rel. address.  */
+#define R_PARISC_DIR64         80      /* 64 bits of eff. address.  */
+#define R_PARISC_DIR14WR       83      /* 14 bits of eff. address.  */
+#define R_PARISC_DIR14DR       84      /* 14 bits of eff. address.  */
+#define R_PARISC_DIR16F                85      /* 16 bits of eff. address.  */
+#define R_PARISC_DIR16WF       86      /* 16 bits of eff. address.  */
+#define R_PARISC_DIR16DF       87      /* 16 bits of eff. address.  */
+#define R_PARISC_GPREL64       88      /* 64 bits of GP-rel. address.  */
+#define R_PARISC_GPREL14WR     91      /* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL14DR     92      /* GP-rel. address, right 14 bits.  */
+#define R_PARISC_GPREL16F      93      /* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16WF     94      /* 16 bits GP-rel. address.  */
+#define R_PARISC_GPREL16DF     95      /* 16 bits GP-rel. address.  */
+#define R_PARISC_LTOFF64       96      /* 64 bits LT-rel. address.  */
+#define R_PARISC_LTOFF14WR     99      /* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF14DR     100     /* LT-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF16F      101     /* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16WF     102     /* 16 bits LT-rel. address.  */
+#define R_PARISC_LTOFF16DF     103     /* 16 bits LT-rel. address.  */
+#define R_PARISC_SECREL64      104     /* 64 bits section rel. address.  */
+#define R_PARISC_SEGREL64      112     /* 64 bits segment rel. address.  */
+#define R_PARISC_PLTOFF14WR    115     /* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF14DR    116     /* PLT-rel. address, right 14 bits.  */
+#define R_PARISC_PLTOFF16F     117     /* 16 bits LT-rel. address.  */
+#define R_PARISC_PLTOFF16WF    118     /* 16 bits PLT-rel. address.  */
+#define R_PARISC_PLTOFF16DF    119     /* 16 bits PLT-rel. address.  */
+#define R_PARISC_LTOFF_FPTR64  120     /* 64 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR14WR        123     /* LT-rel. fct. ptr., right 14 
bits. */
+#define R_PARISC_LTOFF_FPTR14DR        124     /* LT-rel. fct. ptr., right 14 
bits. */
+#define R_PARISC_LTOFF_FPTR16F 125     /* 16 bits LT-rel. function ptr.  */
+#define R_PARISC_LTOFF_FPTR16WF        126     /* 16 bits LT-rel. function 
ptr.  */
+#define R_PARISC_LTOFF_FPTR16DF        127     /* 16 bits LT-rel. function 
ptr.  */
+#define R_PARISC_LORESERVE     128
+#define R_PARISC_COPY          128     /* Copy relocation.  */
+#define R_PARISC_IPLT          129     /* Dynamic reloc, imported PLT */
+#define R_PARISC_EPLT          130     /* Dynamic reloc, exported PLT */
+#define R_PARISC_TPREL32       153     /* 32 bits TP-rel. address.  */
+#define R_PARISC_TPREL21L      154     /* TP-rel. address, left 21 bits.  */
+#define R_PARISC_TPREL14R      158     /* TP-rel. address, right 14 bits.  */
+#define R_PARISC_LTOFF_TP21L   162     /* LT-TP-rel. address, left 21 bits. */
+#define R_PARISC_LTOFF_TP14R   166     /* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14F   167     /* 14 bits LT-TP-rel. address.  */
+#define R_PARISC_TPREL64       216     /* 64 bits TP-rel. address.  */
+#define R_PARISC_TPREL14WR     219     /* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL14DR     220     /* TP-rel. address, right 14 bits.  */
+#define R_PARISC_TPREL16F      221     /* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16WF     222     /* 16 bits TP-rel. address.  */
+#define R_PARISC_TPREL16DF     223     /* 16 bits TP-rel. address.  */
+#define R_PARISC_LTOFF_TP64    224     /* 64 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP14WR  227     /* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP14DR  228     /* LT-TP-rel. address, right 14 bits.*/
+#define R_PARISC_LTOFF_TP16F   229     /* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16WF  230     /* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_LTOFF_TP16DF  231     /* 16 bits LT-TP-rel. address.  */
+#define R_PARISC_GNU_VTENTRY   232
+#define R_PARISC_GNU_VTINHERIT 233
+#define R_PARISC_TLS_GD21L     234     /* GD 21-bit left.  */
+#define R_PARISC_TLS_GD14R     235     /* GD 14-bit right.  */
+#define R_PARISC_TLS_GDCALL    236     /* GD call to __t_g_a.  */
+#define R_PARISC_TLS_LDM21L    237     /* LD module 21-bit left.  */
+#define R_PARISC_TLS_LDM14R    238     /* LD module 14-bit right.  */
+#define R_PARISC_TLS_LDMCALL   239     /* LD module call to __t_g_a.  */
+#define R_PARISC_TLS_LDO21L    240     /* LD offset 21-bit left.  */
+#define R_PARISC_TLS_LDO14R    241     /* LD offset 14-bit right.  */
+#define R_PARISC_TLS_DTPMOD32  242     /* DTP module 32-bit.  */
+#define R_PARISC_TLS_DTPMOD64  243     /* DTP module 64-bit.  */
+#define R_PARISC_TLS_DTPOFF32  244     /* DTP offset 32-bit.  */
+#define R_PARISC_TLS_DTPOFF64  245     /* DTP offset 32-bit.  */
+#define R_PARISC_TLS_LE21L     R_PARISC_TPREL21L
+#define R_PARISC_TLS_LE14R     R_PARISC_TPREL14R
+#define R_PARISC_TLS_IE21L     R_PARISC_LTOFF_TP21L
+#define R_PARISC_TLS_IE14R     R_PARISC_LTOFF_TP14R
+#define R_PARISC_TLS_TPREL32   R_PARISC_TPREL32
+#define R_PARISC_TLS_TPREL64   R_PARISC_TPREL64
+#define R_PARISC_HIRESERVE     255
+
+/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PT_HP_TLS              (PT_LOOS + 0x0)
+#define PT_HP_CORE_NONE                (PT_LOOS + 0x1)
+#define PT_HP_CORE_VERSION     (PT_LOOS + 0x2)
+#define PT_HP_CORE_KERNEL      (PT_LOOS + 0x3)
+#define PT_HP_CORE_COMM                (PT_LOOS + 0x4)
+#define PT_HP_CORE_PROC                (PT_LOOS + 0x5)
+#define PT_HP_CORE_LOADABLE    (PT_LOOS + 0x6)
+#define PT_HP_CORE_STACK       (PT_LOOS + 0x7)
+#define PT_HP_CORE_SHM         (PT_LOOS + 0x8)
+#define PT_HP_CORE_MMF         (PT_LOOS + 0x9)
+#define PT_HP_PARALLEL         (PT_LOOS + 0x10)
+#define PT_HP_FASTBIND         (PT_LOOS + 0x11)
+#define PT_HP_OPT_ANNOT                (PT_LOOS + 0x12)
+#define PT_HP_HSL_ANNOT                (PT_LOOS + 0x13)
+#define PT_HP_STACK            (PT_LOOS + 0x14)
+
+#define PT_PARISC_ARCHEXT      0x70000000
+#define PT_PARISC_UNWIND       0x70000001
+
+/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr.  */
+
+#define PF_PARISC_SBP          0x08000000
+
+#define PF_HP_PAGE_SIZE                0x00100000
+#define PF_HP_FAR_SHARED       0x00200000
+#define PF_HP_NEAR_SHARED      0x00400000
+#define PF_HP_CODE             0x01000000
+#define PF_HP_MODIFY           0x02000000
+#define PF_HP_LAZYSWAP         0x04000000
+#define PF_HP_SBP              0x08000000
+
+
+/* Alpha specific definitions.  */
+
+/* Legal values for e_flags field of Elf64_Ehdr.  */
+
+#define EF_ALPHA_32BIT         1       /* All addresses must be < 2GB.  */
+#define EF_ALPHA_CANRELAX      2       /* Relocations for relaxing exist.  */
+
+/* Legal values for sh_type field of Elf64_Shdr.  */
+
+/* These two are primerily concerned with ECOFF debugging info.  */
+#define SHT_ALPHA_DEBUG                0x70000001
+#define SHT_ALPHA_REGINFO      0x70000002
+
+/* Legal values for sh_flags field of Elf64_Shdr.  */
+
+#define SHF_ALPHA_GPREL                0x10000000
+
+/* Legal values for st_other field of Elf64_Sym.  */
+#define STO_ALPHA_NOPV         0x80    /* No PV required.  */
+#define STO_ALPHA_STD_GPLOAD   0x88    /* PV only used for initial ldgp.  */
+
+/* Alpha relocs.  */
+
+#define R_ALPHA_NONE           0       /* No reloc */
+#define R_ALPHA_REFLONG                1       /* Direct 32 bit */
+#define R_ALPHA_REFQUAD                2       /* Direct 64 bit */
+#define R_ALPHA_GPREL32                3       /* GP relative 32 bit */
+#define R_ALPHA_LITERAL                4       /* GP relative 16 bit 
w/optimization */
+#define R_ALPHA_LITUSE         5       /* Optimization hint for LITERAL */
+#define R_ALPHA_GPDISP         6       /* Add displacement to GP */
+#define R_ALPHA_BRADDR         7       /* PC+4 relative 23 bit shifted */
+#define R_ALPHA_HINT           8       /* PC+4 relative 16 bit shifted */
+#define R_ALPHA_SREL16         9       /* PC relative 16 bit */
+#define R_ALPHA_SREL32         10      /* PC relative 32 bit */
+#define R_ALPHA_SREL64         11      /* PC relative 64 bit */
+#define R_ALPHA_GPRELHIGH      17      /* GP relative 32 bit, high 16 bits */
+#define R_ALPHA_GPRELLOW       18      /* GP relative 32 bit, low 16 bits */
+#define R_ALPHA_GPREL16                19      /* GP relative 16 bit */
+#define R_ALPHA_COPY           24      /* Copy symbol at runtime */
+#define R_ALPHA_GLOB_DAT       25      /* Create GOT entry */
+#define R_ALPHA_JMP_SLOT       26      /* Create PLT entry */
+#define R_ALPHA_RELATIVE       27      /* Adjust by program base */
+#define R_ALPHA_TLS_GD_HI      28
+#define R_ALPHA_TLSGD          29
+#define R_ALPHA_TLS_LDM                30
+#define R_ALPHA_DTPMOD64       31
+#define R_ALPHA_GOTDTPREL      32
+#define R_ALPHA_DTPREL64       33
+#define R_ALPHA_DTPRELHI       34
+#define R_ALPHA_DTPRELLO       35
+#define R_ALPHA_DTPREL16       36
+#define R_ALPHA_GOTTPREL       37
+#define R_ALPHA_TPREL64                38
+#define R_ALPHA_TPRELHI                39
+#define R_ALPHA_TPRELLO                40
+#define R_ALPHA_TPREL16                41
+/* Keep this the last entry.  */
+#define R_ALPHA_NUM            46
+
+/* Magic values of the LITUSE relocation addend.  */
+#define LITUSE_ALPHA_ADDR      0
+#define LITUSE_ALPHA_BASE      1
+#define LITUSE_ALPHA_BYTOFF    2
+#define LITUSE_ALPHA_JSR       3
+#define LITUSE_ALPHA_TLS_GD    4
+#define LITUSE_ALPHA_TLS_LDM   5
+
+/* Legal values for d_tag of Elf64_Dyn.  */
+#define DT_ALPHA_PLTRO         (DT_LOPROC + 0)
+#define DT_ALPHA_NUM           1
+
+/* PowerPC specific declarations */
+
+/* Values for Elf32/64_Ehdr.e_flags.  */
+#define EF_PPC_EMB             0x80000000      /* PowerPC embedded flag */
+
+/* Cygnus local bits below */
+#define EF_PPC_RELOCATABLE     0x00010000      /* PowerPC -mrelocatable flag*/
+#define EF_PPC_RELOCATABLE_LIB 0x00008000      /* PowerPC -mrelocatable-lib
+                                                  flag */
+
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE             0
+#define R_PPC_ADDR32           1       /* 32bit absolute address */
+#define R_PPC_ADDR24           2       /* 26bit address, 2 bits ignored.  */
+#define R_PPC_ADDR16           3       /* 16bit absolute address */
+#define R_PPC_ADDR16_LO                4       /* lower 16bit of absolute 
address */
+#define R_PPC_ADDR16_HI                5       /* high 16bit of absolute 
address */
+#define R_PPC_ADDR16_HA                6       /* adjusted high 16bit */
+#define R_PPC_ADDR14           7       /* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN   8
+#define R_PPC_ADDR14_BRNTAKEN  9
+#define R_PPC_REL24            10      /* PC relative 26 bit */
+#define R_PPC_REL14            11      /* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN    12
+#define R_PPC_REL14_BRNTAKEN   13
+#define R_PPC_GOT16            14
+#define R_PPC_GOT16_LO         15
+#define R_PPC_GOT16_HI         16
+#define R_PPC_GOT16_HA         17
+#define R_PPC_PLTREL24         18
+#define R_PPC_COPY             19
+#define R_PPC_GLOB_DAT         20
+#define R_PPC_JMP_SLOT         21
+#define R_PPC_RELATIVE         22
+#define R_PPC_LOCAL24PC                23
+#define R_PPC_UADDR32          24
+#define R_PPC_UADDR16          25
+#define R_PPC_REL32            26
+#define R_PPC_PLT32            27
+#define R_PPC_PLTREL32         28
+#define R_PPC_PLT16_LO         29
+#define R_PPC_PLT16_HI         30
+#define R_PPC_PLT16_HA         31
+#define R_PPC_SDAREL16         32
+#define R_PPC_SECTOFF          33
+#define R_PPC_SECTOFF_LO       34
+#define R_PPC_SECTOFF_HI       35
+#define R_PPC_SECTOFF_HA       36
+
+/* PowerPC relocations defined for the TLS access ABI.  */
+#define R_PPC_TLS              67 /* none      (sym+add)@tls */
+#define R_PPC_DTPMOD32         68 /* word32    (sym+add)@dtpmod */
+#define R_PPC_TPREL16          69 /* half16*   (sym+add)@tprel */
+#define R_PPC_TPREL16_LO       70 /* half16    (sym+add)@address@hidden */
+#define R_PPC_TPREL16_HI       71 /* half16    (sym+add)@address@hidden */
+#define R_PPC_TPREL16_HA       72 /* half16    (sym+add)@address@hidden */
+#define R_PPC_TPREL32          73 /* word32    (sym+add)@tprel */
+#define R_PPC_DTPREL16         74 /* half16*   (sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO      75 /* half16    (sym+add)@address@hidden */
+#define R_PPC_DTPREL16_HI      76 /* half16    (sym+add)@address@hidden */
+#define R_PPC_DTPREL16_HA      77 /* half16    (sym+add)@address@hidden */
+#define R_PPC_DTPREL32         78 /* word32    (sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16      79 /* half16*   (sym+add)@address@hidden */
+#define R_PPC_GOT_TLSGD16_LO   80 /* half16    (sym+add)@address@hidden@l */
+#define R_PPC_GOT_TLSGD16_HI   81 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC_GOT_TLSGD16_HA   82 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC_GOT_TLSLD16      83 /* half16*   (sym+add)@address@hidden */
+#define R_PPC_GOT_TLSLD16_LO   84 /* half16    (sym+add)@address@hidden@l */
+#define R_PPC_GOT_TLSLD16_HI   85 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC_GOT_TLSLD16_HA   86 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC_GOT_TPREL16      87 /* half16*   (sym+add)@address@hidden */
+#define R_PPC_GOT_TPREL16_LO   88 /* half16    (sym+add)@address@hidden@l */
+#define R_PPC_GOT_TPREL16_HI   89 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC_GOT_TPREL16_HA   90 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC_GOT_DTPREL16     91 /* half16*   (sym+add)@address@hidden */
+#define R_PPC_GOT_DTPREL16_LO  92 /* half16*   (sym+add)@address@hidden@l */
+#define R_PPC_GOT_DTPREL16_HI  93 /* half16*   (sym+add)@address@hidden@h */
+#define R_PPC_GOT_DTPREL16_HA  94 /* half16*   (sym+add)@address@hidden@ha */
+
+/* The remaining relocs are from the Embedded ELF ABI, and are not
+   in the SVR4 ELF ABI.  */
+#define R_PPC_EMB_NADDR32      101
+#define R_PPC_EMB_NADDR16      102
+#define R_PPC_EMB_NADDR16_LO   103
+#define R_PPC_EMB_NADDR16_HI   104
+#define R_PPC_EMB_NADDR16_HA   105
+#define R_PPC_EMB_SDAI16       106
+#define R_PPC_EMB_SDA2I16      107
+#define R_PPC_EMB_SDA2REL      108
+#define R_PPC_EMB_SDA21                109     /* 16 bit offset in SDA */
+#define R_PPC_EMB_MRKREF       110
+#define R_PPC_EMB_RELSEC16     111
+#define R_PPC_EMB_RELST_LO     112
+#define R_PPC_EMB_RELST_HI     113
+#define R_PPC_EMB_RELST_HA     114
+#define R_PPC_EMB_BIT_FLD      115
+#define R_PPC_EMB_RELSDA       116     /* 16 bit relative offset in SDA */
+
+/* Diab tool relocations.  */
+#define R_PPC_DIAB_SDA21_LO    180     /* like EMB_SDA21, but lower 16 bit */
+#define R_PPC_DIAB_SDA21_HI    181     /* like EMB_SDA21, but high 16 bit */
+#define R_PPC_DIAB_SDA21_HA    182     /* like EMB_SDA21, adjusted high 16 */
+#define R_PPC_DIAB_RELSDA_LO   183     /* like EMB_RELSDA, but lower 16 bit */
+#define R_PPC_DIAB_RELSDA_HI   184     /* like EMB_RELSDA, but high 16 bit */
+#define R_PPC_DIAB_RELSDA_HA   185     /* like EMB_RELSDA, adjusted high 16 */
+
+/* GNU extension to support local ifunc.  */
+#define R_PPC_IRELATIVE                248
+
+/* GNU relocs used in PIC code sequences.  */
+#define R_PPC_REL16            249     /* half16   (sym+add-.) */
+#define R_PPC_REL16_LO         250     /* half16   (sym+add-.)@l */
+#define R_PPC_REL16_HI         251     /* half16   (sym+add-.)@h */
+#define R_PPC_REL16_HA         252     /* half16   (sym+add-.)@ha */
+
+/* This is a phony reloc to handle any old fashioned TOC16 references
+   that may still be in object files.  */
+#define R_PPC_TOC16            255
+
+/* PowerPC specific values for the Dyn d_tag field.  */
+#define DT_PPC_GOT             (DT_LOPROC + 0)
+#define DT_PPC_NUM             1
+
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE           R_PPC_NONE
+#define R_PPC64_ADDR32         R_PPC_ADDR32 /* 32bit absolute address */
+#define R_PPC64_ADDR24         R_PPC_ADDR24 /* 26bit address, word aligned */
+#define R_PPC64_ADDR16         R_PPC_ADDR16 /* 16bit absolute address */
+#define R_PPC64_ADDR16_LO      R_PPC_ADDR16_LO /* lower 16bits of address */
+#define R_PPC64_ADDR16_HI      R_PPC_ADDR16_HI /* high 16bits of address. */
+#define R_PPC64_ADDR16_HA      R_PPC_ADDR16_HA /* adjusted high 16bits.  */
+#define R_PPC64_ADDR14         R_PPC_ADDR14 /* 16bit address, word aligned */
+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN        R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24          R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
+#define R_PPC64_REL14          R_PPC_REL14 /* PC relative 16 bit */
+#define R_PPC64_REL14_BRTAKEN  R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16          R_PPC_GOT16
+#define R_PPC64_GOT16_LO       R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI       R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA       R_PPC_GOT16_HA
+
+#define R_PPC64_COPY           R_PPC_COPY
+#define R_PPC64_GLOB_DAT       R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT       R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE       R_PPC_RELATIVE
+
+#define R_PPC64_UADDR32                R_PPC_UADDR32
+#define R_PPC64_UADDR16                R_PPC_UADDR16
+#define R_PPC64_REL32          R_PPC_REL32
+#define R_PPC64_PLT32          R_PPC_PLT32
+#define R_PPC64_PLTREL32       R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO       R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI       R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA       R_PPC_PLT16_HA
+
+#define R_PPC64_SECTOFF                R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO     R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI     R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA     R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30         37 /* word30 (S + A - P) >> 2 */
+#define R_PPC64_ADDR64         38 /* doubleword64 S + A */
+#define R_PPC64_ADDR16_HIGHER  39 /* half16 #higher(S + A) */
+#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */
+#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A) */
+#define R_PPC64_ADDR16_HIGHESTA        42 /* half16 #highesta(S + A) */
+#define R_PPC64_UADDR64                43 /* doubleword64 S + A */
+#define R_PPC64_REL64          44 /* doubleword64 S + A - P */
+#define R_PPC64_PLT64          45 /* doubleword64 L + A */
+#define R_PPC64_PLTREL64       46 /* doubleword64 L + A - P */
+#define R_PPC64_TOC16          47 /* half16* S + A - .TOC */
+#define R_PPC64_TOC16_LO       48 /* half16 #lo(S + A - .TOC.) */
+#define R_PPC64_TOC16_HI       49 /* half16 #hi(S + A - .TOC.) */
+#define R_PPC64_TOC16_HA       50 /* half16 #ha(S + A - .TOC.) */
+#define R_PPC64_TOC            51 /* doubleword64 .TOC */
+#define R_PPC64_PLTGOT16       52 /* half16* M + A */
+#define R_PPC64_PLTGOT16_LO    53 /* half16 #lo(M + A) */
+#define R_PPC64_PLTGOT16_HI    54 /* half16 #hi(M + A) */
+#define R_PPC64_PLTGOT16_HA    55 /* half16 #ha(M + A) */
+
+#define R_PPC64_ADDR16_DS      56 /* half16ds* (S + A) >> 2 */
+#define R_PPC64_ADDR16_LO_DS   57 /* half16ds  #lo(S + A) >> 2 */
+#define R_PPC64_GOT16_DS       58 /* half16ds* (G + A) >> 2 */
+#define R_PPC64_GOT16_LO_DS    59 /* half16ds  #lo(G + A) >> 2 */
+#define R_PPC64_PLT16_LO_DS    60 /* half16ds  #lo(L + A) >> 2 */
+#define R_PPC64_SECTOFF_DS     61 /* half16ds* (R + A) >> 2 */
+#define R_PPC64_SECTOFF_LO_DS  62 /* half16ds  #lo(R + A) >> 2 */
+#define R_PPC64_TOC16_DS       63 /* half16ds* (S + A - .TOC.) >> 2 */
+#define R_PPC64_TOC16_LO_DS    64 /* half16ds  #lo(S + A - .TOC.) >> 2 */
+#define R_PPC64_PLTGOT16_DS    65 /* half16ds* (M + A) >> 2 */
+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds  #lo(M + A) >> 2 */
+
+/* PowerPC64 relocations defined for the TLS access ABI.  */
+#define R_PPC64_TLS            67 /* none      (sym+add)@tls */
+#define R_PPC64_DTPMOD64       68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16                69 /* half16*   (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO     70 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HI     71 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HA     72 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_TPREL64                73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16       74 /* half16*   (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO    75 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HI    76 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HA    77 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_DTPREL64       78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16    79 /* half16*   (sym+add)@address@hidden */
+#define R_PPC64_GOT_TLSGD16_LO 80 /* half16    (sym+add)@address@hidden@l */
+#define R_PPC64_GOT_TLSGD16_HI 81 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC64_GOT_TLSGD16_HA 82 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC64_GOT_TLSLD16    83 /* half16*   (sym+add)@address@hidden */
+#define R_PPC64_GOT_TLSLD16_LO 84 /* half16    (sym+add)@address@hidden@l */
+#define R_PPC64_GOT_TLSLD16_HI 85 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC64_GOT_TLSLD16_HA 86 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@address@hidden */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@address@hidden@l */
+#define R_PPC64_GOT_TPREL16_HI 89 /* half16    (sym+add)@address@hidden@h */
+#define R_PPC64_GOT_TPREL16_HA 90 /* half16    (sym+add)@address@hidden@ha */
+#define R_PPC64_GOT_DTPREL16_DS        91 /* half16ds* 
(sym+add)@address@hidden */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@address@hidden@l */
+#define R_PPC64_GOT_DTPREL16_HI        93 /* half16    
(sym+add)@address@hidden@h */
+#define R_PPC64_GOT_DTPREL16_HA        94 /* half16    
(sym+add)@address@hidden@ha */
+#define R_PPC64_TPREL16_DS     95 /* half16ds* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS  96 /* half16ds  (sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HIGHER 97 /* half16    (sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HIGHERA        98 /* half16    
(sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HIGHEST        99 /* half16    
(sym+add)@address@hidden */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_DS    101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HIGHER        103 /* half16   
(sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@address@hidden */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16        
(sym+add)@address@hidden */
+
+/* GNU extension to support local ifunc.  */
+#define R_PPC64_JMP_IREL       247
+#define R_PPC64_IRELATIVE      248
+#define R_PPC64_REL16          249     /* half16   (sym+add-.) */
+#define R_PPC64_REL16_LO       250     /* half16   (sym+add-.)@l */
+#define R_PPC64_REL16_HI       251     /* half16   (sym+add-.)@h */
+#define R_PPC64_REL16_HA       252     /* half16   (sym+add-.)@ha */
+
+/* PowerPC64 specific values for the Dyn d_tag field.  */
+#define DT_PPC64_GLINK  (DT_LOPROC + 0)
+#define DT_PPC64_OPD   (DT_LOPROC + 1)
+#define DT_PPC64_OPDSZ (DT_LOPROC + 2)
+#define DT_PPC64_NUM    3
+
+
+/* ARM specific declarations */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_ARM_RELEXEC         0x01
+#define EF_ARM_HASENTRY                0x02
+#define EF_ARM_INTERWORK       0x04
+#define EF_ARM_APCS_26         0x08
+#define EF_ARM_APCS_FLOAT      0x10
+#define EF_ARM_PIC             0x20
+#define EF_ARM_ALIGN8          0x40 /* 8-bit structure alignment is in use */
+#define EF_ARM_NEW_ABI         0x80
+#define EF_ARM_OLD_ABI         0x100
+#define EF_ARM_SOFT_FLOAT      0x200
+#define EF_ARM_VFP_FLOAT       0x400
+#define EF_ARM_MAVERICK_FLOAT  0x800
+
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
+/* NB. These conflict with values defined above.  */
+#define EF_ARM_SYMSARESORTED   0x04
+#define EF_ARM_DYNSYMSUSESEGIDX        0x08
+#define EF_ARM_MAPSYMSFIRST    0x10
+#define EF_ARM_EABIMASK                0XFF000000
+
+/* Constants defined in AAELF.  */
+#define EF_ARM_BE8         0x00800000
+#define EF_ARM_LE8         0x00400000
+
+#define EF_ARM_EABI_VERSION(flags)     ((flags) & EF_ARM_EABIMASK)
+#define EF_ARM_EABI_UNKNOWN    0x00000000
+#define EF_ARM_EABI_VER1       0x01000000
+#define EF_ARM_EABI_VER2       0x02000000
+#define EF_ARM_EABI_VER3       0x03000000
+#define EF_ARM_EABI_VER4       0x04000000
+#define EF_ARM_EABI_VER5       0x05000000
+
+/* Additional symbol types for Thumb.  */
+#define STT_ARM_TFUNC          STT_LOPROC /* A Thumb function.  */
+#define STT_ARM_16BIT          STT_HIPROC /* A Thumb label.  */
+
+/* ARM-specific values for sh_flags */
+#define SHF_ARM_ENTRYSECT      0x10000000 /* Section contains an entry point */
+#define SHF_ARM_COMDEF         0x80000000 /* Section may be multiply defined
+                                             in the input to a link step.  */
+
+/* ARM-specific program header flags */
+#define PF_ARM_SB              0x10000000 /* Segment contains the location
+                                             addressed by the static base. */
+#define PF_ARM_PI              0x20000000 /* Position-independent segment.  */
+#define PF_ARM_ABS             0x40000000 /* Absolute segment.  */
+
+/* Processor specific values for the Phdr p_type field.  */
+#define PT_ARM_EXIDX           (PT_LOPROC + 1) /* ARM unwind segment.  */
+
+/* Processor specific values for the Shdr sh_type field.  */
+#define SHT_ARM_EXIDX          (SHT_LOPROC + 1) /* ARM unwind section.  */
+#define SHT_ARM_PREEMPTMAP     (SHT_LOPROC + 2) /* Preemption details.  */
+#define SHT_ARM_ATTRIBUTES     (SHT_LOPROC + 3) /* ARM attributes section.  */
+
+
+/* ARM relocs.  */
+
+#define R_ARM_NONE             0       /* No reloc */
+#define R_ARM_PC24             1       /* PC relative 26 bit branch */
+#define R_ARM_ABS32            2       /* Direct 32 bit  */
+#define R_ARM_REL32            3       /* PC relative 32 bit */
+#define R_ARM_PC13             4
+#define R_ARM_ABS16            5       /* Direct 16 bit */
+#define R_ARM_ABS12            6       /* Direct 12 bit */
+#define R_ARM_THM_ABS5         7
+#define R_ARM_ABS8             8       /* Direct 8 bit */
+#define R_ARM_SBREL32          9
+#define R_ARM_THM_PC22         10
+#define R_ARM_THM_PC8          11
+#define R_ARM_AMP_VCALL9       12
+#define R_ARM_SWI24            13
+#define R_ARM_THM_SWI8         14
+#define R_ARM_XPC25            15
+#define R_ARM_THM_XPC22                16
+#define R_ARM_TLS_DTPMOD32     17      /* ID of module containing symbol */
+#define R_ARM_TLS_DTPOFF32     18      /* Offset in TLS block */
+#define R_ARM_TLS_TPOFF32      19      /* Offset in static TLS block */
+#define R_ARM_COPY             20      /* Copy symbol at runtime */
+#define R_ARM_GLOB_DAT         21      /* Create GOT entry */
+#define R_ARM_JUMP_SLOT                22      /* Create PLT entry */
+#define R_ARM_RELATIVE         23      /* Adjust by program base */
+#define R_ARM_GOTOFF           24      /* 32 bit offset to GOT */
+#define R_ARM_GOTPC            25      /* 32 bit PC relative offset to GOT */
+#define R_ARM_GOT32            26      /* 32 bit GOT entry */
+#define R_ARM_PLT32            27      /* 32 bit PLT address */
+#define R_ARM_ALU_PCREL_7_0    32
+#define R_ARM_ALU_PCREL_15_8   33
+#define R_ARM_ALU_PCREL_23_15  34
+#define R_ARM_LDR_SBREL_11_0   35
+#define R_ARM_ALU_SBREL_19_12  36
+#define R_ARM_ALU_SBREL_27_20  37
+#define R_ARM_GNU_VTENTRY      100
+#define R_ARM_GNU_VTINHERIT    101
+#define R_ARM_THM_PC11         102     /* thumb unconditional branch */
+#define R_ARM_THM_PC9          103     /* thumb conditional branch */
+#define R_ARM_TLS_GD32         104     /* PC-rel 32 bit for global dynamic
+                                          thread local data */
+#define R_ARM_TLS_LDM32                105     /* PC-rel 32 bit for local 
dynamic
+                                          thread local data */
+#define R_ARM_TLS_LDO32                106     /* 32 bit offset relative to TLS
+                                          block */
+#define R_ARM_TLS_IE32         107     /* PC-rel 32 bit for GOT entry of
+                                          static TLS block offset */
+#define R_ARM_TLS_LE32         108     /* 32 bit offset relative to static
+                                          TLS block */
+#define R_ARM_RXPC25           249
+#define R_ARM_RSBREL32         250
+#define R_ARM_THM_RPC22                251
+#define R_ARM_RREL32           252
+#define R_ARM_RABS22           253
+#define R_ARM_RPC24            254
+#define R_ARM_RBASE            255
+/* Keep this the last entry.  */
+#define R_ARM_NUM              256
+
+/* IA-64 specific declarations.  */
+
+/* Processor specific flags for the Ehdr e_flags field.  */
+#define EF_IA_64_MASKOS                0x0000000f      /* os-specific flags */
+#define EF_IA_64_ABI64         0x00000010      /* 64-bit ABI */
+#define EF_IA_64_ARCH          0xff000000      /* arch. version mask */
+
+/* Processor specific values for the Phdr p_type field.  */
+#define PT_IA_64_ARCHEXT       (PT_LOPROC + 0) /* arch extension bits */
+#define PT_IA_64_UNWIND                (PT_LOPROC + 1) /* ia64 unwind bits */
+#define PT_IA_64_HP_OPT_ANOT   (PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT   (PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK      (PT_LOOS + 0x14)
+
+/* Processor specific flags for the Phdr p_flags field.  */
+#define PF_IA_64_NORECOV       0x80000000      /* spec insns w/o recovery */
+
+/* Processor specific values for the Shdr sh_type field.  */
+#define SHT_IA_64_EXT          (SHT_LOPROC + 0) /* extension bits */
+#define SHT_IA_64_UNWIND       (SHT_LOPROC + 1) /* unwind bits */
+
+/* Processor specific flags for the Shdr sh_flags field.  */
+#define SHF_IA_64_SHORT                0x10000000      /* section near gp */
+#define SHF_IA_64_NORECOV      0x20000000      /* spec insns w/o recovery */
+
+/* Processor specific values for the Dyn d_tag field.  */
+#define DT_IA_64_PLT_RESERVE   (DT_LOPROC + 0)
+#define DT_IA_64_NUM           1
+
+/* IA-64 relocations.  */
+#define R_IA64_NONE            0x00    /* none */
+#define R_IA64_IMM14           0x21    /* symbol + addend, add imm14 */
+#define R_IA64_IMM22           0x22    /* symbol + addend, add imm22 */
+#define R_IA64_IMM64           0x23    /* symbol + addend, mov imm64 */
+#define R_IA64_DIR32MSB                0x24    /* symbol + addend, data4 MSB */
+#define R_IA64_DIR32LSB                0x25    /* symbol + addend, data4 LSB */
+#define R_IA64_DIR64MSB                0x26    /* symbol + addend, data8 MSB */
+#define R_IA64_DIR64LSB                0x27    /* symbol + addend, data8 LSB */
+#define R_IA64_GPREL22         0x2a    /* @gprel(sym + add), add imm22 */
+#define R_IA64_GPREL64I                0x2b    /* @gprel(sym + add), mov imm64 
*/
+#define R_IA64_GPREL32MSB      0x2c    /* @gprel(sym + add), data4 MSB */
+#define R_IA64_GPREL32LSB      0x2d    /* @gprel(sym + add), data4 LSB */
+#define R_IA64_GPREL64MSB      0x2e    /* @gprel(sym + add), data8 MSB */
+#define R_IA64_GPREL64LSB      0x2f    /* @gprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF22         0x32    /* @ltoff(sym + add), add imm22 */
+#define R_IA64_LTOFF64I                0x33    /* @ltoff(sym + add), mov imm64 
*/
+#define R_IA64_PLTOFF22                0x3a    /* @pltoff(sym + add), add 
imm22 */
+#define R_IA64_PLTOFF64I       0x3b    /* @pltoff(sym + add), mov imm64 */
+#define R_IA64_PLTOFF64MSB     0x3e    /* @pltoff(sym + add), data8 MSB */
+#define R_IA64_PLTOFF64LSB     0x3f    /* @pltoff(sym + add), data8 LSB */
+#define R_IA64_FPTR64I         0x43    /* @fptr(sym + add), mov imm64 */
+#define R_IA64_FPTR32MSB       0x44    /* @fptr(sym + add), data4 MSB */
+#define R_IA64_FPTR32LSB       0x45    /* @fptr(sym + add), data4 LSB */
+#define R_IA64_FPTR64MSB       0x46    /* @fptr(sym + add), data8 MSB */
+#define R_IA64_FPTR64LSB       0x47    /* @fptr(sym + add), data8 LSB */
+#define R_IA64_PCREL60B                0x48    /* @pcrel(sym + add), brl */
+#define R_IA64_PCREL21B                0x49    /* @pcrel(sym + add), ptb, call 
*/
+#define R_IA64_PCREL21M                0x4a    /* @pcrel(sym + add), chk.s */
+#define R_IA64_PCREL21F                0x4b    /* @pcrel(sym + add), fchkf */
+#define R_IA64_PCREL32MSB      0x4c    /* @pcrel(sym + add), data4 MSB */
+#define R_IA64_PCREL32LSB      0x4d    /* @pcrel(sym + add), data4 LSB */
+#define R_IA64_PCREL64MSB      0x4e    /* @pcrel(sym + add), data8 MSB */
+#define R_IA64_PCREL64LSB      0x4f    /* @pcrel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_FPTR22    0x52    /* @ltoff(@fptr(s+a)), imm22 */
+#define R_IA64_LTOFF_FPTR64I   0x53    /* @ltoff(@fptr(s+a)), imm64 */
+#define R_IA64_LTOFF_FPTR32MSB 0x54    /* @ltoff(@fptr(s+a)), data4 MSB */
+#define R_IA64_LTOFF_FPTR32LSB 0x55    /* @ltoff(@fptr(s+a)), data4 LSB */
+#define R_IA64_LTOFF_FPTR64MSB 0x56    /* @ltoff(@fptr(s+a)), data8 MSB */
+#define R_IA64_LTOFF_FPTR64LSB 0x57    /* @ltoff(@fptr(s+a)), data8 LSB */
+#define R_IA64_SEGREL32MSB     0x5c    /* @segrel(sym + add), data4 MSB */
+#define R_IA64_SEGREL32LSB     0x5d    /* @segrel(sym + add), data4 LSB */
+#define R_IA64_SEGREL64MSB     0x5e    /* @segrel(sym + add), data8 MSB */
+#define R_IA64_SEGREL64LSB     0x5f    /* @segrel(sym + add), data8 LSB */
+#define R_IA64_SECREL32MSB     0x64    /* @secrel(sym + add), data4 MSB */
+#define R_IA64_SECREL32LSB     0x65    /* @secrel(sym + add), data4 LSB */
+#define R_IA64_SECREL64MSB     0x66    /* @secrel(sym + add), data8 MSB */
+#define R_IA64_SECREL64LSB     0x67    /* @secrel(sym + add), data8 LSB */
+#define R_IA64_REL32MSB                0x6c    /* data 4 + REL */
+#define R_IA64_REL32LSB                0x6d    /* data 4 + REL */
+#define R_IA64_REL64MSB                0x6e    /* data 8 + REL */
+#define R_IA64_REL64LSB                0x6f    /* data 8 + REL */
+#define R_IA64_LTV32MSB                0x74    /* symbol + addend, data4 MSB */
+#define R_IA64_LTV32LSB                0x75    /* symbol + addend, data4 LSB */
+#define R_IA64_LTV64MSB                0x76    /* symbol + addend, data8 MSB */
+#define R_IA64_LTV64LSB                0x77    /* symbol + addend, data8 LSB */
+#define R_IA64_PCREL21BI       0x79    /* @pcrel(sym + add), 21bit inst */
+#define R_IA64_PCREL22         0x7a    /* @pcrel(sym + add), 22bit inst */
+#define R_IA64_PCREL64I                0x7b    /* @pcrel(sym + add), 64bit 
inst */
+#define R_IA64_IPLTMSB         0x80    /* dynamic reloc, imported PLT, MSB */
+#define R_IA64_IPLTLSB         0x81    /* dynamic reloc, imported PLT, LSB */
+#define R_IA64_COPY            0x84    /* copy relocation */
+#define R_IA64_SUB             0x85    /* Addend and symbol difference */
+#define R_IA64_LTOFF22X                0x86    /* LTOFF22, relaxable.  */
+#define R_IA64_LDXMOV          0x87    /* Use of LTOFF22X.  */
+#define R_IA64_TPREL14         0x91    /* @tprel(sym + add), imm14 */
+#define R_IA64_TPREL22         0x92    /* @tprel(sym + add), imm22 */
+#define R_IA64_TPREL64I                0x93    /* @tprel(sym + add), imm64 */
+#define R_IA64_TPREL64MSB      0x96    /* @tprel(sym + add), data8 MSB */
+#define R_IA64_TPREL64LSB      0x97    /* @tprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_TPREL22   0x9a    /* @ltoff(@tprel(s+a)), imm2 */
+#define R_IA64_DTPMOD64MSB     0xa6    /* @dtpmod(sym + add), data8 MSB */
+#define R_IA64_DTPMOD64LSB     0xa7    /* @dtpmod(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPMOD22  0xaa    /* @ltoff(@dtpmod(sym + add)), imm22 */
+#define R_IA64_DTPREL14                0xb1    /* @dtprel(sym + add), imm14 */
+#define R_IA64_DTPREL22                0xb2    /* @dtprel(sym + add), imm22 */
+#define R_IA64_DTPREL64I       0xb3    /* @dtprel(sym + add), imm64 */
+#define R_IA64_DTPREL32MSB     0xb4    /* @dtprel(sym + add), data4 MSB */
+#define R_IA64_DTPREL32LSB     0xb5    /* @dtprel(sym + add), data4 LSB */
+#define R_IA64_DTPREL64MSB     0xb6    /* @dtprel(sym + add), data8 MSB */
+#define R_IA64_DTPREL64LSB     0xb7    /* @dtprel(sym + add), data8 LSB */
+#define R_IA64_LTOFF_DTPREL22  0xba    /* @ltoff(@dtprel(s+a)), imm22 */
+
+/* SH specific declarations */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_SH_MACH_MASK                0x1f
+#define EF_SH_UNKNOWN          0x0
+#define EF_SH1                 0x1
+#define EF_SH2                 0x2
+#define EF_SH3                 0x3
+#define EF_SH_DSP              0x4
+#define EF_SH3_DSP             0x5
+#define EF_SH4AL_DSP           0x6
+#define EF_SH3E                        0x8
+#define EF_SH4                 0x9
+#define EF_SH2E                        0xb
+#define EF_SH4A                        0xc
+#define EF_SH2A                        0xd
+#define EF_SH4_NOFPU           0x10
+#define EF_SH4A_NOFPU          0x11
+#define EF_SH4_NOMMU_NOFPU     0x12
+#define EF_SH2A_NOFPU          0x13
+#define EF_SH3_NOMMU           0x14
+#define EF_SH2A_SH4_NOFPU      0x15
+#define EF_SH2A_SH3_NOFPU      0x16
+#define EF_SH2A_SH4            0x17
+#define EF_SH2A_SH3E           0x18
+
+/* SH relocs.  */
+#define        R_SH_NONE               0
+#define        R_SH_DIR32              1
+#define        R_SH_REL32              2
+#define        R_SH_DIR8WPN            3
+#define        R_SH_IND12W             4
+#define        R_SH_DIR8WPL            5
+#define        R_SH_DIR8WPZ            6
+#define        R_SH_DIR8BP             7
+#define        R_SH_DIR8W              8
+#define        R_SH_DIR8L              9
+#define        R_SH_SWITCH16           25
+#define        R_SH_SWITCH32           26
+#define        R_SH_USES               27
+#define        R_SH_COUNT              28
+#define        R_SH_ALIGN              29
+#define        R_SH_CODE               30
+#define        R_SH_DATA               31
+#define        R_SH_LABEL              32
+#define        R_SH_SWITCH8            33
+#define        R_SH_GNU_VTINHERIT      34
+#define        R_SH_GNU_VTENTRY        35
+#define        R_SH_TLS_GD_32          144
+#define        R_SH_TLS_LD_32          145
+#define        R_SH_TLS_LDO_32         146
+#define        R_SH_TLS_IE_32          147
+#define        R_SH_TLS_LE_32          148
+#define        R_SH_TLS_DTPMOD32       149
+#define        R_SH_TLS_DTPOFF32       150
+#define        R_SH_TLS_TPOFF32        151
+#define        R_SH_GOT32              160
+#define        R_SH_PLT32              161
+#define        R_SH_COPY               162
+#define        R_SH_GLOB_DAT           163
+#define        R_SH_JMP_SLOT           164
+#define        R_SH_RELATIVE           165
+#define        R_SH_GOTOFF             166
+#define        R_SH_GOTPC              167
+/* Keep this the last entry.  */
+#define        R_SH_NUM                256
+
+/* S/390 specific definitions.  */
+
+/* Valid values for the e_flags field.  */
+
+#define EF_S390_HIGH_GPRS    0x00000001  /* High GPRs kernel facility needed.  
*/
+
+/* Additional s390 relocs */
+
+#define R_390_NONE             0       /* No reloc.  */
+#define R_390_8                        1       /* Direct 8 bit.  */
+#define R_390_12               2       /* Direct 12 bit.  */
+#define R_390_16               3       /* Direct 16 bit.  */
+#define R_390_32               4       /* Direct 32 bit.  */
+#define R_390_PC32             5       /* PC relative 32 bit.  */
+#define R_390_GOT12            6       /* 12 bit GOT offset.  */
+#define R_390_GOT32            7       /* 32 bit GOT offset.  */
+#define R_390_PLT32            8       /* 32 bit PC relative PLT address.  */
+#define R_390_COPY             9       /* Copy symbol at runtime.  */
+#define R_390_GLOB_DAT         10      /* Create GOT entry.  */
+#define R_390_JMP_SLOT         11      /* Create PLT entry.  */
+#define R_390_RELATIVE         12      /* Adjust by program base.  */
+#define R_390_GOTOFF32         13      /* 32 bit offset to GOT.         */
+#define R_390_GOTPC            14      /* 32 bit PC relative offset to GOT.  */
+#define R_390_GOT16            15      /* 16 bit GOT offset.  */
+#define R_390_PC16             16      /* PC relative 16 bit.  */
+#define R_390_PC16DBL          17      /* PC relative 16 bit shifted by 1.  */
+#define R_390_PLT16DBL         18      /* 16 bit PC rel. PLT shifted by 1.  */
+#define R_390_PC32DBL          19      /* PC relative 32 bit shifted by 1.  */
+#define R_390_PLT32DBL         20      /* 32 bit PC rel. PLT shifted by 1.  */
+#define R_390_GOTPCDBL         21      /* 32 bit PC rel. GOT shifted by 1.  */
+#define R_390_64               22      /* Direct 64 bit.  */
+#define R_390_PC64             23      /* PC relative 64 bit.  */
+#define R_390_GOT64            24      /* 64 bit GOT offset.  */
+#define R_390_PLT64            25      /* 64 bit PC relative PLT address.  */
+#define R_390_GOTENT           26      /* 32 bit PC rel. to GOT entry >> 1. */
+#define R_390_GOTOFF16         27      /* 16 bit offset to GOT. */
+#define R_390_GOTOFF64         28      /* 64 bit offset to GOT. */
+#define R_390_GOTPLT12         29      /* 12 bit offset to jump slot.  */
+#define R_390_GOTPLT16         30      /* 16 bit offset to jump slot.  */
+#define R_390_GOTPLT32         31      /* 32 bit offset to jump slot.  */
+#define R_390_GOTPLT64         32      /* 64 bit offset to jump slot.  */
+#define R_390_GOTPLTENT                33      /* 32 bit rel. offset to jump 
slot.  */
+#define R_390_PLTOFF16         34      /* 16 bit offset from GOT to PLT. */
+#define R_390_PLTOFF32         35      /* 32 bit offset from GOT to PLT. */
+#define R_390_PLTOFF64         36      /* 16 bit offset from GOT to PLT. */
+#define R_390_TLS_LOAD         37      /* Tag for load insn in TLS code.  */
+#define R_390_TLS_GDCALL       38      /* Tag for function call in general
+                                          dynamic TLS code. */
+#define R_390_TLS_LDCALL       39      /* Tag for function call in local
+                                          dynamic TLS code. */
+#define R_390_TLS_GD32         40      /* Direct 32 bit for general dynamic
+                                          thread local data.  */
+#define R_390_TLS_GD64         41      /* Direct 64 bit for general dynamic
+                                         thread local data.  */
+#define R_390_TLS_GOTIE12      42      /* 12 bit GOT offset for static TLS
+                                          block offset.  */
+#define R_390_TLS_GOTIE32      43      /* 32 bit GOT offset for static TLS
+                                          block offset.  */
+#define R_390_TLS_GOTIE64      44      /* 64 bit GOT offset for static TLS
+                                          block offset. */
+#define R_390_TLS_LDM32                45      /* Direct 32 bit for local 
dynamic
+                                          thread local data in LE code.  */
+#define R_390_TLS_LDM64                46      /* Direct 64 bit for local 
dynamic
+                                          thread local data in LE code.  */
+#define R_390_TLS_IE32         47      /* 32 bit address of GOT entry for
+                                          negated static TLS block offset.  */
+#define R_390_TLS_IE64         48      /* 64 bit address of GOT entry for
+                                          negated static TLS block offset.  */
+#define R_390_TLS_IEENT                49      /* 32 bit rel. offset to GOT 
entry for
+                                          negated static TLS block offset.  */
+#define R_390_TLS_LE32         50      /* 32 bit negated offset relative to
+                                          static TLS block.  */
+#define R_390_TLS_LE64         51      /* 64 bit negated offset relative to
+                                          static TLS block.  */
+#define R_390_TLS_LDO32                52      /* 32 bit offset relative to TLS
+                                          block.  */
+#define R_390_TLS_LDO64                53      /* 64 bit offset relative to TLS
+                                          block.  */
+#define R_390_TLS_DTPMOD       54      /* ID of module containing symbol.  */
+#define R_390_TLS_DTPOFF       55      /* Offset in TLS block.  */
+#define R_390_TLS_TPOFF                56      /* Negated offset in static TLS
+                                          block.  */
+#define R_390_20               57      /* Direct 20 bit.  */
+#define R_390_GOT20            58      /* 20 bit GOT offset.  */
+#define R_390_GOTPLT20         59      /* 20 bit offset to jump slot.  */
+#define R_390_TLS_GOTIE20      60      /* 20 bit GOT offset for static TLS
+                                          block offset.  */
+/* Keep this the last entry.  */
+#define R_390_NUM              61
+
+
+/* CRIS relocations.  */
+#define R_CRIS_NONE            0
+#define R_CRIS_8               1
+#define R_CRIS_16              2
+#define R_CRIS_32              3
+#define R_CRIS_8_PCREL         4
+#define R_CRIS_16_PCREL                5
+#define R_CRIS_32_PCREL                6
+#define R_CRIS_GNU_VTINHERIT   7
+#define R_CRIS_GNU_VTENTRY     8
+#define R_CRIS_COPY            9
+#define R_CRIS_GLOB_DAT                10
+#define R_CRIS_JUMP_SLOT       11
+#define R_CRIS_RELATIVE                12
+#define R_CRIS_16_GOT          13
+#define R_CRIS_32_GOT          14
+#define R_CRIS_16_GOTPLT       15
+#define R_CRIS_32_GOTPLT       16
+#define R_CRIS_32_GOTREL       17
+#define R_CRIS_32_PLT_GOTREL   18
+#define R_CRIS_32_PLT_PCREL    19
+
+#define R_CRIS_NUM             20
+
+
+/* AMD x86-64 relocations.  */
+#define R_X86_64_NONE          0       /* No reloc */
+#define R_X86_64_64            1       /* Direct 64 bit  */
+#define R_X86_64_PC32          2       /* PC relative 32 bit signed */
+#define R_X86_64_GOT32         3       /* 32 bit GOT entry */
+#define R_X86_64_PLT32         4       /* 32 bit PLT address */
+#define R_X86_64_COPY          5       /* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT      6       /* Create GOT entry */
+#define R_X86_64_JUMP_SLOT     7       /* Create PLT entry */
+#define R_X86_64_RELATIVE      8       /* Adjust by program base */
+#define R_X86_64_GOTPCREL      9       /* 32 bit signed PC relative
+                                          offset to GOT */
+#define R_X86_64_32            10      /* Direct 32 bit zero extended */
+#define R_X86_64_32S           11      /* Direct 32 bit sign extended */
+#define R_X86_64_16            12      /* Direct 16 bit zero extended */
+#define R_X86_64_PC16          13      /* 16 bit sign extended pc relative */
+#define R_X86_64_8             14      /* Direct 8 bit sign extended  */
+#define R_X86_64_PC8           15      /* 8 bit sign extended pc relative */
+#define R_X86_64_DTPMOD64      16      /* ID of module containing symbol */
+#define R_X86_64_DTPOFF64      17      /* Offset in module's TLS block */
+#define R_X86_64_TPOFF64       18      /* Offset in initial TLS block */
+#define R_X86_64_TLSGD         19      /* 32 bit signed PC relative offset
+                                          to two GOT entries for GD symbol */
+#define R_X86_64_TLSLD         20      /* 32 bit signed PC relative offset
+                                          to two GOT entries for LD symbol */
+#define R_X86_64_DTPOFF32      21      /* Offset in TLS block */
+#define R_X86_64_GOTTPOFF      22      /* 32 bit signed PC relative offset
+                                          to GOT entry for IE symbol */
+#define R_X86_64_TPOFF32       23      /* Offset in initial TLS block */
+#define R_X86_64_PC64          24      /* PC relative 64 bit */
+#define R_X86_64_GOTOFF64      25      /* 64 bit offset to GOT */
+#define R_X86_64_GOTPC32       26      /* 32 bit signed pc relative
+                                          offset to GOT */
+#define R_X86_64_GOT64         27      /* 64-bit GOT entry offset */
+#define R_X86_64_GOTPCREL64    28      /* 64-bit PC relative offset
+                                          to GOT entry */
+#define R_X86_64_GOTPC64       29      /* 64-bit PC relative offset to GOT */
+#define R_X86_64_GOTPLT64      30      /* like GOT64, says PLT entry needed */
+#define R_X86_64_PLTOFF64      31      /* 64-bit GOT relative offset
+                                          to PLT entry */
+#define R_X86_64_SIZE32                32      /* Size of symbol plus 32-bit 
addend */
+#define R_X86_64_SIZE64                33      /* Size of symbol plus 64-bit 
addend */
+#define R_X86_64_GOTPC32_TLSDESC 34    /* GOT offset for TLS descriptor.  */
+#define R_X86_64_TLSDESC_CALL   35     /* Marker for call through TLS
+                                          descriptor.  */
+#define R_X86_64_TLSDESC        36     /* TLS descriptor.  */
+#define R_X86_64_IRELATIVE     37      /* Adjust indirectly by program base */
+
+#define R_X86_64_NUM           38
+
+
+/* AM33 relocations.  */
+#define R_MN10300_NONE         0       /* No reloc.  */
+#define R_MN10300_32           1       /* Direct 32 bit.  */
+#define R_MN10300_16           2       /* Direct 16 bit.  */
+#define R_MN10300_8            3       /* Direct 8 bit.  */
+#define R_MN10300_PCREL32      4       /* PC-relative 32-bit.  */
+#define R_MN10300_PCREL16      5       /* PC-relative 16-bit signed.  */
+#define R_MN10300_PCREL8       6       /* PC-relative 8-bit signed.  */
+#define R_MN10300_GNU_VTINHERIT        7       /* Ancient C++ vtable 
garbage... */
+#define R_MN10300_GNU_VTENTRY  8       /* ... collection annotation.  */
+#define R_MN10300_24           9       /* Direct 24 bit.  */
+#define R_MN10300_GOTPC32      10      /* 32-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTPC16      11      /* 16-bit PCrel offset to GOT.  */
+#define R_MN10300_GOTOFF32     12      /* 32-bit offset from GOT.  */
+#define R_MN10300_GOTOFF24     13      /* 24-bit offset from GOT.  */
+#define R_MN10300_GOTOFF16     14      /* 16-bit offset from GOT.  */
+#define R_MN10300_PLT32                15      /* 32-bit PCrel to PLT entry.  
*/
+#define R_MN10300_PLT16                16      /* 16-bit PCrel to PLT entry.  
*/
+#define R_MN10300_GOT32                17      /* 32-bit offset to GOT entry.  
*/
+#define R_MN10300_GOT24                18      /* 24-bit offset to GOT entry.  
*/
+#define R_MN10300_GOT16                19      /* 16-bit offset to GOT entry.  
*/
+#define R_MN10300_COPY         20      /* Copy symbol at runtime.  */
+#define R_MN10300_GLOB_DAT     21      /* Create GOT entry.  */
+#define R_MN10300_JMP_SLOT     22      /* Create PLT entry.  */
+#define R_MN10300_RELATIVE     23      /* Adjust by program base.  */
+
+#define R_MN10300_NUM          24
+
+
+/* M32R relocs.  */
+#define R_M32R_NONE            0       /* No reloc. */
+#define R_M32R_16              1       /* Direct 16 bit. */
+#define R_M32R_32              2       /* Direct 32 bit. */
+#define R_M32R_24              3       /* Direct 24 bit. */
+#define R_M32R_10_PCREL                4       /* PC relative 10 bit shifted. 
*/
+#define R_M32R_18_PCREL                5       /* PC relative 18 bit shifted. 
*/
+#define R_M32R_26_PCREL                6       /* PC relative 26 bit shifted. 
*/
+#define R_M32R_HI16_ULO                7       /* High 16 bit with unsigned 
low. */
+#define R_M32R_HI16_SLO                8       /* High 16 bit with signed low. 
*/
+#define R_M32R_LO16            9       /* Low 16 bit. */
+#define R_M32R_SDA16           10      /* 16 bit offset in SDA. */
+#define R_M32R_GNU_VTINHERIT   11
+#define R_M32R_GNU_VTENTRY     12
+/* M32R relocs use SHT_RELA.  */
+#define R_M32R_16_RELA         33      /* Direct 16 bit. */
+#define R_M32R_32_RELA         34      /* Direct 32 bit. */
+#define R_M32R_24_RELA         35      /* Direct 24 bit. */
+#define R_M32R_10_PCREL_RELA   36      /* PC relative 10 bit shifted. */
+#define R_M32R_18_PCREL_RELA   37      /* PC relative 18 bit shifted. */
+#define R_M32R_26_PCREL_RELA   38      /* PC relative 26 bit shifted. */
+#define R_M32R_HI16_ULO_RELA   39      /* High 16 bit with unsigned low */
+#define R_M32R_HI16_SLO_RELA   40      /* High 16 bit with signed low */
+#define R_M32R_LO16_RELA       41      /* Low 16 bit */
+#define R_M32R_SDA16_RELA      42      /* 16 bit offset in SDA */
+#define R_M32R_RELA_GNU_VTINHERIT      43
+#define R_M32R_RELA_GNU_VTENTRY        44
+#define R_M32R_REL32           45      /* PC relative 32 bit.  */
+
+#define R_M32R_GOT24           48      /* 24 bit GOT entry */
+#define R_M32R_26_PLTREL       49      /* 26 bit PC relative to PLT shifted */
+#define R_M32R_COPY            50      /* Copy symbol at runtime */
+#define R_M32R_GLOB_DAT                51      /* Create GOT entry */
+#define R_M32R_JMP_SLOT                52      /* Create PLT entry */
+#define R_M32R_RELATIVE                53      /* Adjust by program base */
+#define R_M32R_GOTOFF          54      /* 24 bit offset to GOT */
+#define R_M32R_GOTPC24         55      /* 24 bit PC relative offset to GOT */
+#define R_M32R_GOT16_HI_ULO    56      /* High 16 bit GOT entry with unsigned
+                                          low */
+#define R_M32R_GOT16_HI_SLO    57      /* High 16 bit GOT entry with signed
+                                          low */
+#define R_M32R_GOT16_LO                58      /* Low 16 bit GOT entry */
+#define R_M32R_GOTPC_HI_ULO    59      /* High 16 bit PC relative offset to
+                                          GOT with unsigned low */
+#define R_M32R_GOTPC_HI_SLO    60      /* High 16 bit PC relative offset to
+                                          GOT with signed low */
+#define R_M32R_GOTPC_LO                61      /* Low 16 bit PC relative 
offset to
+                                          GOT */
+#define R_M32R_GOTOFF_HI_ULO   62      /* High 16 bit offset to GOT
+                                          with unsigned low */
+#define R_M32R_GOTOFF_HI_SLO   63      /* High 16 bit offset to GOT
+                                          with signed low */
+#define R_M32R_GOTOFF_LO       64      /* Low 16 bit offset to GOT */
+#define R_M32R_NUM             256     /* Keep this the last entry. */
+
+
+#endif /* elf.h */
diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index df10ea3..c293233 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -37,202 +37,584 @@
 #include <full-read.h>
 
 #include "_scm.h"
+#include "elf.h"
 #include "programs.h"
 #include "objcodes.h"
 
-/* SCM_OBJCODE_COOKIE, defined in _scm.h, is a magic value prepended
-   to objcode on disk but not in memory.
+/* Before, we used __BYTE_ORDER, but that is not defined on all
+   systems. So punt and use automake, PDP endianness be damned. */
+#define SCM_BYTE_ORDER_BE 4321
+#define SCM_BYTE_ORDER_LE 1234
 
-   The length of the header must be a multiple of 8 bytes.  */
-verify (((sizeof (SCM_OBJCODE_COOKIE) - 1) & 7) == 0);
+/* Byte order of the build machine.  */
+#ifdef WORDS_BIGENDIAN
+#define SCM_BYTE_ORDER SCM_BYTE_ORDER_BE
+#else
+#define SCM_BYTE_ORDER SCM_BYTE_ORDER_LE
+#endif
 
-/* Endianness and word size of the compilation target.  */
-static SCM target_endianness_var = SCM_BOOL_F;
-static SCM target_word_size_var = SCM_BOOL_F;
+/* This file contains the loader for Guile's on-disk format: ELF with
+   some custom tags in the dynamic segment.  */
+
+#if SIZEOF_SCM_T_BITS == 4
+#define Elf_Half Elf32_Half
+#define Elf_Word Elf32_Word
+#define Elf_Ehdr Elf32_Ehdr
+#define ELFCLASS ELFCLASS32
+#define Elf_Phdr Elf32_Phdr
+#define Elf_Dyn Elf32_Dyn
+#elif SIZEOF_SCM_T_BITS == 8
+#define Elf_Half Elf64_Half
+#define Elf_Word Elf64_Word
+#define Elf_Ehdr Elf64_Ehdr
+#define ELFCLASS ELFCLASS64
+#define Elf_Phdr Elf64_Phdr
+#define Elf_Dyn Elf64_Dyn
+#else
+#error
+#endif
 
-
-/*
- * Objcode type
- */
+#define DT_LOGUILE          0x37146000  /* Start of Guile-specific */
+#define DT_GUILE_GC_ROOT    0x37146000  /* Offset of GC roots */
+#define DT_GUILE_GC_ROOT_SZ 0x37146001  /* Size in machine words of GC
+                                           roots */
+#define DT_GUILE_ENTRY      0x37146002  /* Address of entry thunk */
+#define DT_GUILE_RTL_VERSION 0x37146003 /* Bytecode version */
+#define DT_HIGUILE          0x37146fff  /* End of Guile-specific */
 
-/* Endianness of the build machine.  */
 #ifdef WORDS_BIGENDIAN
-# define NATIVE_ENDIANNESS 'B'
+#define ELFDATA ELFDATA2MSB
 #else
-# define NATIVE_ENDIANNESS 'L'
+#define ELFDATA ELFDATA2LSB
 #endif
 
-/* Return the endianness of the compilation target.  */
-static char
-target_endianness (void)
+enum bytecode_kind
+  {
+    BYTECODE_KIND_NONE,
+    BYTECODE_KIND_GUILE_2_0
+  };
+
+static SCM
+pointer_to_procedure (enum bytecode_kind bytecode_kind, char *ptr)
 {
-  if (scm_is_true (target_endianness_var))
-    return scm_is_eq (scm_call_0 (scm_variable_ref (target_endianness_var)),
-                     scm_endianness_big) ? 'B' : 'L';
-  else
-    return NATIVE_ENDIANNESS;
+  switch (bytecode_kind)
+    {
+    case BYTECODE_KIND_GUILE_2_0:
+      {
+        SCM objcode;
+        scm_t_bits tag = SCM_MAKE_OBJCODE_TAG (SCM_OBJCODE_TYPE_MMAP, 0);
+
+        objcode = scm_double_cell (tag, (scm_t_bits) ptr, SCM_BOOL_F_BITS, 0);
+        return scm_make_program (objcode, SCM_BOOL_F, SCM_UNDEFINED);
+      }
+    case BYTECODE_KIND_NONE:
+    default:
+      abort ();
+    }
 }
 
-/* Return the word size in bytes of the compilation target.  */
-static size_t
-target_word_size (void)
+static const char*
+check_elf_header (const Elf_Ehdr *header)
 {
-  if (scm_is_true (target_word_size_var))
-    return scm_to_size_t (scm_call_0
-                         (scm_variable_ref (target_word_size_var)));
-  else
-    return sizeof (void *);
+  if (!(header->e_ident[EI_MAG0] == ELFMAG0
+        && header->e_ident[EI_MAG1] == ELFMAG1
+        && header->e_ident[EI_MAG2] == ELFMAG2
+        && header->e_ident[EI_MAG3] == ELFMAG3))
+    return "not an ELF file";
+
+  if (header->e_ident[EI_CLASS] != ELFCLASS)
+    return "ELF file does not have native word size";
+
+  if (header->e_ident[EI_DATA] != ELFDATA)
+    return "ELF file does not have native byte order";
+
+  if (header->e_ident[EI_VERSION] != EV_CURRENT)
+    return "bad ELF version";
+
+  if (header->e_ident[EI_OSABI] != ELFOSABI_STANDALONE)
+    return "unexpected OS ABI";
+
+  if (header->e_ident[EI_ABIVERSION] != 0)
+    return "unexpected ABI version";
+
+  if (header->e_type != ET_DYN)
+    return "unexpected ELF type";
+
+  if (header->e_machine != EM_NONE)
+    return "unexpected machine";
+
+  if (header->e_version != EV_CURRENT)
+    return "unexpected ELF version";
+
+  if (header->e_ehsize != sizeof *header)
+    return "unexpected header size";
+
+  if (header->e_phentsize != sizeof (Elf_Phdr))
+    return "unexpected program header size";
+
+  return NULL;
 }
 
-/* Convert X, which is in byte order ENDIANNESS, to its native
-   representation.  */
-static inline uint32_t
-to_native_order (uint32_t x, char endianness)
+static int
+segment_flags_to_prot (Elf_Word flags)
 {
-  if (endianness == NATIVE_ENDIANNESS)
-    return x;
-  else
-    return bswap_32 (x);
+  int prot = 0;
+          
+  if (flags & PF_X)
+    prot |= PROT_EXEC;
+  if (flags & PF_W)
+    prot |= PROT_WRITE;
+  if (flags & PF_R)
+    prot |= PROT_READ;
+
+  return prot;
 }
 
-static void
-verify_cookie (char *cookie, struct stat *st, int map_fd, void *map_addr)
-#define FUNC_NAME "make_objcode_from_file"
+static int
+map_segments (int fd, char **base,
+              const Elf_Phdr *from, const Elf_Phdr *to)
 {
-  /* The cookie ends with a version of the form M.N, where M is the
-     major version and N is the minor version.  For this Guile to be
-     able to load an objcode, M must be SCM_OBJCODE_MAJOR_VERSION, and N
-     must be less than or equal to SCM_OBJCODE_MINOR_VERSION.  Since N
-     is the last character, we do a strict comparison on all but the
-     last, then a <= on the last one.  */
-  if (memcmp (cookie, SCM_OBJCODE_COOKIE, strlen (SCM_OBJCODE_COOKIE) - 1))
+  int prot = segment_flags_to_prot (from->p_flags);
+  char *ret;
+
+  ret = mmap (*base + from->p_vaddr,
+              to->p_offset + to->p_filesz - from->p_offset,
+              prot, MAP_PRIVATE, fd, from->p_offset);
+
+  if (ret == (char *) -1)
+    return 1;
+
+  if (!*base)
+    *base = ret;
+
+  return 0;
+}
+
+static int
+mprotect_segments (char *base, const Elf_Phdr *from, const Elf_Phdr *to)
+{
+  return mprotect (base + from->p_vaddr,
+                   to->p_vaddr + to->p_memsz - from->p_vaddr,
+                   segment_flags_to_prot (from->p_flags));
+}
+
+static char*
+process_dynamic_segment (char *base, Elf_Phdr *dyn_phdr,
+                         SCM *init_out, SCM *entry_out)
+{
+  char *dyn_addr = base + dyn_phdr->p_vaddr;
+  Elf_Dyn *dyn = (Elf_Dyn *) dyn_addr;
+  size_t i, dyn_size = dyn_phdr->p_memsz / sizeof (Elf_Dyn);
+  char *init = 0, *gc_root = 0, *entry = 0;
+  scm_t_ptrdiff gc_root_size = 0;
+  enum bytecode_kind bytecode_kind = BYTECODE_KIND_NONE;
+
+  for (i = 0; i < dyn_size; i++)
     {
-      SCM args = scm_list_1 (scm_from_latin1_stringn
-                             (cookie, strlen (SCM_OBJCODE_COOKIE)));
-      if (map_fd >= 0)
+      if (dyn[i].d_tag == DT_NULL)
+        break;
+
+      switch (dyn[i].d_tag)
         {
-          (void) close (map_fd);
-#ifdef HAVE_SYS_MMAN_H
-          (void) munmap (map_addr, st->st_size);
-#endif
+        case DT_INIT:
+          if (init)
+            return "duplicate DT_INIT";
+          init = base + dyn[i].d_un.d_val;
+          break;
+        case DT_GUILE_GC_ROOT:
+          if (gc_root)
+            return "duplicate DT_GUILE_GC_ROOT";
+          gc_root = base + dyn[i].d_un.d_val;
+          break;
+        case DT_GUILE_GC_ROOT_SZ:
+          if (gc_root_size)
+            return "duplicate DT_GUILE_GC_ROOT_SZ";
+          gc_root_size = dyn[i].d_un.d_val;
+          break;
+        case DT_GUILE_ENTRY:
+          if (entry)
+            return "duplicate DT_GUILE_ENTRY";
+          entry = base + dyn[i].d_un.d_val;
+          break;
+        case DT_GUILE_RTL_VERSION:
+          if (bytecode_kind != BYTECODE_KIND_NONE)
+            return "duplicate DT_GUILE_RTL_VERSION";
+          {
+            scm_t_uint16 major = dyn[i].d_un.d_val >> 16;
+            scm_t_uint16 minor = dyn[i].d_un.d_val & 0xffff;
+            if (major != 0x0200)
+              return "incompatible bytecode kind";
+            if (minor > SCM_OBJCODE_MINOR_VERSION)
+              return "incompatible bytecode version";
+            bytecode_kind = BYTECODE_KIND_GUILE_2_0;
+            break;
+          }
         }
-      scm_misc_error (FUNC_NAME, "bad header on object file: ~s", args);
     }
 
-  {
-    char minor_version = cookie[strlen (SCM_OBJCODE_COOKIE) - 1];
+  if (bytecode_kind != BYTECODE_KIND_GUILE_2_0)
+    return "missing DT_GUILE_RTL_VERSION";
+  if (init)
+    return "unexpected DT_INIT";
+  if ((scm_t_uintptr) entry % 8)
+    return "unaligned DT_GUILE_ENTRY";
+  if (!entry)
+    return "missing DT_GUILE_ENTRY";
+
+  if (gc_root)
+    GC_add_roots (gc_root, gc_root + gc_root_size);
+
+  *init_out = SCM_BOOL_F;
+  *entry_out = pointer_to_procedure (bytecode_kind, entry);
+  return NULL;
+}
+
+#define ABORT(msg) do { err_msg = msg; goto cleanup; } while (0)
 
-    if (minor_version > SCM_OBJCODE_MINOR_VERSION_STRING[0])
-      {
-        if (map_fd >= 0)
-          {
-            (void) close (map_fd);
 #ifdef HAVE_SYS_MMAN_H
-            (void) munmap (map_addr, st->st_size);
-#endif
-          }
+static SCM
+load_thunk_from_fd_using_mmap (int fd)
+#define FUNC_NAME "load-thunk-from-disk"
+{
+  Elf_Ehdr header;
+  Elf_Phdr *ph;
+  const char *err_msg = 0;
+  char *base = 0;
+  size_t n;
+  int i;
+  int start_segment = -1;
+  int prev_segment = -1;
+  int dynamic_segment = -1;
+  SCM init = SCM_BOOL_F, entry = SCM_BOOL_F;
+
+  if (full_read (fd, &header, sizeof header) != sizeof header)
+    ABORT ("object file too small");
+
+  if ((err_msg = check_elf_header (&header)))
+    goto cleanup;
+
+  if (lseek (fd, header.e_phoff, SEEK_SET) == (off_t) -1)
+    goto cleanup;
+  
+  n = header.e_phnum;
+  ph = scm_gc_malloc_pointerless (n * sizeof (Elf_Phdr), "segment headers");
+
+  if (full_read (fd, ph, n * sizeof (Elf_Phdr)) != n * sizeof (Elf_Phdr))
+    ABORT ("failed to read program headers");
+      
+  for (i = 0; i < n; i++)
+    {
+      if (!ph[i].p_memsz)
+        continue;
 
-        scm_misc_error (FUNC_NAME, "objcode minor version too new (~a > ~a)",
-                        scm_list_2 (scm_from_latin1_stringn (&minor_version, 
1),
-                                    scm_from_latin1_string
-                                    (SCM_OBJCODE_MINOR_VERSION_STRING)));
-      }
+      if (ph[i].p_filesz != ph[i].p_memsz)
+        ABORT ("expected p_filesz == p_memsz");
+      
+      if (!ph[i].p_flags)
+        ABORT ("expected nonzero segment flags");
+
+      if (ph[i].p_type == PT_DYNAMIC)
+        {
+          if (dynamic_segment >= 0)
+            ABORT ("expected only one PT_DYNAMIC segment");
+          dynamic_segment = i;
+        }
+
+      if (start_segment < 0)
+        {
+          if (!base && ph[i].p_vaddr)
+            ABORT ("first loadable vaddr is not 0");
+            
+          start_segment = prev_segment = i;
+          continue;
+        }
+
+      if (ph[i].p_flags == ph[start_segment].p_flags)
+        {
+          if (ph[i].p_vaddr - ph[prev_segment].p_vaddr 
+              != ph[i].p_offset - ph[prev_segment].p_offset)
+            ABORT ("coalesced segments not contiguous");
+
+          prev_segment = i;
+          continue;
+        }
+
+      /* Otherwise we have a new kind of segment.  Map previous
+         segments.  */
+      if (map_segments (fd, &base, &ph[start_segment], &ph[prev_segment]))
+        goto cleanup;
+
+      /* Open a new set of segments.  */
+      start_segment = prev_segment = i;
+    }
+
+  /* Map last segments.  */
+  if (start_segment < 0)
+    ABORT ("no loadable segments");
+
+  if (map_segments (fd, &base, &ph[start_segment], &ph[prev_segment]))
+    goto cleanup;
+
+  if (dynamic_segment < 0)
+    ABORT ("no PT_DYNAMIC segment");
+
+  if ((err_msg = process_dynamic_segment (base, &ph[dynamic_segment],
+                                          &init, &entry)))
+    goto cleanup;
+
+  if (scm_is_true (init))
+    scm_call_0 (init);
+
+  /* Finally!  Return the thunk.  */
+  return entry;
+
+  /* FIXME: munmap on error? */
+ cleanup:
+  {
+    int errno_save = errno;
+    (void) close (fd);
+    errno = errno_save;
+    if (errno)
+      SCM_SYSERROR;
+    scm_misc_error (FUNC_NAME, err_msg ? err_msg : "error loading ELF file",
+                    SCM_EOL);
   }
 }
 #undef FUNC_NAME
-
-/* The words in an objcode SCM object are as follows:
-     - scm_tc7_objcode | type | flags
-     - the struct scm_objcode C object
-     - the parent of this objcode: either another objcode, a bytevector,
-       or, in the case of mmap types, #f
-     - "native code" -- not currently used.
- */
+#endif /* HAVE_SYS_MMAN_H */
 
 static SCM
-make_objcode_from_file (int fd)
-#define FUNC_NAME "make_objcode_from_file"
+load_thunk_from_memory (char *data, size_t len)
+#define FUNC_NAME "load-thunk-from-memory"
 {
-  int ret;
-  /* The SCM_OBJCODE_COOKIE is a string literal, and thus has an extra
-     trailing NUL, hence the - 1. */
-  char cookie[sizeof (SCM_OBJCODE_COOKIE) - 1];
-  struct stat st;
+  Elf_Ehdr header;
+  Elf_Phdr *ph;
+  const char *err_msg = 0;
+  char *base = 0;
+  size_t n, memsz = 0, alignment = 8;
+  int i;
+  int first_loadable = -1;
+  int start_segment = -1;
+  int prev_segment = -1;
+  int dynamic_segment = -1;
+  SCM init = SCM_BOOL_F, entry = SCM_BOOL_F;
+
+  if (len < sizeof header)
+    ABORT ("object file too small");
+
+  memcpy (&header, data, sizeof header);
+
+  if ((err_msg = check_elf_header (&header)))
+    goto cleanup;
+
+  n = header.e_phnum;
+  if (len < header.e_phoff + n * sizeof (Elf_Phdr))
+    goto cleanup;
+  ph = (Elf_Phdr*) (data + header.e_phoff);
+
+  for (i = 0; i < n; i++)
+    {
+      if (!ph[i].p_memsz)
+        continue;
 
-  ret = fstat (fd, &st);
-  if (ret < 0)
-    SCM_SYSERROR;
+      if (ph[i].p_filesz != ph[i].p_memsz)
+        ABORT ("expected p_filesz == p_memsz");
 
-  if (st.st_size <= sizeof (struct scm_objcode) + sizeof cookie)
-    scm_misc_error (FUNC_NAME, "object file too small (~a bytes)",
-                   scm_list_1 (SCM_I_MAKINUM (st.st_size)));
+      if (!ph[i].p_flags)
+        ABORT ("expected nonzero segment flags");
 
-#ifdef HAVE_SYS_MMAN_H
-  {
-    char *addr;
-    struct scm_objcode *data;
+      if (ph[i].p_align < alignment)
+        {
+          if (ph[i].p_align % alignment)
+            ABORT ("expected new alignment to be multiple of old");
+          alignment = ph[i].p_align;
+        }
 
-    addr = mmap (0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+      if (ph[i].p_type == PT_DYNAMIC)
+        {
+          if (dynamic_segment >= 0)
+            ABORT ("expected only one PT_DYNAMIC segment");
+          dynamic_segment = i;
+        }
 
-    if (addr == MAP_FAILED)
-      {
-        int errno_save = errno;
-        (void) close (fd);
-        errno = errno_save;
-        SCM_SYSERROR;
-      }
-    else
-      {
-        memcpy (cookie, addr, sizeof cookie);
-        data = (struct scm_objcode *) (addr + sizeof cookie);
-      }
+      if (first_loadable < 0)
+        {
+          if (ph[i].p_vaddr)
+            ABORT ("first loadable vaddr is not 0");
 
-    verify_cookie (cookie, &st, fd, addr);
+          first_loadable = i;
+        }
 
+      if (ph[i].p_vaddr < memsz)
+        ABORT ("overlapping segments");
 
-    if (data->len + data->metalen
-        != (st.st_size - sizeof (*data) - sizeof cookie))
-      {
-        size_t total_len = sizeof (*data) + data->len + data->metalen;
+      if (ph[i].p_offset + ph[i].p_filesz > len)
+        ABORT ("segment beyond end of byte array");
+
+      memsz = ph[i].p_vaddr + ph[i].p_memsz;
+    }
 
-        (void) close (fd);
-        (void) munmap (addr, st.st_size);
+  if (first_loadable < 0)
+    ABORT ("no loadable segments");
 
-        scm_misc_error (FUNC_NAME, "bad length header (~a, ~a)",
-                        scm_list_2 (scm_from_size_t (st.st_size),
-                                    scm_from_size_t (total_len)));
-      }
+  if (dynamic_segment < 0)
+    ABORT ("no PT_DYNAMIC segment");
 
-    (void) close (fd);
-    return scm_permanent_object
-      (scm_double_cell (SCM_MAKE_OBJCODE_TAG (SCM_OBJCODE_TYPE_MMAP, 0),
-                        (scm_t_bits)(addr + strlen (SCM_OBJCODE_COOKIE)),
-                        SCM_BOOL_F_BITS, 0));
-  }
-#else
+  /* Now copy segments.  */
+
+  /* We leak this memory, as we leak the memory mappings in
+     load_thunk_from_fd_using_mmap.
+
+     If the file is has an alignment of 8, use the standard malloc.
+     (FIXME to ensure alignment on non-GNU malloc.)  Otherwise use
+     posix_memalign.  We only use mprotect if the aligment is 4096.  */
+  if (alignment == 8)
+    {
+      base = malloc (memsz);
+      if (!base)
+        goto cleanup;
+    }
+  else
+    if ((errno = posix_memalign ((void **) &base, alignment, memsz)))
+      goto cleanup;
+
+  memset (base, 0, memsz);
+
+  for (i = 0; i < n; i++)
+    {
+      if (!ph[i].p_memsz)
+        continue;
+
+      memcpy (base + ph[i].p_vaddr,
+              data + ph[i].p_offset,
+              ph[i].p_memsz);
+
+      if (start_segment < 0)
+        {
+          start_segment = prev_segment = i;
+          continue;
+        }
+
+      if (ph[i].p_flags == ph[start_segment].p_flags)
+        {
+          prev_segment = i;
+          continue;
+        }
+
+      if (alignment == 4096)
+        if (mprotect_segments (base, &ph[start_segment], &ph[prev_segment]))
+          goto cleanup;
+
+      /* Open a new set of segments.  */
+      start_segment = prev_segment = i;
+    }
+
+  /* Mprotect the last segments.  */
+  if (alignment == 4096)
+    if (mprotect_segments (base, &ph[start_segment], &ph[prev_segment]))
+      goto cleanup;
+
+  if ((err_msg = process_dynamic_segment (base, &ph[dynamic_segment],
+                                          &init, &entry)))
+    goto cleanup;
+
+  if (scm_is_true (init))
+    scm_call_0 (init);
+
+  /* Finally!  Return the thunk.  */
+  return entry;
+
+ cleanup:
   {
-    SCM bv = scm_c_make_bytevector (st.st_size - sizeof cookie);
+    if (errno)
+      SCM_SYSERROR;
+    scm_misc_error (FUNC_NAME, err_msg ? err_msg : "error loading ELF file",
+                    SCM_EOL);
+  }
+}
+#undef FUNC_NAME
 
-    if (full_read (fd, cookie, sizeof cookie) != sizeof cookie
-        || full_read (fd, SCM_BYTEVECTOR_CONTENTS (bv),
-                      SCM_BYTEVECTOR_LENGTH (bv)) != SCM_BYTEVECTOR_LENGTH 
(bv))
-      {
-        int errno_save = errno;
-        (void) close (fd);
-        errno = errno_save;
+#ifndef HAVE_SYS_MMAN_H
+static SCM
+load_thunk_from_fd_using_read (int fd)
+#define FUNC_NAME "load-thunk-from-disk"
+{
+  char *data;
+  size_t len;
+  struct stat st;
+  int ret;
+
+  ret = fstat (fd, &st);
+  if (ret < 0)
+    SCM_SYSERROR;
+  len = st.st_size;
+  data = scm_gc_malloc_pointerless (len, "objcode");
+  if (full_read (fd, data, len) != len)
+    {
+      int errno_save = errno;
+      (void) close (fd);
+      errno = errno_save;
+      if (errno)
         SCM_SYSERROR;
-      }
+      scm_misc_error (FUNC_NAME, "short read while loading objcode",
+                      SCM_EOL);
+    }
+  (void) close (fd);
+  return load_thunk_from_memory (data, len);
+}
+#undef FUNC_NAME
+#endif /* ! HAVE_SYS_MMAN_H */
 
-    (void) close (fd);
+SCM_DEFINE (scm_load_thunk_from_file, "load-thunk-from-file", 1, 0, 0,
+           (SCM filename),
+           "")
+#define FUNC_NAME s_scm_load_thunk_from_file
+{
+  char *c_filename;
+  int fd;
 
-    verify_cookie (cookie, &st, -1, NULL);
+  SCM_VALIDATE_STRING (1, filename);
 
-    return scm_bytecode_to_native_objcode (bv);
-  }
+  c_filename = scm_to_locale_string (filename);
+  fd = open (c_filename, O_RDONLY | O_CLOEXEC);
+  free (c_filename);
+  if (fd < 0) SCM_SYSERROR;
+
+#ifdef HAVE_SYS_MMAN_H
+  return load_thunk_from_fd_using_mmap (fd);
+#else
+  return load_thunk_from_fd_using_read (fd);
 #endif
 }
 #undef FUNC_NAME
 
+SCM_DEFINE (scm_load_thunk_from_memory, "load-thunk-from-memory", 1, 0, 0,
+           (SCM bv),
+           "")
+#define FUNC_NAME s_scm_load_thunk_from_memory
+{
+  SCM_VALIDATE_BYTEVECTOR (1, bv);
+
+  return load_thunk_from_memory ((char *) SCM_BYTEVECTOR_CONTENTS (bv),
+                                 SCM_BYTEVECTOR_LENGTH (bv));
+}
+#undef FUNC_NAME
+
+
+/*
+ * Objcode type
+ */
+
+/* Convert X, which is in byte order BYTE_ORDER, to its native
+   representation.  */
+static inline uint32_t
+to_native_order (uint32_t x, int byte_order)
+{
+  if (byte_order == SCM_BYTE_ORDER)
+    return x;
+  else
+    return bswap_32 (x);
+}
 
 SCM
 scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr)
@@ -298,9 +680,10 @@ SCM_DEFINE (scm_objcode_meta, "objcode-meta", 1, 0, 0,
 }
 #undef FUNC_NAME
 
-/* Turn BYTECODE into objcode encoded for ENDIANNESS and WORD_SIZE.  */
+/* Wrap BYTECODE in objcode, interpreting its lengths according to
+   BYTE_ORDER.  */
 static SCM
-bytecode_to_objcode (SCM bytecode, char endianness, size_t word_size)
+bytecode_to_objcode (SCM bytecode, int byte_order)
 #define FUNC_NAME "bytecode->objcode"
 {
   size_t size, len, metalen;
@@ -316,8 +699,8 @@ bytecode_to_objcode (SCM bytecode, char endianness, size_t 
word_size)
   SCM_ASSERT_RANGE (0, bytecode, size >= sizeof(struct scm_objcode));
   data = (struct scm_objcode*)c_bytecode;
 
-  len = to_native_order (data->len, endianness);
-  metalen = to_native_order (data->metalen, endianness);
+  len = to_native_order (data->len, byte_order);
+  metalen = to_native_order (data->metalen, byte_order);
 
   if (len + metalen != (size - sizeof (*data)))
     scm_misc_error (FUNC_NAME, "bad bytevector size (~a != ~a)",
@@ -331,100 +714,54 @@ bytecode_to_objcode (SCM bytecode, char endianness, 
size_t word_size)
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_bytecode_to_objcode, "bytecode->objcode", 1, 0, 0,
-           (SCM bytecode),
+SCM_DEFINE (scm_bytecode_to_objcode, "bytecode->objcode", 1, 1, 0,
+           (SCM bytecode, SCM endianness),
            "")
 #define FUNC_NAME s_scm_bytecode_to_objcode
 {
-  /* Assume we're called from Scheme, which known that to do with
-     `target-type'.  */
-  return bytecode_to_objcode (bytecode, target_endianness (),
-                             target_word_size ());
-}
-#undef FUNC_NAME
-
-/* Like `bytecode->objcode', but ignore the `target-type' fluid.  This
-   is useful for native compilation that happens lazily---e.g., direct
-   calls to this function from libguile itself.  */
-SCM
-scm_bytecode_to_native_objcode (SCM bytecode)
-{
-  return bytecode_to_objcode (bytecode, NATIVE_ENDIANNESS, sizeof (void *));
-}
-
-SCM_DEFINE (scm_load_objcode, "load-objcode", 1, 0, 0,
-           (SCM file),
-           "")
-#define FUNC_NAME s_scm_load_objcode
-{
-  int fd;
-  char *c_file;
-
-  SCM_VALIDATE_STRING (1, file);
-
-  c_file = scm_to_locale_string (file);
-  fd = open (c_file, O_RDONLY | O_CLOEXEC);
-  free (c_file);
-  if (fd < 0) SCM_SYSERROR;
+  int byte_order;
+
+  if (SCM_UNBNDP (endianness))
+    byte_order = SCM_BYTE_ORDER;
+  else if (scm_is_eq (endianness, scm_endianness_big))
+    byte_order = SCM_BYTE_ORDER_BE;
+  else if (scm_is_eq (endianness, scm_endianness_little))
+    byte_order = SCM_BYTE_ORDER_LE;
+  else
+    scm_wrong_type_arg (FUNC_NAME, 2, endianness);
 
-  return make_objcode_from_file (fd);
+  return bytecode_to_objcode (bytecode, byte_order);
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_objcode_to_bytecode, "objcode->bytecode", 1, 0, 0,
-           (SCM objcode),
+SCM_DEFINE (scm_objcode_to_bytecode, "objcode->bytecode", 1, 1, 0,
+           (SCM objcode, SCM endianness),
            "")
 #define FUNC_NAME s_scm_objcode_to_bytecode
 {
-  scm_t_uint32 len;
+  scm_t_uint32 len, meta_len, total_len;
+  int byte_order;
 
   SCM_VALIDATE_OBJCODE (1, objcode);
 
-  len = sizeof (struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode);
-
-  return scm_c_take_gc_bytevector ((scm_t_int8*)SCM_OBJCODE_DATA (objcode),
-                                   len, objcode);
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_write_objcode, "write-objcode", 2, 0, 0,
-           (SCM objcode, SCM port),
-           "")
-#define FUNC_NAME s_scm_write_objcode
-{
-  char cookie[sizeof (SCM_OBJCODE_COOKIE) - 1];
-  char endianness, word_size;
-  size_t total_size;
-
-  SCM_VALIDATE_OBJCODE (1, objcode);
-  SCM_VALIDATE_OUTPUT_PORT (2, port);
-  endianness = target_endianness ();
-  switch (target_word_size ())
-    {
-    case 4:
-      word_size = '4';
-      break;
-    case 8:
-      word_size = '8';
-      break;
-    default:
-      abort ();
-    }
-
-  memcpy (cookie, SCM_OBJCODE_COOKIE, strlen (SCM_OBJCODE_COOKIE));
-  cookie[SCM_OBJCODE_ENDIANNESS_OFFSET] = endianness;
-  cookie[SCM_OBJCODE_WORD_SIZE_OFFSET] = word_size;
+  if (SCM_UNBNDP (endianness))
+    byte_order = SCM_BYTE_ORDER;
+  else if (scm_is_eq (endianness, scm_endianness_big))
+    byte_order = SCM_BYTE_ORDER_BE;
+  else if (scm_is_eq (endianness, scm_endianness_little))
+    byte_order = SCM_BYTE_ORDER_LE;
+  else
+    scm_wrong_type_arg (FUNC_NAME, 2, endianness);
 
-  total_size =
-    to_native_order (SCM_OBJCODE_LEN (objcode), target_endianness ())
-    + to_native_order (SCM_OBJCODE_META_LEN (objcode), target_endianness ());
+  len = SCM_OBJCODE_LEN (objcode);
+  meta_len = SCM_OBJCODE_META_LEN (objcode);
 
-  scm_c_write_unlocked (port, cookie, strlen (SCM_OBJCODE_COOKIE));
-  scm_c_write_unlocked (port, SCM_OBJCODE_DATA (objcode),
-                        sizeof (struct scm_objcode)
-                        + total_size);
+  total_len = sizeof (struct scm_objcode);
+  total_len += to_native_order (len, byte_order);
+  total_len += to_native_order (meta_len, byte_order);
 
-  return SCM_UNSPECIFIED;
+  return scm_c_take_gc_bytevector ((scm_t_int8*)SCM_OBJCODE_DATA (objcode),
+                                   total_len, objcode);
 }
 #undef FUNC_NAME
 
@@ -445,14 +782,6 @@ scm_bootstrap_objcodes (void)
                             (scm_t_extension_init_func)scm_init_objcodes, 
NULL);
 }
 
-/* Before, we used __BYTE_ORDER, but that is not defined on all
-   systems. So punt and use automake, PDP endianness be damned. */
-#ifdef WORDS_BIGENDIAN
-#define SCM_BYTE_ORDER 4321
-#else
-#define SCM_BYTE_ORDER 1234
-#endif
-
 void
 scm_init_objcodes (void)
 {
@@ -462,11 +791,6 @@ scm_init_objcodes (void)
 
   scm_c_define ("word-size", scm_from_size_t (sizeof(SCM)));
   scm_c_define ("byte-order", scm_from_uint16 (SCM_BYTE_ORDER));
-
-  target_endianness_var = scm_c_public_variable ("system base target",
-                                                "target-endianness");
-  target_word_size_var = scm_c_public_variable ("system base target",
-                                               "target-word-size");
 }
 
 /*
diff --git a/libguile/objcodes.h b/libguile/objcodes.h
index 0c3865c..6ac333f 100644
--- a/libguile/objcodes.h
+++ b/libguile/objcodes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -60,14 +60,14 @@ struct scm_objcode
 #define SCM_OBJCODE_NATIVE_CODE(x) (SCM_CELL_WORD_3 (x))
 #define SCM_SET_OBJCODE_NATIVE_CODE(x, code) (SCM_SET_CELL_WORD_3 (x, code))
 
+SCM_API SCM scm_load_thunk_from_file (SCM filename);
+SCM_API SCM scm_load_thunk_from_memory (SCM bv);
+
 SCM_API SCM scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr);
-SCM_API SCM scm_load_objcode (SCM file);
 SCM_API SCM scm_objcode_p (SCM obj);
 SCM_API SCM scm_objcode_meta (SCM objcode);
-SCM_API SCM scm_bytecode_to_objcode (SCM bytecode);
-SCM_INTERNAL SCM scm_bytecode_to_native_objcode (SCM bytecode);
-SCM_API SCM scm_objcode_to_bytecode (SCM objcode);
-SCM_API SCM scm_write_objcode (SCM objcode, SCM port);
+SCM_API SCM scm_bytecode_to_objcode (SCM bytecode, SCM endianness);
+SCM_API SCM scm_objcode_to_bytecode (SCM objcode, SCM endianness);
 
 SCM_INTERNAL void scm_i_objcode_print (SCM objcode, SCM port,
                                        scm_print_state *pstate);
diff --git a/libguile/vm.c b/libguile/vm.c
index 0d9aa40..c264470 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1046,9 +1046,8 @@ SCM_DEFINE (scm_call_with_vm, "call-with-vm", 2, 0, 1,
 
 SCM scm_load_compiled_with_vm (SCM file)
 {
-  SCM program = scm_make_program (scm_load_objcode (file),
-                                  SCM_BOOL_F, SCM_BOOL_F);
-  
+  SCM program = scm_load_thunk_from_file (file);
+
   return scm_c_vm_run (scm_the_vm (), program, NULL, 0);
 }
 
@@ -1072,7 +1071,7 @@ make_boot_program (void)
   bp->metalen = 0;
 
   u8vec = scm_c_take_gc_bytevector ((scm_t_int8*)bp, bp_size, SCM_BOOL_F);
-  ret = scm_make_program (scm_bytecode_to_native_objcode (u8vec),
+  ret = scm_make_program (scm_bytecode_to_objcode (u8vec, SCM_UNDEFINED),
                           SCM_BOOL_F, SCM_BOOL_F);
   SCM_SET_CELL_WORD_0 (ret, (SCM_CELL_WORD_0 (ret) | SCM_F_PROGRAM_IS_BOOT));
 
diff --git a/module/Makefile.am b/module/Makefile.am
index fa811fd..e300ee2 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -123,7 +123,8 @@ BYTECODE_LANG_SOURCES =                             \
   language/bytecode/spec.scm
 
 OBJCODE_LANG_SOURCES =                         \
-  language/objcode/spec.scm
+  language/objcode/spec.scm                    \
+  language/objcode/elf.scm
 
 VALUE_LANG_SOURCES =                           \
   language/value/spec.scm
@@ -327,6 +328,7 @@ OOP_SOURCES = \
 SYSTEM_SOURCES =                               \
   system/vm/inspect.scm                                \
   system/vm/coverage.scm                       \
+  system/vm/elf.scm                            \
   system/vm/frame.scm                          \
   system/vm/instruction.scm                    \
   system/vm/objcode.scm                                \
diff --git a/module/language/bytecode/spec.scm 
b/module/language/bytecode/spec.scm
index 57ccd71..c2a6d46 100644
--- a/module/language/bytecode/spec.scm
+++ b/module/language/bytecode/spec.scm
@@ -1,6 +1,6 @@
 ;;; Guile Lowlevel Intermediate Language
 
-;; Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010, 2012 Free Software Foundation, Inc.
 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -20,14 +20,15 @@
 
 (define-module (language bytecode spec)
   #:use-module (system base language)
+  #:use-module (system base target)
   #:use-module (system vm objcode)
   #:export (bytecode))
 
 (define (compile-objcode x e opts)
-  (values (bytecode->objcode x) e e))
+  (values (bytecode->objcode x (target-endianness)) e e))
 
 (define (decompile-objcode x e opts)
-  (values (objcode->bytecode x) e))
+  (values (objcode->bytecode x (target-endianness)) e))
 
 (define-language bytecode
   #:title      "Guile Bytecode Vectors"
diff --git a/module/language/objcode/elf.scm b/module/language/objcode/elf.scm
new file mode 100644
index 0000000..9654c08
--- /dev/null
+++ b/module/language/objcode/elf.scm
@@ -0,0 +1,94 @@
+;;; Embedding bytecode in ELF
+
+;; Copyright (C) 2012 Free Software Foundation, Inc.
+
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;; 
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
+
+;;; Code:
+
+;; The eval-when is because (language objcode elf) will not be loaded
+;; yet when we go to compile it, but later passes of the
+;; compiler need it.  So we have to be sure that the module is present
+;; at compile time, with all of its definitions.  The easiest way to do
+;; that is just to go ahead and resolve it now.
+;;
+(define-module (language objcode elf)
+  #:use-module (system vm objcode)
+  #:use-module (system base target)
+  #:use-module (rnrs bytevectors)
+  #:use-module (ice-9 binary-ports)
+  #:use-module (system vm elf)
+  #:export (write-objcode))
+
+(define (bytecode->elf bv)
+  (let ((string-table (make-elf-string-table)))
+    (define (intern-string! string)
+      (call-with-values
+          (lambda () (elf-string-table-intern string-table string))
+        (lambda (table idx)
+          (set! string-table table)
+          idx)))
+    (define (make-object name bv relocs . kwargs)
+      (let ((name-idx (intern-string! (symbol->string name))))
+        (make-elf-object (apply make-elf-section
+                                #:name name-idx
+                                #:size (bytevector-length bv)
+                                kwargs)
+                         bv relocs
+                         (list (make-elf-symbol name 0)))))
+    (define (make-dynamic-section word-size endianness)
+      (define (make-dynamic-section/32)
+        (let ((bv (make-bytevector 24 0)))
+          (bytevector-u32-set! bv 0 DT_GUILE_RTL_VERSION endianness)
+          (bytevector-u32-set! bv 4 #x02000000 endianness)
+          (bytevector-u32-set! bv 8 DT_GUILE_ENTRY endianness)
+          (bytevector-u32-set! bv 12 0 endianness)
+          (bytevector-u32-set! bv 16 DT_NULL endianness)
+          (bytevector-u32-set! bv 20 0 endianness)
+          (values bv (make-elf-reloc 'abs32/1 12 0 '.rtl-text))))
+      (define (make-dynamic-section/64)
+        (let ((bv (make-bytevector 48 0)))
+          (bytevector-u64-set! bv 0 DT_GUILE_RTL_VERSION endianness)
+          (bytevector-u64-set! bv 8 #x02000000 endianness)
+          (bytevector-u64-set! bv 16 DT_GUILE_ENTRY endianness)
+          (bytevector-u64-set! bv 24 0 endianness)
+          (bytevector-u64-set! bv 32 DT_NULL endianness)
+          (bytevector-u64-set! bv 40 0 endianness)
+          (values bv (make-elf-reloc 'abs64/1 24 0 '.rtl-text))))
+      (call-with-values (lambda ()
+                          (case word-size
+                            ((4) (make-dynamic-section/32))
+                            ((8) (make-dynamic-section/64))
+                            (else (error "unexpected word size" word-size))))
+        (lambda (bv reloc)
+          (make-object '.dynamic bv (list reloc)
+                       #:type SHT_DYNAMIC #:flags SHF_ALLOC))))
+    (define (link-string-table)
+      (intern-string! ".shstrtab")
+      (make-object '.shstrtab (link-elf-string-table string-table) '()
+                   #:type SHT_STRTAB #:flags 0))
+    (let* ((word-size (target-word-size))
+           (endianness (target-endianness))
+           (text (make-object '.rtl-text bv '()))
+           (dt (make-dynamic-section word-size endianness))
+           ;; This needs to be linked last, because linking other
+           ;; sections adds entries to the string table.
+           (shstrtab (link-string-table)))
+      (link-elf (list text dt shstrtab)
+                #:endianness endianness #:word-size word-size))))
+
+(define (write-objcode objcode port)
+  (let ((bv (objcode->bytecode objcode (target-endianness))))
+    (put-bytevector port (bytecode->elf bv))))
diff --git a/module/language/objcode/spec.scm b/module/language/objcode/spec.scm
index 7cc85b7..022419e 100644
--- a/module/language/objcode/spec.scm
+++ b/module/language/objcode/spec.scm
@@ -22,6 +22,7 @@
   #:use-module (system base language)
   #:use-module (system vm objcode)
   #:use-module (system vm program)
+  #:use-module (language objcode elf)
   #:export (objcode))
 
 (define (objcode->value x e opts)
diff --git a/module/scripts/disassemble.scm b/module/scripts/disassemble.scm
index 7dab2dd..094d656 100644
--- a/module/scripts/disassemble.scm
+++ b/module/scripts/disassemble.scm
@@ -1,6 +1,6 @@
 ;;; Disassemble --- Disassemble .go files into something human-readable
 
-;; Copyright 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
+;; Copyright 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
 ;;
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public License
@@ -36,7 +36,7 @@
 
 (define (disassemble . files)
   (for-each (lambda (file)
-              (asm:disassemble (load-objcode file)))
+              (asm:disassemble (load-thunk-from-file file)))
             files))
 
 (define main disassemble)
diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm
index a709c8d..a9fdc99 100644
--- a/module/system/repl/command.scm
+++ b/module/system/repl/command.scm
@@ -1,6 +1,6 @@
 ;;; Repl commands
 
-;; Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -490,7 +490,7 @@ Disassemble a compiled procedure."
 (define-meta-command (disassemble-file repl file)
   "disassemble-file FILE
 Disassemble a file."
-  (guile:disassemble (load-objcode (->string file))))
+  (guile:disassemble (load-thunk-from-file (->string file))))
 
 
 ;;;
diff --git a/module/system/vm/elf.scm b/module/system/vm/elf.scm
new file mode 100644
index 0000000..040b274
--- /dev/null
+++ b/module/system/vm/elf.scm
@@ -0,0 +1,1255 @@
+;;; Guile ELF reader and writer
+
+;; Copyright (C)  2011, 2012 Free Software Foundation, Inc.
+
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;; 
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
+
+;;; Code:
+
+(define-module (system vm elf)
+  #:use-module (rnrs bytevectors)
+  #:use-module (system foreign)
+  #:use-module (system base target)
+  #:use-module (srfi srfi-9)
+  #:use-module (ice-9 receive)
+  #:use-module (ice-9 vlist)
+  #:export (has-elf-header?
+
+            make-elf elf?
+            elf-bytes elf-word-size elf-byte-order
+            elf-abi elf-type elf-machine-type
+            elf-entry elf-phoff elf-shoff elf-flags elf-ehsize
+            elf-phentsize elf-phnum elf-shentsize elf-shnum elf-shstrndx
+
+            (make-elf-segment* . make-elf-segment)
+            elf-segment?
+            elf-segment-type elf-segment-offset elf-segment-vaddr
+            elf-segment-paddr elf-segment-filesz elf-segment-memsz
+            elf-segment-flags elf-segment-align
+
+            (make-elf-section* . make-elf-section)
+            elf-section?
+            elf-section-name elf-section-type elf-section-flags
+            elf-section-addr elf-section-offset elf-section-size
+            elf-section-link elf-section-info elf-section-addralign
+            elf-section-entsize
+
+            make-elf-symbol elf-symbol?
+            elf-symbol-name elf-symbol-value elf-symbol-size
+            elf-symbol-info elf-symbol-other elf-symbol-shndx
+            elf-symbol-binding elf-symbol-type elf-symbol-visibility
+
+            SHT_NULL SHT_PROGBITS SHT_SYMTAB SHT_STRTAB SHT_RELA
+            SHT_HASH SHT_DYNAMIC SHT_NOTE SHT_NOBITS SHT_REL SHT_SHLIB
+            SHT_DYNSYM SHT_INIT_ARRAY SHT_FINI_ARRAY SHT_PREINIT_ARRAY
+            SHT_GROUP SHT_SYMTAB_SHNDX SHT_NUM SHT_LOOS SHT_HIOS
+            SHT_LOPROC SHT_HIPROC SHT_LOUSER SHT_HIUSER
+
+            SHF_WRITE SHF_ALLOC SHF_EXECINSTR SHF_MERGE SHF_STRINGS
+            SHF_INFO_LINK SHF_LINK_ORDER SHF_OS_NONCONFORMING SHF_GROUP
+            SHF_TLS
+
+            DT_NULL DT_NEEDED DT_PLTRELSZ DT_PLTGOT DT_HASH DT_STRTAB
+            DT_SYMTAB DT_RELA DT_RELASZ DT_RELAENT DT_STRSZ DT_SYMENT
+            DT_INIT DT_FINI DT_SONAME DT_RPATH DT_SYMBOLIC DT_REL
+            DT_RELSZ DT_RELENT DT_PLTREL DT_DEBUG DT_TEXTREL DT_JMPREL
+            DT_BIND_NOW DT_INIT_ARRAY DT_FINI_ARRAY DT_INIT_ARRAYSZ
+            DT_FINI_ARRAYSZ DT_RUNPATH DT_FLAGS DT_ENCODING
+            DT_PREINIT_ARRAY DT_PREINIT_ARRAYSZ DT_NUM DT_LOGUILE
+            DT_GUILE_GC_ROOT DT_GUILE_GC_ROOT_SZ DT_GUILE_ENTRY
+            DT_GUILE_RTL_VERSION DT_HIGUILE DT_LOOS DT_HIOS DT_LOPROC
+            DT_HIPROC
+
+            STB_LOCAL STB_GLOBAL STB_WEAK STB_NUM STB_LOOS STB_GNU
+            STB_HIOS STB_LOPROC STB_HIPROC
+
+            STT_NOTYPE STT_OBJECT STT_FUNC STT_SECTION STT_FILE
+            STT_COMMON STT_TLS STT_NUM STT_LOOS STT_GNU STT_HIOS
+            STT_LOPROC STT_HIPROC
+
+            STV_DEFAULT STV_INTERNAL STV_HIDDEN STV_PROTECTED
+
+            NT_GNU_ABI_TAG NT_GNU_HWCAP NT_GNU_BUILD_ID NT_GNU_GOLD_VERSION
+
+            parse-elf
+            elf-segment elf-segments
+            elf-section elf-sections elf-sections-by-name
+            elf-symbol-table-ref
+
+            parse-elf-note
+            elf-note-name elf-note-desc elf-note-type
+
+            (make-string-table . make-elf-string-table)
+            (string-table-intern . elf-string-table-intern)
+            (link-string-table . link-elf-string-table)
+
+            (make-reloc . make-elf-reloc)
+            (make-symbol . make-elf-symbol)
+
+            (make-object . make-elf-object)
+            (object? . elf-object?)
+            (object-section . elf-object-section)
+            (object-bv . elf-object-bv)
+            (object-relocs . elf-object-relocs)
+            (object-symbols . elf-object-symbols)
+
+            link-elf))
+
+;; #define EI_NIDENT 16
+
+;; typedef struct {
+;;     unsigned char e_ident[EI_NIDENT];
+;;     uint16_t      e_type;
+;;     uint16_t      e_machine;
+;;     uint32_t      e_version;
+;;     ElfN_Addr     e_entry;
+;;     ElfN_Off      e_phoff;
+;;     ElfN_Off      e_shoff;
+;;     uint32_t      e_flags;
+;;     uint16_t      e_ehsize;
+;;     uint16_t      e_phentsize;
+;;     uint16_t      e_phnum;
+;;     uint16_t      e_shentsize;
+;;     uint16_t      e_shnum;
+;;     uint16_t      e_shstrndx;
+;; } ElfN_Ehdr;
+
+(define elf32-header-len 52)
+(define elf64-header-len 64)
+(define (elf-header-len word-size)
+  (case word-size
+    ((4) elf32-header-len)
+    ((8) elf64-header-len)
+    (else (error "invalid word size" word-size))))
+
+(define ELFCLASS32      1)              ; 32-bit objects
+(define ELFCLASS64      2)              ; 64-bit objects
+
+(define ELFDATA2LSB     1)              ; 2's complement, little endian
+(define ELFDATA2MSB     2)              ; 2's complement, big endian
+
+(define EV_CURRENT      1)              ; Current version
+
+(define ELFOSABI_STANDALONE     255)    ; Standalone (embedded) application
+
+(define ET_DYN          3)              ; Shared object file
+
+;;
+;; Machine types
+;;
+;; Just a sampling of these values.  We could include more, but the
+;; important thing is to recognize architectures for which we have a
+;; native compiler.  Recognizing more common machine types is icing on
+;; the cake.
+;; 
+(define EM_NONE          0)             ; No machine
+(define EM_SPARC         2)             ; SUN SPARC
+(define EM_386           3)             ; Intel 80386
+(define EM_MIPS          8)             ; MIPS R3000 big-endian
+(define EM_PPC          20)             ; PowerPC
+(define EM_PPC64        21)             ; PowerPC 64-bit
+(define EM_ARM          40)             ; ARM
+(define EM_SH           42)             ; Hitachi SH
+(define EM_SPARCV9      43)             ; SPARC v9 64-bit
+(define EM_IA_64        50)             ; Intel Merced
+(define EM_X86_64       62)             ; AMD x86-64 architecture
+
+(define cpu-mapping (make-hash-table))
+(for-each (lambda (pair)
+            (hashq-set! cpu-mapping (car pair) (cdr pair)))
+          `((none . ,EM_NONE)
+            (sparc . ,EM_SPARC) ; FIXME: map 64-bit to SPARCV9 ?
+            (i386 . ,EM_386)
+            (mips . ,EM_MIPS)
+            (ppc . ,EM_PPC)
+            (ppc64 . ,EM_PPC64)
+            (arm . ,EM_ARM) ; FIXME: there are more arm cpu variants
+            (sh . ,EM_SH) ; FIXME: there are more sh cpu variants
+            (ia64 . ,EM_IA_64)
+            (x86_64 . ,EM_X86_64)))
+
+(define SHN_UNDEF 0)
+
+(define host-machine-type
+  (hashq-ref cpu-mapping
+             (string->symbol (car (string-split %host-type #\-)))
+             EM_NONE))
+
+(define host-word-size
+  (sizeof '*))
+
+(define host-byte-order
+  (native-endianness))
+
+(define (has-elf-header? bv)
+  (and
+   ;; e_ident
+   (>= (bytevector-length bv) 16)
+   (= (bytevector-u8-ref bv 0) #x7f)
+   (= (bytevector-u8-ref bv 1) (char->integer #\E))
+   (= (bytevector-u8-ref bv 2) (char->integer #\L))
+   (= (bytevector-u8-ref bv 3) (char->integer #\F))
+   (cond
+    ((= (bytevector-u8-ref bv 4) ELFCLASS32)
+     (>= (bytevector-length bv) elf32-header-len))
+    ((= (bytevector-u8-ref bv 4) ELFCLASS64)
+     (>= (bytevector-length bv) elf64-header-len))
+    (else #f))
+   (or (= (bytevector-u8-ref bv 5) ELFDATA2LSB)
+       (= (bytevector-u8-ref bv 5) ELFDATA2MSB))
+   (= (bytevector-u8-ref bv 6) EV_CURRENT)
+   ;; Look at ABI later.
+   (= (bytevector-u8-ref bv 8) 0)       ; ABI version
+   ;; The rest of the e_ident is padding.
+
+   ;; e_version
+   (let ((byte-order (if (= (bytevector-u8-ref bv 5) ELFDATA2LSB)
+                         (endianness little)
+                         (endianness big))))
+     (= (bytevector-u32-ref bv 20 byte-order) EV_CURRENT))))
+
+(define-record-type <elf>
+  (make-elf bytes word-size byte-order abi type machine-type
+            entry phoff shoff flags ehsize
+            phentsize phnum shentsize shnum shstrndx)
+  elf?
+  (bytes elf-bytes)
+  (word-size elf-word-size)
+  (byte-order elf-byte-order)
+  (abi elf-abi)
+  (type elf-type)
+  (machine-type elf-machine-type)
+  (entry elf-entry)
+  (phoff elf-phoff)
+  (shoff elf-shoff)
+  (flags elf-flags)
+  (ehsize elf-ehsize)
+  (phentsize elf-phentsize)
+  (phnum elf-phnum)
+  (shentsize elf-shentsize)
+  (shnum elf-shnum)
+  (shstrndx elf-shstrndx))
+
+(define (parse-elf32 bv byte-order)
+  (make-elf bv 4 byte-order
+            (bytevector-u8-ref bv 7)
+            (bytevector-u16-ref bv 16 byte-order)
+            (bytevector-u16-ref bv 18 byte-order)
+            (bytevector-u32-ref bv 24 byte-order)
+            (bytevector-u32-ref bv 28 byte-order)
+            (bytevector-u32-ref bv 32 byte-order)
+            (bytevector-u32-ref bv 36 byte-order)
+            (bytevector-u16-ref bv 40 byte-order)
+            (bytevector-u16-ref bv 42 byte-order)
+            (bytevector-u16-ref bv 44 byte-order)
+            (bytevector-u16-ref bv 46 byte-order)
+            (bytevector-u16-ref bv 48 byte-order)
+            (bytevector-u16-ref bv 50 byte-order)))
+
+(define (write-elf-ident bv class data abi)
+  (bytevector-u8-set! bv 0 #x7f)
+  (bytevector-u8-set! bv 1 (char->integer #\E))
+  (bytevector-u8-set! bv 2 (char->integer #\L))
+  (bytevector-u8-set! bv 3 (char->integer #\F))
+  (bytevector-u8-set! bv 4 class)
+  (bytevector-u8-set! bv 5 data)
+  (bytevector-u8-set! bv 6 EV_CURRENT)
+  (bytevector-u8-set! bv 7 abi)
+  (bytevector-u8-set! bv 8 0) ; ABI version
+  (bytevector-u8-set! bv 9 0) ; Pad to 16 bytes.
+  (bytevector-u8-set! bv 10 0)
+  (bytevector-u8-set! bv 11 0)
+  (bytevector-u8-set! bv 12 0)
+  (bytevector-u8-set! bv 13 0)
+  (bytevector-u8-set! bv 14 0)
+  (bytevector-u8-set! bv 15 0))
+
+(define (write-elf32 bv byte-order abi type machine-type
+                     entry phoff shoff flags ehsize phentsize phnum
+                     shentsize shnum shstrndx)
+  (write-elf-ident bv ELFCLASS32
+                   (case byte-order
+                     ((little) ELFDATA2LSB)
+                     ((big) ELFDATA2MSB)
+                     (else (error "unknown endianness" byte-order)))
+                   abi)
+  (bytevector-u16-set! bv 16 type byte-order)
+  (bytevector-u16-set! bv 18 machine-type byte-order)
+  (bytevector-u32-set! bv 20 EV_CURRENT byte-order)
+  (bytevector-u32-set! bv 24 entry byte-order)
+  (bytevector-u32-set! bv 28 phoff byte-order)
+  (bytevector-u32-set! bv 32 shoff byte-order)
+  (bytevector-u32-set! bv 36 flags byte-order)
+  (bytevector-u16-set! bv 40 ehsize byte-order)
+  (bytevector-u16-set! bv 42 phentsize byte-order)
+  (bytevector-u16-set! bv 44 phnum byte-order)
+  (bytevector-u16-set! bv 46 shentsize byte-order)
+  (bytevector-u16-set! bv 48 shnum byte-order)
+  (bytevector-u16-set! bv 50 shstrndx byte-order))
+
+(define (parse-elf64 bv byte-order)
+  (make-elf bv 8 byte-order
+            (bytevector-u8-ref bv 7)
+            (bytevector-u16-ref bv 16 byte-order)
+            (bytevector-u16-ref bv 18 byte-order)
+            (bytevector-u64-ref bv 24 byte-order)
+            (bytevector-u64-ref bv 32 byte-order)
+            (bytevector-u64-ref bv 40 byte-order)
+            (bytevector-u32-ref bv 48 byte-order)
+            (bytevector-u16-ref bv 52 byte-order)
+            (bytevector-u16-ref bv 54 byte-order)
+            (bytevector-u16-ref bv 56 byte-order)
+            (bytevector-u16-ref bv 58 byte-order)
+            (bytevector-u16-ref bv 60 byte-order)
+            (bytevector-u16-ref bv 62 byte-order)))
+
+(define (write-elf64 bv byte-order abi type machine-type
+                     entry phoff shoff flags ehsize phentsize phnum
+                     shentsize shnum shstrndx)
+  (write-elf-ident bv ELFCLASS64
+                   (case byte-order
+                     ((little) ELFDATA2LSB)
+                     ((big) ELFDATA2MSB)
+                     (else (error "unknown endianness" byte-order)))
+                   abi)
+  (bytevector-u16-set! bv 16 type byte-order)
+  (bytevector-u16-set! bv 18 machine-type byte-order)
+  (bytevector-u32-set! bv 20 EV_CURRENT byte-order)
+  (bytevector-u64-set! bv 24 entry byte-order)
+  (bytevector-u64-set! bv 32 phoff byte-order)
+  (bytevector-u64-set! bv 40 shoff byte-order)
+  (bytevector-u32-set! bv 48 flags byte-order)
+  (bytevector-u16-set! bv 52 ehsize byte-order)
+  (bytevector-u16-set! bv 54 phentsize byte-order)
+  (bytevector-u16-set! bv 56 phnum byte-order)
+  (bytevector-u16-set! bv 58 shentsize byte-order)
+  (bytevector-u16-set! bv 60 shnum byte-order)
+  (bytevector-u16-set! bv 62 shstrndx byte-order))
+
+(define (parse-elf bv)
+  (cond
+   ((has-elf-header? bv)
+    (let ((class (bytevector-u8-ref bv 4))
+          (byte-order (let ((data (bytevector-u8-ref bv 5)))
+                        (cond
+                         ((= data ELFDATA2LSB) (endianness little))
+                         ((= data ELFDATA2MSB) (endianness big))
+                         (else (error "unhandled byte order" data))))))
+      (cond
+       ((= class ELFCLASS32) (parse-elf32 bv byte-order))
+       ((= class ELFCLASS64) (parse-elf64 bv byte-order))
+       (else (error "unhandled class" class)))))
+   (else
+    (error "Invalid ELF" bv))))
+
+(define* (write-elf-header bv #:key
+                           (byte-order (target-endianness))
+                           (word-size (target-word-size))
+                           (abi ELFOSABI_STANDALONE)
+                           (type ET_DYN)
+                           (machine-type EM_NONE)
+                           (entry 0)
+                           (phoff (elf-header-len word-size))
+                           (shoff -1)
+                           (flags 0)
+                           (ehsize (elf-header-len word-size))
+                           (phentsize (elf-program-header-len word-size))
+                           (phnum 0)
+                           (shentsize (elf-section-header-len word-size))
+                           (shnum 0)
+                           (shstrndx SHN_UNDEF))
+  ((case word-size
+     ((4) write-elf32)
+     ((8) write-elf64)
+     (else (error "unknown word size" word-size)))
+   bv byte-order abi type machine-type entry phoff shoff
+   flags ehsize phentsize phnum shentsize shnum shstrndx))
+
+;;
+;; Segment types
+;;
+(define PT_NULL         0)              ; Program header table entry unused
+(define PT_LOAD         1)              ; Loadable program segment
+(define PT_DYNAMIC      2)              ; Dynamic linking information
+(define PT_INTERP       3)              ; Program interpreter
+(define PT_NOTE         4)              ; Auxiliary information
+(define PT_SHLIB        5)              ; Reserved
+(define PT_PHDR         6)              ; Entry for header table itself
+(define PT_TLS          7)              ; Thread-local storage segment
+(define PT_NUM          8)              ; Number of defined types
+(define PT_LOOS         #x60000000)     ; Start of OS-specific
+(define PT_GNU_EH_FRAME #x6474e550)     ; GCC .eh_frame_hdr segment
+(define PT_GNU_STACK    #x6474e551)     ; Indicates stack executability
+(define PT_GNU_RELRO    #x6474e552)     ; Read-only after relocation
+
+;;
+;; Segment flags
+;;
+(define PF_X            (ash 1 0))      ; Segment is executable
+(define PF_W            (ash 1 1))      ; Segment is writable
+(define PF_R            (ash 1 2))      ; Segment is readable
+
+(define-record-type <elf-segment>
+  (make-elf-segment type offset vaddr paddr filesz memsz flags align)
+  elf-segment?
+  (type elf-segment-type)
+  (offset elf-segment-offset)
+  (vaddr elf-segment-vaddr)
+  (paddr elf-segment-paddr)
+  (filesz elf-segment-filesz)
+  (memsz elf-segment-memsz)
+  (flags elf-segment-flags)
+  (align elf-segment-align))
+
+(define* (make-elf-segment* #:key (type PT_LOAD) (offset 0) (vaddr 0)
+                            (paddr 0) (filesz 0) (memsz filesz)
+                            (flags (logior PF_W PF_R))
+                            (align 8))
+  (make-elf-segment type offset vaddr paddr filesz memsz flags align))
+
+;; typedef struct {
+;;     uint32_t   p_type;
+;;     Elf32_Off  p_offset;
+;;     Elf32_Addr p_vaddr;
+;;     Elf32_Addr p_paddr;
+;;     uint32_t   p_filesz;
+;;     uint32_t   p_memsz;
+;;     uint32_t   p_flags;
+;;     uint32_t   p_align;
+;; } Elf32_Phdr;
+
+(define (parse-elf32-program-header bv offset byte-order)
+  (if (<= (+ offset 32) (bytevector-length bv))
+      (make-elf-segment (bytevector-u32-ref bv offset byte-order)
+                        (bytevector-u32-ref bv (+ offset 4) byte-order)
+                        (bytevector-u32-ref bv (+ offset 8) byte-order)
+                        (bytevector-u32-ref bv (+ offset 12) byte-order)
+                        (bytevector-u32-ref bv (+ offset 16) byte-order)
+                        (bytevector-u32-ref bv (+ offset 20) byte-order)
+                        (bytevector-u32-ref bv (+ offset 24) byte-order)
+                        (bytevector-u32-ref bv (+ offset 28) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+(define (write-elf32-program-header bv offset byte-order seg)
+  (bytevector-u32-set! bv offset (elf-segment-type seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 4) (elf-segment-offset seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 8) (elf-segment-vaddr seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 12) (elf-segment-paddr seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 16) (elf-segment-filesz seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 20) (elf-segment-memsz seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 24) (elf-segment-flags seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 28) (elf-segment-align seg) byte-order))
+
+
+;; typedef struct {
+;;     uint32_t   p_type;
+;;     uint32_t   p_flags;
+;;     Elf64_Off  p_offset;
+;;     Elf64_Addr p_vaddr;
+;;     Elf64_Addr p_paddr;
+;;     uint64_t   p_filesz;
+;;     uint64_t   p_memsz;
+;;     uint64_t   p_align;
+;; } Elf64_Phdr;
+
+;; NB: position of `flags' is different!
+
+(define (parse-elf64-program-header bv offset byte-order)
+  (if (<= (+ offset 56) (bytevector-length bv))
+      (make-elf-segment (bytevector-u32-ref bv offset byte-order)
+                        (bytevector-u64-ref bv (+ offset 8) byte-order)
+                        (bytevector-u64-ref bv (+ offset 16) byte-order)
+                        (bytevector-u64-ref bv (+ offset 24) byte-order)
+                        (bytevector-u64-ref bv (+ offset 32) byte-order)
+                        (bytevector-u64-ref bv (+ offset 40) byte-order)
+                        (bytevector-u32-ref bv (+ offset 4) byte-order)
+                        (bytevector-u64-ref bv (+ offset 48) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+(define (write-elf64-program-header bv offset byte-order seg)
+  (bytevector-u32-set! bv offset (elf-segment-type seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 8) (elf-segment-offset seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 16) (elf-segment-vaddr seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 24) (elf-segment-paddr seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 32) (elf-segment-filesz seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 40) (elf-segment-memsz seg) byte-order)
+  (bytevector-u32-set! bv (+ offset 4) (elf-segment-flags seg) byte-order)
+  (bytevector-u64-set! bv (+ offset 48) (elf-segment-align seg) byte-order))
+
+(define (write-elf-program-header bv offset byte-order word-size seg)
+  ((case word-size
+     ((4) write-elf32-program-header)
+     ((8) write-elf64-program-header)
+     (else (error "invalid word size" word-size)))
+   bv offset byte-order seg))
+
+(define (elf-program-header-len word-size)
+  (case word-size
+    ((4) 32)
+    ((8) 56)
+    (else (error "bad word size" word-size))))
+
+(define (elf-segment elf n)
+  (if (not (< -1 n (elf-phnum elf)))
+      (error "bad segment number" n))
+  ((case (elf-word-size elf)
+     ((4) parse-elf32-program-header)
+     ((8) parse-elf64-program-header)
+     (else (error "unhandled pointer size")))
+   (elf-bytes elf)
+   (+ (elf-phoff elf) (* n (elf-phentsize elf)))
+   (elf-byte-order elf)))
+
+(define (elf-segments elf)
+  (let lp ((n (elf-phnum elf)) (out '()))
+    (if (zero? n)
+        out
+        (lp (1- n) (cons (elf-segment elf (1- n)) out)))))
+
+(define-record-type <elf-section>
+  (make-elf-section name type flags addr offset size link info addralign 
entsize)
+  elf-section?
+  (name elf-section-name)
+  (type elf-section-type)
+  (flags elf-section-flags)
+  (addr elf-section-addr)
+  (offset elf-section-offset)
+  (size elf-section-size)
+  (link elf-section-link)
+  (info elf-section-info)
+  (addralign elf-section-addralign)
+  (entsize elf-section-entsize))
+
+(define* (make-elf-section* #:key (name 0) (type SHT_PROGBITS)
+                            (flags SHF_ALLOC) (addr 0) (offset 0) (size 0)
+                            (link 0) (info 0) (addralign 8) (entsize 0))
+  (make-elf-section name type flags addr offset size link info addralign
+                    entsize))
+
+;; typedef struct {
+;;     uint32_t   sh_name;
+;;     uint32_t   sh_type;
+;;     uint32_t   sh_flags;
+;;     Elf32_Addr sh_addr;
+;;     Elf32_Off  sh_offset;
+;;     uint32_t   sh_size;
+;;     uint32_t   sh_link;
+;;     uint32_t   sh_info;
+;;     uint32_t   sh_addralign;
+;;     uint32_t   sh_entsize;
+;; } Elf32_Shdr;
+
+(define (parse-elf32-section-header bv offset byte-order)
+  (if (<= (+ offset 40) (bytevector-length bv))
+      (make-elf-section (bytevector-u32-ref bv offset byte-order)
+                        (bytevector-u32-ref bv (+ offset 4) byte-order)
+                        (bytevector-u32-ref bv (+ offset 8) byte-order)
+                        (bytevector-u32-ref bv (+ offset 12) byte-order)
+                        (bytevector-u32-ref bv (+ offset 16) byte-order)
+                        (bytevector-u32-ref bv (+ offset 20) byte-order)
+                        (bytevector-u32-ref bv (+ offset 24) byte-order)
+                        (bytevector-u32-ref bv (+ offset 28) byte-order)
+                        (bytevector-u32-ref bv (+ offset 32) byte-order)
+                        (bytevector-u32-ref bv (+ offset 36) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+(define (write-elf32-section-header bv offset byte-order sec)
+  (bytevector-u32-set! bv offset (elf-section-name sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 4) (elf-section-type sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 8) (elf-section-flags sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 12) (elf-section-addr sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 16) (elf-section-offset sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 20) (elf-section-size sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 24) (elf-section-link sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 28) (elf-section-info sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 32) (elf-section-addralign sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 36) (elf-section-entsize sec) byte-order))
+
+
+;; typedef struct {
+;;     uint32_t   sh_name;
+;;     uint32_t   sh_type;
+;;     uint64_t   sh_flags;
+;;     Elf64_Addr sh_addr;
+;;     Elf64_Off  sh_offset;
+;;     uint64_t   sh_size;
+;;     uint32_t   sh_link;
+;;     uint32_t   sh_info;
+;;     uint64_t   sh_addralign;
+;;     uint64_t   sh_entsize;
+;; } Elf64_Shdr;
+
+(define (elf-section-header-len word-size)
+  (case word-size
+    ((4) 40)
+    ((8) 64)
+    (else (error "bad word size" word-size))))
+
+(define (parse-elf64-section-header bv offset byte-order)
+  (if (<= (+ offset 64) (bytevector-length bv))
+      (make-elf-section (bytevector-u32-ref bv offset byte-order)
+                        (bytevector-u32-ref bv (+ offset 4) byte-order)
+                        (bytevector-u64-ref bv (+ offset 8) byte-order)
+                        (bytevector-u64-ref bv (+ offset 16) byte-order)
+                        (bytevector-u64-ref bv (+ offset 24) byte-order)
+                        (bytevector-u64-ref bv (+ offset 32) byte-order)
+                        (bytevector-u32-ref bv (+ offset 40) byte-order)
+                        (bytevector-u32-ref bv (+ offset 44) byte-order)
+                        (bytevector-u64-ref bv (+ offset 48) byte-order)
+                        (bytevector-u64-ref bv (+ offset 56) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+(define (write-elf64-section-header bv offset byte-order sec)
+  (bytevector-u32-set! bv offset (elf-section-name sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 4) (elf-section-type sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 8) (elf-section-flags sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 16) (elf-section-addr sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 24) (elf-section-offset sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 32) (elf-section-size sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 40) (elf-section-link sec) byte-order)
+  (bytevector-u32-set! bv (+ offset 44) (elf-section-info sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 48) (elf-section-addralign sec) byte-order)
+  (bytevector-u64-set! bv (+ offset 56) (elf-section-entsize sec) byte-order))
+
+(define (elf-section elf n)
+  (if (not (< -1 n (elf-shnum elf)))
+      (error "bad section number" n))
+  ((case (elf-word-size elf)
+     ((4) parse-elf32-section-header)
+     ((8) parse-elf64-section-header)
+     (else (error "unhandled pointer size")))
+   (elf-bytes elf)
+   (+ (elf-shoff elf) (* n (elf-shentsize elf)))
+   (elf-byte-order elf)))
+
+(define (write-elf-section-header bv offset byte-order word-size sec)
+  ((case word-size
+     ((4) write-elf32-section-header)
+     ((8) write-elf64-section-header)
+     (else (error "invalid word size" word-size)))
+   bv offset byte-order sec))
+
+(define (elf-sections elf)
+  (let lp ((n (elf-shnum elf)) (out '()))
+    (if (zero? n)
+        out
+        (lp (1- n) (cons (elf-section elf (1- n)) out)))))
+
+;;
+;; Section Types
+;;
+(define SHT_NULL          0)            ; Section header table entry unused
+(define SHT_PROGBITS      1)            ; Program data
+(define SHT_SYMTAB        2)            ; Symbol table
+(define SHT_STRTAB        3)            ; String table
+(define SHT_RELA          4)            ; Relocation entries with addends
+(define SHT_HASH          5)            ; Symbol hash table
+(define SHT_DYNAMIC       6)            ; Dynamic linking information
+(define SHT_NOTE          7)            ; Notes
+(define SHT_NOBITS        8)            ; Program space with no data (bss)
+(define SHT_REL           9)            ; Relocation entries, no addends
+(define SHT_SHLIB         10)           ; Reserved
+(define SHT_DYNSYM        11)           ; Dynamic linker symbol table
+(define SHT_INIT_ARRAY    14)           ; Array of constructors
+(define SHT_FINI_ARRAY    15)           ; Array of destructors
+(define SHT_PREINIT_ARRAY 16)           ; Array of pre-constructors
+(define SHT_GROUP         17)           ; Section group
+(define SHT_SYMTAB_SHNDX  18)           ; Extended section indeces
+(define SHT_NUM           19)           ; Number of defined types. 
+(define SHT_LOOS          #x60000000)   ; Start OS-specific. 
+(define SHT_HIOS          #x6fffffff)   ; End OS-specific type
+(define SHT_LOPROC        #x70000000)   ; Start of processor-specific
+(define SHT_HIPROC        #x7fffffff)   ; End of processor-specific
+(define SHT_LOUSER        #x80000000)   ; Start of application-specific
+(define SHT_HIUSER        #x8fffffff)   ; End of application-specific
+
+;;
+;; Section Flags
+;;
+(define SHF_WRITE            (ash 1 0)) ; Writable
+(define SHF_ALLOC            (ash 1 1)) ; Occupies memory during execution
+(define SHF_EXECINSTR        (ash 1 2)) ; Executable
+(define SHF_MERGE            (ash 1 4)) ; Might be merged
+(define SHF_STRINGS          (ash 1 5)) ; Contains nul-terminated strings
+(define SHF_INFO_LINK        (ash 1 6)) ; `sh_info' contains SHT index
+(define SHF_LINK_ORDER       (ash 1 7)) ; Preserve order after combining
+(define SHF_OS_NONCONFORMING (ash 1 8)) ; Non-standard OS specific handling 
required
+(define SHF_GROUP            (ash 1 9)) ; Section is member of a group. 
+(define SHF_TLS              (ash 1 10)) ; Section hold thread-local data. 
+
+;;
+;; Dynamic entry types.  The DT_GUILE types are non-standard.
+;;
+(define DT_NULL                0)              ; Marks end of dynamic section
+(define DT_NEEDED      1)              ; Name of needed library
+(define DT_PLTRELSZ    2)              ; Size in bytes of PLT relocs
+(define DT_PLTGOT      3)              ; Processor defined value
+(define DT_HASH                4)              ; Address of symbol hash table
+(define DT_STRTAB      5)              ; Address of string table
+(define DT_SYMTAB      6)              ; Address of symbol table
+(define DT_RELA                7)              ; Address of Rela relocs
+(define DT_RELASZ      8)              ; Total size of Rela relocs
+(define DT_RELAENT     9)              ; Size of one Rela reloc
+(define DT_STRSZ       10)             ; Size of string table
+(define DT_SYMENT      11)             ; Size of one symbol table entry
+(define DT_INIT                12)             ; Address of init function
+(define DT_FINI                13)             ; Address of termination 
function
+(define DT_SONAME      14)             ; Name of shared object
+(define DT_RPATH       15)             ; Library search path (deprecated)
+(define DT_SYMBOLIC    16)             ; Start symbol search here
+(define DT_REL         17)             ; Address of Rel relocs
+(define DT_RELSZ       18)             ; Total size of Rel relocs
+(define DT_RELENT      19)             ; Size of one Rel reloc
+(define DT_PLTREL      20)             ; Type of reloc in PLT
+(define DT_DEBUG       21)             ; For debugging ; unspecified
+(define DT_TEXTREL     22)             ; Reloc might modify .text
+(define DT_JMPREL      23)             ; Address of PLT relocs
+(define        DT_BIND_NOW     24)             ; Process relocations of object
+(define        DT_INIT_ARRAY   25)             ; Array with addresses of init 
fct
+(define        DT_FINI_ARRAY   26)             ; Array with addresses of fini 
fct
+(define        DT_INIT_ARRAYSZ 27)             ; Size in bytes of DT_INIT_ARRAY
+(define        DT_FINI_ARRAYSZ 28)             ; Size in bytes of DT_FINI_ARRAY
+(define DT_RUNPATH     29)             ; Library search path
+(define DT_FLAGS       30)             ; Flags for the object being loaded
+(define DT_ENCODING    32)             ; Start of encoded range
+(define DT_PREINIT_ARRAY 32)           ; Array with addresses of preinit fc
+(define DT_PREINIT_ARRAYSZ 33)         ; size in bytes of DT_PREINIT_ARRAY
+(define        DT_NUM          34)             ; Number used
+(define DT_LOGUILE      #x37146000)     ; Start of Guile-specific
+(define DT_GUILE_GC_ROOT    #x37146000) ; Offset of GC roots
+(define DT_GUILE_GC_ROOT_SZ #x37146001) ; Size in machine words of GC roots
+(define DT_GUILE_ENTRY      #x37146002) ; Address of entry thunk
+(define DT_GUILE_RTL_VERSION #x37146003); Bytecode version
+(define DT_HIGUILE      #x37146fff)     ; End of Guile-specific
+(define DT_LOOS                #x6000000d)     ; Start of OS-specific
+(define DT_HIOS                #x6ffff000)     ; End of OS-specific
+(define DT_LOPROC      #x70000000)     ; Start of processor-specific
+(define DT_HIPROC      #x7fffffff)     ; End of processor-specific
+
+
+(define (string-table-ref bv offset)
+  (let lp ((end offset))
+    (if (zero? (bytevector-u8-ref bv end))
+        (let ((out (make-bytevector (- end offset))))
+          (bytevector-copy! bv offset out 0 (- end offset))
+          (utf8->string out))
+        (lp (1+ end)))))
+
+(define (elf-sections-by-name elf)
+  (let* ((sections (elf-sections elf))
+         (off (elf-section-offset (list-ref sections (elf-shstrndx elf)))))
+    (map (lambda (section)
+           (cons (string-table-ref (elf-bytes elf)
+                                   (+ off (elf-section-name section)))
+                 section))
+         sections)))
+
+(define-record-type <elf-symbol>
+  (make-elf-symbol name value size info other shndx)
+  elf-symbol?
+  (name elf-symbol-name)
+  (value elf-symbol-value)
+  (size elf-symbol-size)
+  (info elf-symbol-info)
+  (other elf-symbol-other)
+  (shndx elf-symbol-shndx))
+
+;; typedef struct {
+;;     uint32_t      st_name;
+;;     Elf32_Addr    st_value;
+;;     uint32_t      st_size;
+;;     unsigned char st_info;
+;;     unsigned char st_other;
+;;     uint16_t      st_shndx;
+;; } Elf32_Sym;
+
+(define (parse-elf32-symbol bv offset stroff byte-order)
+  (if (<= (+ offset 16) (bytevector-length bv))
+      (make-elf-symbol (let ((name (bytevector-u32-ref bv offset byte-order)))
+                         (if stroff
+                             (string-table-ref bv (+ stroff name))
+                             name))
+                       (bytevector-u32-ref bv (+ offset 4) byte-order)
+                       (bytevector-u32-ref bv (+ offset 8) byte-order)
+                       (bytevector-u8-ref bv (+ offset 12))
+                       (bytevector-u8-ref bv (+ offset 13))
+                       (bytevector-u16-ref bv (+ offset 14) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+;; typedef struct {
+;;     uint32_t      st_name;
+;;     unsigned char st_info;
+;;     unsigned char st_other;
+;;     uint16_t      st_shndx;
+;;     Elf64_Addr    st_value;
+;;     uint64_t      st_size;
+;; } Elf64_Sym;
+
+(define (parse-elf64-symbol bv offset stroff byte-order)
+  (if (<= (+ offset 24) (bytevector-length bv))
+      (make-elf-symbol (let ((name (bytevector-u32-ref bv offset byte-order)))
+                         (if stroff
+                             (string-table-ref bv (+ stroff name))
+                             name))
+                       (bytevector-u64-ref bv (+ offset 8) byte-order)
+                       (bytevector-u64-ref bv (+ offset 16) byte-order)
+                       (bytevector-u8-ref bv (+ offset 4))
+                       (bytevector-u8-ref bv (+ offset 5))
+                       (bytevector-u16-ref bv (+ offset 6) byte-order))
+      (error "corrupt ELF (offset out of range)" offset)))
+
+(define* (elf-symbol-table-ref elf section n #:optional strtab)
+  (let ((bv (elf-bytes elf))
+        (byte-order (elf-byte-order elf))
+        (stroff (and strtab (elf-section-offset strtab)))
+        (base (elf-section-offset section))
+        (len (elf-section-size section))
+        (entsize (elf-section-entsize section)))
+    (unless (<= (* (1+ n) entsize) len)
+      (error "out of range symbol table access" section n))
+    (case (elf-word-size elf)
+      ((4)
+       (unless (<= 16 entsize)
+         (error "bad entsize for symbol table" section))
+       (parse-elf32-symbol bv (+ base (* n entsize)) stroff byte-order))
+      ((8)
+       (unless (<= 24 entsize)
+         (error "bad entsize for symbol table" section))
+       (parse-elf64-symbol bv (+ base (* n entsize)) stroff byte-order))
+      (else (error "bad word size" elf)))))
+
+;; Legal values for ST_BIND subfield of st_info (symbol binding).
+
+(define STB_LOCAL      0)              ; Local symbol
+(define STB_GLOBAL     1)              ; Global symbol
+(define STB_WEAK       2)              ; Weak symbol
+(define STB_NUM                3)              ; Number of defined types. 
+(define STB_LOOS       10)             ; Start of OS-specific
+(define STB_GNU_UNIQUE 10)             ; Unique symbol. 
+(define STB_HIOS       12)             ; End of OS-specific
+(define STB_LOPROC     13)             ; Start of processor-specific
+(define STB_HIPROC     15)             ; End of processor-specific
+
+;; Legal values for ST_TYPE subfield of st_info (symbol type).
+
+(define STT_NOTYPE     0)              ; Symbol type is unspecified
+(define STT_OBJECT     1)              ; Symbol is a data object
+(define STT_FUNC       2)              ; Symbol is a code object
+(define STT_SECTION    3)              ; Symbol associated with a section
+(define STT_FILE       4)              ; Symbol's name is file name
+(define STT_COMMON     5)              ; Symbol is a common data object
+(define STT_TLS                6)              ; Symbol is thread-local data 
objec
+(define STT_NUM                7)              ; Number of defined types. 
+(define STT_LOOS       10)             ; Start of OS-specific
+(define STT_GNU_IFUNC  10)             ; Symbol is indirect code object
+(define STT_HIOS       12)             ; End of OS-specific
+(define STT_LOPROC     13)             ; Start of processor-specific
+(define STT_HIPROC     15)             ; End of processor-specific
+
+;; Symbol visibility specification encoded in the st_other field.
+
+(define STV_DEFAULT    0)              ; Default symbol visibility rules
+(define STV_INTERNAL   1)              ; Processor specific hidden class
+(define STV_HIDDEN     2)              ; Sym unavailable in other modules
+(define STV_PROTECTED  3)              ; Not preemptible, not exported
+
+(define (elf-symbol-binding sym)
+  (ash (elf-symbol-info sym) -4))
+
+(define (elf-symbol-type sym)
+  (logand (elf-symbol-info sym) #xf))
+
+(define (elf-symbol-visibility sym)
+  (logand (elf-symbol-other sym) #x3))
+
+(define NT_GNU_ABI_TAG 1)
+(define NT_GNU_HWCAP 2)
+(define NT_GNU_BUILD_ID 3)
+(define NT_GNU_GOLD_VERSION 4)
+
+(define-record-type <elf-note>
+  (make-elf-note name desc type)
+  elf-note?
+  (name elf-note-name)
+  (desc elf-note-desc)
+  (type elf-note-type))
+
+(define (parse-elf-note elf section)
+  (let ((bv (elf-bytes elf))
+        (byte-order (elf-byte-order elf))
+        (offset (elf-section-offset section)))
+    (unless (<= (+ offset 12) (bytevector-length bv))
+      (error "corrupt ELF (offset out of range)" offset))
+    (let ((namesz (bytevector-u32-ref bv offset byte-order))
+          (descsz (bytevector-u32-ref bv (+ offset 4) byte-order))
+          (type (bytevector-u32-ref bv (+ offset 8) byte-order)))
+      (unless (<= (+ offset 12 namesz descsz) (bytevector-length bv))
+        (error "corrupt ELF (offset out of range)" offset))
+      (let ((name (make-bytevector (1- namesz)))
+            (desc (make-bytevector descsz)))
+        (bytevector-copy! bv (+ offset 12) name 0 (1- namesz))
+        (bytevector-copy! bv (+ offset 12 namesz) desc 0 descsz)
+        (make-elf-note (utf8->string name) desc type)))))
+
+
+
+
+;;;
+;;; All of that was the parser.  Now, on to a linker.
+;;;
+
+;; A relocation records a reference to a symbol.  When the symbol is
+;; resolved to an address, the reloc location will be updated to point
+;; to the address.
+;;
+;; Two types.  Abs32/1 and Abs64/1 are absolute offsets in bytes.
+;; Rel32/4 is a relative signed offset in 32-bit units.  Either can have
+;; an arbitrary addend as well.
+;;
+(define-record-type <reloc>
+  (make-reloc type loc addend symbol)
+  reloc?
+  (type reloc-type) ;; rel32/4, abs32/1, abs64/1
+  (loc reloc-loc)
+  (addend reloc-addend)
+  (symbol reloc-symbol))
+
+;; A symbol is an association between a name and an address.  The
+;; address is always in regard to some particular address space.  When
+;; objects come into the linker, their symbols live in the object
+;; address space.  When the objects are allocated into ELF segments, the
+;; symbols will be relocated into memory address space, corresponding to
+;; the position the ELF will be loaded at.
+;;
+(define-record-type <symbol>
+  (make-symbol name address)
+  symbol?
+  (name symbol-name)
+  (address symbol-address))
+
+(define-record-type <object>
+  (make-object section bv relocs symbols)
+  object?
+  (section object-section)
+  (bv object-bv)
+  (relocs object-relocs)
+  (symbols object-symbols))
+
+(define (make-string-table)
+  '(("" 0 #vu8())))
+
+(define (string-table-length table)
+  (let ((last (car table)))
+    ;; The + 1 is for the trailing NUL byte.
+    (+ (cadr last) (bytevector-length (caddr last)) 1)))
+
+(define (string-table-intern table str)
+  (cond
+   ((assoc str table)
+    => (lambda (ent)
+         (values table (cadr ent))))
+   (else
+    (let* ((next (string-table-length table)))
+      (values (cons (list str next (string->utf8 str))
+                    table)
+              next)))))
+
+(define (link-string-table table)
+  (let ((out (make-bytevector (string-table-length table) 0)))
+    (for-each
+     (lambda (ent)
+       (let ((bytes (caddr ent)))
+         (bytevector-copy! bytes 0 out (cadr ent) (bytevector-length bytes))))
+     table)
+    out))
+
+(define (segment-kind section)
+  (let ((flags (elf-section-flags section)))
+    (cons (cond
+           ((= (elf-section-type section) SHT_DYNAMIC) PT_DYNAMIC)
+           ((zero? (logand SHF_ALLOC flags)) PT_NOTE)
+           (else PT_LOAD))
+          (logior (if (zero? (logand SHF_ALLOC flags))
+                      0
+                      PF_R)
+                  (if (zero? (logand SHF_EXECINSTR flags))
+                      0
+                      PF_X)
+                  (if (zero? (logand SHF_WRITE flags))
+                      0
+                      PF_W)))))
+
+(define (group-by-cars ls)
+  (let lp ((in ls) (k #f) (group #f) (out '()))
+    (cond
+     ((null? in)
+      (reverse!
+       (if group
+           (cons (cons k (reverse! group)) out)
+           out)))
+     ((and group (equal? k (caar in)))
+      (lp (cdr in) k (cons (cdar in) group) out))
+     (else
+      (lp (cdr in) (caar in) (list (cdar in))
+          (if group
+              (cons (cons k (reverse! group)) out)
+              out))))))
+
+(define (collate-objects-into-segments objects)
+  (group-by-cars
+   (stable-sort!
+    (map (lambda (o)
+           (cons (segment-kind (object-section o)) o))
+         objects)
+    (lambda (x y)
+      (let ((x-type (caar x)) (y-type (caar y))
+            (x-flags (cdar x)) (y-flags (cdar y))
+            (x-section (object-section (cdr x)))
+            (y-section (object-section (cdr y))))
+        (cond
+         ((not (equal? x-flags y-flags))
+          (< x-flags y-flags))
+         ((not (equal? x-type y-type))
+          (< x-type y-type))
+         ((not (equal? (elf-section-type x-section)
+                       (elf-section-type y-section)))
+          (cond
+           ((equal? (elf-section-type x-section) SHT_NOBITS) #t)
+           ((equal? (elf-section-type y-section) SHT_NOBITS) #f)
+           (else (< (elf-section-type x-section)
+                    (elf-section-type y-section)))))
+         (else
+          (< (elf-section-size x-section)
+             (elf-section-size y-section)))))))))
+
+(define (align address alignment)
+  (+ address
+     (modulo (- alignment (modulo address alignment)) alignment)))
+
+(define (fold1 proc ls s0)
+  (let lp ((ls ls) (s0 s0))
+    (if (null? ls)
+        s0
+        (lp (cdr ls) (proc (car ls) s0)))))
+
+(define (fold2 proc ls s0 s1)
+  (let lp ((ls ls) (s0 s0) (s1 s1))
+    (if (null? ls)
+        (values s0 s1)
+        (receive (s0 s1) (proc (car ls) s0 s1)
+          (lp (cdr ls) s0 s1)))))
+
+(define (fold4 proc ls s0 s1 s2 s3)
+  (let lp ((ls ls) (s0 s0) (s1 s1) (s2 s2) (s3 s3))
+    (if (null? ls)
+        (values s0 s1 s2 s3)
+        (receive (s0 s1 s2 s3) (proc (car ls) s0 s1 s2 s3)
+          (lp (cdr ls) s0 s1 s2 s3)))))
+
+(define (fold5 proc ls s0 s1 s2 s3 s4)
+  (let lp ((ls ls) (s0 s0) (s1 s1) (s2 s2) (s3 s3) (s4 s4))
+    (if (null? ls)
+        (values s0 s1 s2 s3 s4)
+        (receive (s0 s1 s2 s3 s4) (proc (car ls) s0 s1 s2 s3 s4)
+          (lp (cdr ls) s0 s1 s2 s3 s4)))))
+
+(define (relocate-section-header sec fileaddr memaddr)
+  (make-elf-section (elf-section-name sec) (elf-section-type sec)
+                    (elf-section-flags sec) memaddr
+                    fileaddr (elf-section-size sec)
+                    (elf-section-link sec) (elf-section-info sec)
+                    (elf-section-addralign sec) (elf-section-entsize sec)))
+
+(define *page-size* 4096)
+
+;; Adds object symbols to global table, relocating them from object
+;; address space to memory address space.
+(define (add-symbols symbols offset symtab)
+  (fold1 (lambda (symbol symtab)
+           (let ((name (symbol-name symbol))
+                 (addr (symbol-address symbol)))
+             (vhash-consq name (make-symbol name (+ addr offset)) symtab)))
+         symbols
+         symtab))
+
+(define (alloc-segment type flags objects fileaddr memaddr symtab alignment)
+  (let* ((loadable? (not (zero? flags)))
+         (alignment (fold1 (lambda (o alignment)
+                             (lcm (elf-section-addralign (object-section o))
+                                  alignment))
+                           objects
+                           alignment))
+         (fileaddr (align fileaddr alignment))
+         (memaddr (align memaddr alignment)))
+    (receive (objects fileend memend symtab)
+        (fold4 (lambda (o out fileaddr memaddr symtab)
+                 (let* ((section (object-section o))
+                        (fileaddr
+                         (if (= (elf-section-type section) SHT_NOBITS)
+                             fileaddr
+                             (align fileaddr (elf-section-addralign section))))
+                        (memaddr
+                         (align memaddr (elf-section-addralign section))))
+                   (values
+                    (cons (make-object (relocate-section-header section 
fileaddr
+                                                                memaddr)
+                                       (object-bv o)
+                                       (object-relocs o)
+                                       (object-symbols o))
+                          out)
+                    (if (= (elf-section-type section) SHT_NOBITS)
+                        fileaddr
+                        (+ fileaddr (elf-section-size section)))
+                    (+ memaddr (elf-section-size section))
+                    (add-symbols (object-symbols o) memaddr symtab))))
+               objects '() fileaddr memaddr symtab)
+      (values
+       (make-elf-segment* #:type type #:offset fileaddr
+                          #:vaddr (if loadable? memaddr 0)
+                          #:filesz (- fileend fileaddr)
+                          #:memsz (if loadable? (- memend memaddr) 0)
+                          #:flags flags #:align alignment)
+       (reverse objects)
+       symtab))))
+
+(define (process-reloc reloc bv file-offset mem-offset symtab endianness)
+  (let ((ent (vhash-assq (reloc-symbol reloc) symtab)))
+    (unless ent
+      (error "Undefined symbol" (reloc-symbol reloc)))
+    (let* ((file-loc (+ (reloc-loc reloc) file-offset))
+           (mem-loc (+ (reloc-loc reloc) mem-offset))
+           (addr (symbol-address (cdr ent))))
+      (case (reloc-type reloc)
+        ((rel32/4)
+         (let ((diff (- addr mem-loc)))
+           (unless (zero? (modulo diff 4))
+             (error "Bad offset" reloc symbol mem-offset))
+           (bytevector-s32-set! bv file-loc
+                                (+ (/ diff 4) (reloc-addend reloc))
+                                endianness)))
+        ((abs32/1)
+         (bytevector-u32-set! bv file-loc addr endianness))
+        ((abs64/1)
+         (bytevector-u64-set! bv file-loc addr endianness))
+        (else
+         (error "bad reloc type" reloc))))))
+
+(define (write-object bv o symtab endianness)
+  (let* ((section (object-section o))
+         (offset (elf-section-offset section))
+         (addr (elf-section-addr section))
+         (len (elf-section-size section))
+         (bytes (object-bv o))
+         (relocs (object-relocs o)))
+    (if (not (= (elf-section-type section) SHT_NOBITS))
+        (begin
+          (if (not (= (elf-section-size section) (bytevector-length bytes)))
+              (error "unexpected length" section bytes))
+          (bytevector-copy! bytes 0 bv offset len)
+          (for-each (lambda (reloc)
+                      (process-reloc reloc bv offset addr symtab endianness))
+                    relocs)))))
+
+(define (compute-sections-by-name seglists)
+  (let lp ((in (apply append (map cdr seglists)))
+           (n 1) (out '()) (shstrtab #f))
+    (if (null? in)
+        (fold1 (lambda (x tail)
+                 (cond
+                  ((false-if-exception
+                    (string-table-ref shstrtab (car x)))
+                   => (lambda (str) (acons str (cdr x) tail)))
+                  (else tail)))
+               out '())
+        (let* ((section (object-section (car in)))
+               (bv (object-bv (car in)))
+               (name (elf-section-name section)))
+          (lp (cdr in) (1+ n) (acons name n out)
+              (or shstrtab
+                  (and (= (elf-section-type section) SHT_STRTAB)
+                       (equal? (false-if-exception
+                                (string-table-ref bv name))
+                               ".shstrtab")
+                       bv)))))))
+
+;; Given a list of section-header/bytevector pairs, collate the sections
+;; into segments, allocate the segments, allocate the ELF bytevector,
+;; and write the segments into the bytevector, relocating as we go.
+;;
+(define* (link-elf objects #:key
+                   (page-aligned? #t)
+                   (endianness (target-endianness))
+                   (word-size (target-word-size)))
+  (let* ((seglists (collate-objects-into-segments objects))
+         (sections-by-name (compute-sections-by-name seglists))
+         (nsegments (length seglists))
+         (nsections (1+ (length objects))) ;; 1+ for the first reserved entry.
+         (program-headers-offset (elf-header-len word-size))
+         (fileaddr (+ program-headers-offset
+                      (* nsegments (elf-program-header-len word-size))))
+         (memaddr 0))
+   (receive (out fileend memend symtab _)
+       (fold5
+        (lambda (x out fileaddr memaddr symtab prev-flags)
+          (let ((type (caar x))
+                (flags (cdar x))
+                (objects (cdr x)))
+            (receive (segment objects symtab)
+                (alloc-segment type flags objects fileaddr memaddr symtab
+                               (if (and page-aligned?
+                                        (not (= flags prev-flags)))
+                                   *page-size*
+                                   8))
+              (values
+               (cons (cons segment objects) out)
+               (+ (elf-segment-offset segment) (elf-segment-filesz segment))
+               (if (zero? (elf-segment-memsz segment))
+                   memaddr
+                   (+ (elf-segment-vaddr segment)
+                      (elf-segment-memsz segment)))
+               symtab
+               flags))))
+        seglists '() fileaddr memaddr vlist-null 0)
+     (let* ((out (reverse! out))
+            (section-table-offset (+ (align fileend word-size)))
+            (fileend (+ section-table-offset
+                        (* nsections (elf-section-header-len word-size))))
+            (bv (make-bytevector fileend 0)))
+       (write-elf-header bv #:byte-order endianness #:word-size word-size
+                         #:phoff program-headers-offset #:phnum nsegments
+                         #:shoff section-table-offset #:shnum nsections
+                         #:shstrndx (or (assoc-ref sections-by-name 
".shstrtab")
+                                         SHN_UNDEF))
+       (write-elf-section-header bv section-table-offset
+                                 endianness word-size
+                                 (make-elf-section* #:type SHT_NULL #:flags 0
+                                                    #:addralign 0))
+       (fold2 (lambda (x phidx shidx)
+                (write-elf-program-header
+                 bv (+ program-headers-offset
+                       (* (elf-program-header-len word-size) phidx))
+                 endianness word-size (car x))
+                (values
+                 (1+ phidx)
+                 (fold1 (lambda (o shidx)
+                          (write-object bv o symtab endianness)
+                          (write-elf-section-header
+                           bv (+ section-table-offset
+                                 (* (elf-section-header-len word-size) shidx))
+                           endianness word-size (object-section o))
+                          (1+ shidx))
+                        (cdr x) shidx)))
+              out 0 1)
+       bv))))
diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm
index 966f345..f939a55 100644
--- a/module/system/vm/objcode.scm
+++ b/module/system/vm/objcode.scm
@@ -1,6 +1,6 @@
 ;;; Guile VM object code
 
-;; Copyright (C) 2001, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2010, 2012 Free Software Foundation, Inc.
 
 ;;; This library is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 (define-module (system vm objcode)
   #:export (objcode? objcode-meta
             bytecode->objcode objcode->bytecode
-            load-objcode write-objcode
+            load-thunk-from-file load-thunk-from-memory
             word-size byte-order))
 
 (load-extension (string-append "libguile-" (effective-version))
diff --git a/test-suite/tests/asm-to-bytecode.test 
b/test-suite/tests/asm-to-bytecode.test
index 52bc7e1..ddbe2ee 100644
--- a/test-suite/tests/asm-to-bytecode.test
+++ b/test-suite/tests/asm-to-bytecode.test
@@ -22,7 +22,9 @@
   #:use-module (test-suite lib)
   #:use-module (system vm instruction)
   #:use-module (system vm objcode)
+  #:use-module (system vm elf)
   #:use-module (system base target)
+  #:use-module (language objcode elf)
   #:use-module (language assembly)
   #:use-module (language assembly compile-bytecode))
 
@@ -167,20 +169,12 @@
                                      (nop) (nop) (nop)
                                      (nop) (nop))
                       #f)))
-              (write-objcode (bytecode->objcode b) p)
-              (let ((cookie   (make-bytevector %objcode-cookie-size))
-                    (expected (format #f "GOOF----~a-~a"
-                                      (cond ((eq? endian (endianness little))
-                                             "LE")
-                                            ((eq? endian (endianness big))
-                                             "BE")
-                                            (else
-                                             (error "unknown endianness"
-                                                    endian)))
-                                      word-size)))
-                (bytevector-copy! (get-objcode) 0 cookie 0
-                                  %objcode-cookie-size)
-                (string=? (utf8->string cookie) expected)))))))))
+              (write-objcode (bytecode->objcode b (target-endianness)) p)
+              (let* ((bv (get-objcode)))
+                (and=> (parse-elf bv)
+                       (lambda (elf)
+                         (and (equal? (elf-byte-order elf) endian)
+                              (equal? (elf-word-size elf) word-size))))))))))))
 
 (with-test-prefix "cross-compilation"
 
@@ -202,7 +196,7 @@
                                                    (make-int8 77)
                                                    (return))
                                     #f))
-               (o (bytecode->objcode b)))
+               (o (bytecode->objcode b (target-endianness))))
           (with-target "fcpu-unknown-gnu1.0"
             (lambda ()
               (write-objcode o p))))))))


hooks/post-receive
-- 
GNU Guile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]