Initial CVS checkin of gold

4 files changed, 846 insertions, 0 deletions

diff --git a/elfcpp/README b/elfcpp/README
new file mode 100644
index 0000000000..9eb07e8c47
--- /dev/null
+++ b/elfcpp/README
@@ -0,0 +1,9 @@
+elfcpp is a C++ library for reading and writing ELF information.  This
+was written to support gold, the ELF linker, and may not be generally
+useful.
+
+elfcpp does not do file I/O.  It deals only with offsets and memory
+data.
+
+For efficiency, most accessors are templates with two arguments: the
+ELF file class (32 or 64 bits) and the endianness.
diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h
new file mode 100644
index 0000000000..14027fad05
--- /dev/null
+++ b/elfcpp/elfcpp.h
@@ -0,0 +1,599 @@
+// elfcpp.h -- main header file for elfcpp    -*- C++ -*-
+
+// This is the external interface for elfcpp.
+
+#ifndef ELFCPP_H
+#define ELFCPP_H
+
+#include "elfcpp_config.h"
+
+#include <stdint.h>
+
+namespace elfcpp
+{
+
+// Basic ELF types.
+
+// These types are always the same size.
+
+typedef uint16_t Elf_Half;
+typedef uint32_t Elf_Word;
+typedef int32_t Elf_Sword;
+typedef uint64_t Elf_Xword;
+typedef int64_t Elf_Sxword;
+
+// These types vary in size depending on the ELF file class.  The
+// template parameter should be 32 or 64.
+
+template<int size>
+struct Elf_types
+{
+  // Dummy types which should not be used.
+  typedef unsigned char Elf_Addr;
+  typedef unsigned char Elf_Off;
+  // WXword is for fields which are Elf32_Word and Elf64_Xword.
+  typedef unsigned char Elf_WXword;
+};
+
+template<>
+struct Elf_types<32>
+{
+  typedef uint32_t Elf_Addr;
+  typedef uint32_t Elf_Off;
+  typedef uint32_t Elf_WXword;
+};
+
+template<>
+struct Elf_types<64>
+{
+  typedef uint64_t Elf_Addr;
+  typedef uint64_t Elf_Off;
+  typedef uint64_t Elf_WXword;
+  static const int ehdr_size;
+  static const int shdr_size;
+  static const int sym_size;
+};
+
+// Offsets within the Ehdr e_ident field.
+
+const int EI_MAG0 = 0;
+const int EI_MAG1 = 1;
+const int EI_MAG2 = 2;
+const int EI_MAG3 = 3;
+const int EI_CLASS = 4;
+const int EI_DATA = 5;
+const int EI_VERSION = 6;
+const int EI_OSABI = 7;
+const int EI_ABIVERSION = 8;
+const int EI_PAD = 9;
+const int EI_NIDENT = 16;
+
+// The valid values found in Ehdr e_ident[EI_MAG0 through EI_MAG3].
+
+const int ELFMAG0 = 0x7f;
+const int ELFMAG1 = 'E';
+const int ELFMAG2 = 'L';
+const int ELFMAG3 = 'F';
+
+// The valid values found in Ehdr e_ident[EI_CLASS].
+
+enum
+{
+  ELFCLASSNONE = 0,
+  ELFCLASS32 = 1,
+  ELFCLASS64 = 2
+};
+
+// The valid values found in Ehdr e_ident[EI_DATA].
+
+enum
+{
+  ELFDATANONE = 0,
+  ELFDATA2LSB = 1,
+  ELFDATA2MSB = 2
+};
+
+// The valid values found in Ehdr e_ident[EI_VERSION] and e_version.
+
+enum
+{
+  EV_NONE = 0,
+  EV_CURRENT = 1
+};
+
+// The valid values found in Ehdr e_ident[EI_OSABI].
+
+enum ELFOSABI
+{
+  ELFOSABI_NONE = 0,
+  ELFOSABI_HPUX = 1,
+  ELFOSABI_NETBSD = 2,
+  // ELFOSABI_LINUX is not listed in the ELF standard.
+  ELFOSABI_LINUX = 3,
+  // ELFOSABI_HURD is not listed in the ELF standard.
+  ELFOSABI_HURD = 4,
+  ELFOSABI_SOLARIS = 6,
+  ELFOSABI_AIX = 7,
+  ELFOSABI_IRIX = 8,
+  ELFOSABI_FREEBSD = 9,
+  ELFOSABI_TRU64 = 10,
+  ELFOSABI_MODESTO = 11,
+  ELFOSABI_OPENBSD = 12,
+  ELFOSABI_OPENVMS = 13,
+  ELFOSABI_NSK = 14,
+  ELFOSABI_AROS = 15,
+  // A GNU extension for the ARM.
+  ELFOSABI_ARM = 97,
+  // A GNU extension for the MSP.
+  ELFOSABI_STANDALONE = 255
+};
+
+// The valid values found in the Ehdr e_type field.
+
+enum ET
+{
+  ET_NONE = 0,
+  ET_REL = 1,
+  ET_EXEC = 2,
+  ET_DYN = 3,
+  ET_CORE = 4,
+  ET_LOOS = 0xfe00,
+  ET_HIOS = 0xfeff,
+  ET_LOPROC = 0xff00,
+  ET_HIPROC = 0xffff
+};
+
+// The valid values found in the Ehdr e_machine field.
+
+enum EM
+{
+  EM_NONE = 0,
+  EM_M32 = 1,
+  EM_SPARC = 2,
+  EM_386 = 3,
+  EM_68K = 4,
+  EM_88K = 5,
+  // 6 used to be EM_486
+  EM_860 = 7,
+  EM_MIPS = 8,
+  EM_S370 = 9,
+  EM_MIPS_RS3_LE = 10,
+  // 11 was the old Sparc V9 ABI.
+  // 12 through 14 are reserved.
+  EM_PARISC = 15,
+  // 16 is reserved.
+  // Some old PowerPC object files use 17.
+  EM_VPP500 = 17,
+  EM_SPARC32PLUS = 18,
+  EM_960 = 19,
+  EM_PPC = 20,
+  EM_PPC64 = 21,
+  EM_S390 = 22,
+  // 23 through 35 are served.
+  EM_V800 = 36,
+  EM_FR20 = 37,
+  EM_RH32 = 38,
+  EM_RCE = 39,
+  EM_ARM = 40,
+  EM_ALPHA = 41,
+  EM_SH = 42,
+  EM_SPARCV9 = 43,
+  EM_TRICORE = 44,
+  EM_ARC = 45,
+  EM_H8_300 = 46,
+  EM_H8_300H = 47,
+  EM_H8S = 48,
+  EM_H8_500 = 49,
+  EM_IA_64 = 50,
+  EM_MIPS_X = 51,
+  EM_COLDFIRE = 52,
+  EM_68HC12 = 53,
+  EM_MMA = 54,
+  EM_PCP = 55,
+  EM_NCPU = 56,
+  EM_NDR1 = 57,
+  EM_STARCORE = 58,
+  EM_ME16 = 59,
+  EM_ST100 = 60,
+  EM_TINYJ = 61,
+  EM_X86_64 = 62,
+  EM_PDSP = 63,
+  EM_PDP10 = 64,
+  EM_PDP11 = 65,
+  EM_FX66 = 66,
+  EM_ST9PLUS = 67,
+  EM_ST7 = 68,
+  EM_68HC16 = 69,
+  EM_68HC11 = 70,
+  EM_68HC08 = 71,
+  EM_68HC05 = 72,
+  EM_SVX = 73,
+  EM_ST19 = 74,
+  EM_VAX = 75,
+  EM_CRIS = 76,
+  EM_JAVELIN = 77,
+  EM_FIREPATH = 78,
+  EM_ZSP = 79,
+  EM_MMIX = 80,
+  EM_HUANY = 81,
+  EM_PRISM = 82,
+  EM_AVR = 83,
+  EM_FR30 = 84,
+  EM_D10V = 85,
+  EM_D30V = 86,
+  EM_V850 = 87,
+  EM_M32R = 88,
+  EM_MN10300 = 89,
+  EM_MN10200 = 90,
+  EM_PJ = 91,
+  EM_OPENRISC = 92,
+  EM_ARC_A5 = 93,
+  EM_XTENSA = 94,
+  EM_VIDEOCORE = 95,
+  EM_TMM_GPP = 96,
+  EM_NS32K = 97,
+  EM_TPC = 98,
+  // Some old picoJava object files use 99 (EM_PJ is correct).
+  EM_SNP1K = 99,
+  EM_ST200 = 100,
+  EM_IP2K = 101,
+  EM_MAX = 102,
+  EM_CR = 103,
+  EM_F2MC16 = 104,
+  EM_MSP430 = 105,
+  EM_BLACKFIN = 106,
+  EM_SE_C33 = 107,
+  EM_SEP = 108,
+  EM_ARCA = 109,
+  EM_UNICORE = 110,
+  EM_ALTERA_NIOS2 = 113,
+  EM_CRX = 114,
+  // The Morph MT.
+  EM_MT = 0x2530,
+  // DLX.
+  EM_DLX = 0x5aa5,
+  // FRV.
+  EM_FRV = 0x5441,
+  // Infineon Technologies 16-bit microcontroller with C166-V2 core.
+  EM_X16X = 0x4688,
+  // Xstorym16
+  EM_XSTORMY16 = 0xad45,
+  // Renesas M32C
+  EM_M32C = 0xfeb0,
+  // Vitesse IQ2000
+  EM_IQ2000 = 0xfeba,
+  // NIOS
+  EM_NIOS32 = 0xfebb
+  // Old AVR objects used 0x1057 (EM_AVR is correct).
+  // Old MSP430 objects used 0x1059 (EM_MSP430 is correct).
+  // Old FR30 objects used 0x3330 (EM_FR30 is correct).
+  // Old OpenRISC objects used 0x3426 and 0x8472 (EM_OPENRISC is correct).
+  // Old D10V objects used 0x7650 (EM_D10V is correct).
+  // Old D30V objects used 0x7676 (EM_D30V is correct).
+  // Old IP2X objects used 0x8217 (EM_IP2K is correct).
+  // Old PowerPC objects used 0x9025 (EM_PPC is correct).
+  // Old Alpha objects used 0x9026 (EM_ALPHA is correct).
+  // Old M32R objects used 0x9041 (EM_M32R is correct).
+  // Old V850 objects used 0x9080 (EM_V850 is correct).
+  // Old S/390 objects used 0xa390 (EM_S390 is correct).
+  // Old Xtensa objects used 0xabc7 (EM_XTENSA is correct).
+  // Old MN10300 objects used 0xbeef (EM_MN10300 is correct).
+  // Old MN10200 objects used 0xdead (EM_MN10200 is correct).
+};
+
+// Special section indices.
+
+enum
+{
+  SHN_UNDEF = 0,
+  SHN_LORESERVE = 0xff00,
+  SHN_LOPROC = 0xff00,
+  SHN_HIPROC = 0xff1f,
+  SHN_LOOS = 0xff20,
+  SHN_HIOS = 0xff3f,
+  SHN_ABS = 0xfff1,
+  SHN_COMMON = 0xfff2,
+  SHN_XINDEX = 0xffff,
+  SHN_HIRESERVE = 0xffff
+};
+
+// The valid values found in the Shdr sh_type field.
+
+enum
+{
+  SHT_NULL = 0,
+  SHT_PROGBITS = 1,
+  SHT_SYMTAB = 2,
+  SHT_STRTAB = 3,
+  SHT_RELA = 4,
+  SHT_HASH = 5,
+  SHT_DYNAMIC = 6,
+  SHT_NOTE = 7,
+  SHT_NOBITS = 8,
+  SHT_REL = 9,
+  SHT_SHLIB = 10,
+  SHT_DYNSYM = 11,
+  SHT_INIT_ARRAY = 14,
+  SHT_FINI_ARRAY = 15,
+  SHT_PREINIT_ARRAY = 16,
+  SHT_GROUP = 17,
+  SHT_SYMTAB_SHNDX = 18,
+  SHT_LOOS = 0x60000000,
+  SHT_HIOS = 0x6fffffff,
+  SHT_LOPROC = 0x70000000,
+  SHT_HIPROC = 0x7fffffff,
+  SHT_LOUSER = 0x80000000,
+  SHT_HIUSER = 0xffffffff,
+  // The remaining values are not in the standard.
+  // List of prelink dependencies.
+  SHT_GNU_LIBLIST = 0x6ffffff7,
+  // Versions defined by file.
+  SHT_SUNW_verdef = 0x6ffffffd,
+  SHT_GNU_verdef = 0x6ffffffd,
+  // Versions needed by file.
+  SHT_SUNW_verneed = 0x6ffffffe,
+  SHT_GNU_verneed = 0x6ffffffe,
+  // Symbol versions,
+  SHT_SUNW_versym = 0x6fffffff,
+  SHT_GNU_versym = 0x6fffffff,
+};
+
+// The valid bit flags found in the Shdr sh_flags field.
+
+enum
+{
+  SHF_WRITE = 0x1,
+  SHF_ALLOC = 0x2,
+  SHF_EXECINSTR = 0x4,
+  SHF_MERGE = 0x10,
+  SHF_STRINGS = 0x20,
+  SHF_INFO_LINK = 0x40,
+  SHF_LINK_ORDER = 0x80,
+  SHF_OS_NONCONFORMING = 0x100,
+  SHF_GROUP = 0x200,
+  SHF_TLS = 0x400,
+  SHF_MASKOS = 0x0ff00000,
+  SHF_MASKPROC = 0xf0000000
+};
+
+// Bit flags which appear in the first 32-bit word of the section data
+// of a SHT_GROUP section.
+
+enum
+{
+  GRP_COMDAT = 0x1,
+  GRP_MASKOS = 0x0ff00000,
+  GRP_MASKPROC = 0xf0000000
+};
+
+// Symbol binding from Sym st_info field.
+
+enum STB
+{
+  STB_LOCAL = 0,
+  STB_GLOBAL = 1,
+  STB_WEAK = 2,
+  STB_LOOS = 10,
+  STB_HIOS = 12,
+  STB_LOPROC = 13,
+  STB_HIPROC = 15
+};
+
+// Symbol types from Sym st_info field.
+
+enum STT
+{
+  STT_NOTYPE = 0,
+  STT_OBJECT = 1,
+  STT_FUNC = 2,
+  STT_SECTION = 3,
+  STT_FILE = 4,
+  STT_COMMON = 5,
+  STT_TLS = 6,
+  STT_LOOS = 10,
+  STT_HIOS = 12,
+  STT_LOPROC = 13,
+  STT_HIPROC = 15
+};
+
+// Symbol visibility from Sym st_other field.
+
+enum STV
+{
+  STV_DEFAULT = 0,
+  STV_INTERNAL = 1,
+  STV_HIDDEN = 2,
+  STV_PROTECTED = 3
+};
+
+} // End namespace elfcpp.
+
+// Include internal details after defining the types.
+#include "elfcpp_internal.h"
+
+namespace elfcpp
+{
+
+// The offset of the ELF file header in the ELF file.
+
+const int file_header_offset = 0;
+
+// ELF structure sizes.
+
+template<int size>
+struct Elf_sizes
+{
+  // Size of ELF file header.
+  static const int ehdr_size = sizeof(internal::Ehdr_data<size>);
+  // Size of ELF section header.
+  static const int shdr_size = sizeof(internal::Shdr_data<size>);
+  // Size of ELF symbol table entry.
+  static const int sym_size = sizeof(internal::Sym_data<size>);
+};
+
+// Accessor class for the ELF file header.
+
+template<int size, bool big_endian>
+class Ehdr
+{
+ public:
+  Ehdr(const unsigned char* p)
+    : p_(reinterpret_cast<const internal::Ehdr_data<size>*>(p))
+  { }
+
+  const unsigned char*
+  get_e_ident() const
+  { return this->p_->e_ident; }
+
+  Elf_Half
+  get_e_type() const
+  { return internal::convert_half<big_endian>(this->p_->e_type); }
+
+  Elf_Half
+  get_e_machine() const
+  { return internal::convert_half<big_endian>(this->p_->e_machine); }
+
+  Elf_Word
+  get_e_version() const
+  { return internal::convert_word<big_endian>(this->p_->e_version); }
+
+  typename Elf_types<size>::Elf_Addr
+  get_e_entry() const
+  { return internal::convert_addr<size, big_endian>(this->p_->e_entry); }
+
+  typename Elf_types<size>::Elf_Off
+  get_e_phoff() const
+  { return internal::convert_off<size, big_endian>(this->p_->e_phoff); }
+
+  typename Elf_types<size>::Elf_Off
+  get_e_shoff() const
+  { return internal::convert_off<size, big_endian>(this->p_->e_shoff); }
+
+  Elf_Word
+  get_e_flags() const
+  { return internal::convert_word<big_endian>(this->p_->e_flags); }
+
+  Elf_Half
+  get_e_ehsize() const
+  { return internal::convert_half<big_endian>(this->p_->e_ehsize); }
+
+  Elf_Half
+  get_e_phentsize() const
+  { return internal::convert_half<big_endian>(this->p_->e_phentsize); }
+
+  Elf_Half
+  get_e_phnum() const
+  { return internal::convert_half<big_endian>(this->p_->e_phnum); }
+
+  Elf_Half
+  get_e_shentsize() const
+  { return internal::convert_half<big_endian>(this->p_->e_shentsize); }
+
+  Elf_Half
+  get_e_shnum() const
+  { return internal::convert_half<big_endian>(this->p_->e_shnum); }
+
+  Elf_Half
+  get_e_shstrndx() const
+  { return internal::convert_half<big_endian>(this->p_->e_shstrndx); }
+
+ private:
+  const internal::Ehdr_data<size>* p_;
+};
+
+// Accessor class for an ELF section header.
+
+template<int size, bool big_endian>
+class Shdr
+{
+ public:
+  Shdr(const unsigned char* p)
+    : p_(reinterpret_cast<const internal::Shdr_data<size>*>(p))
+  { }
+
+  Elf_Word
+  get_sh_name() const
+  { return internal::convert_word<big_endian>(this->p_->sh_name); }
+
+  Elf_Word
+  get_sh_type() const
+  { return internal::convert_word<big_endian>(this->p_->sh_type); }
+
+  typename Elf_types<size>::Elf_WXword
+  get_sh_flags() const
+  { return internal::convert_wxword<size, big_endian>(this->p_->sh_flags); }
+
+  typename Elf_types<size>::Elf_Addr
+  get_sh_addr() const
+  { return internal::convert_addr<size, big_endian>(this->p_->sh_addr); }
+
+  typename Elf_types<size>::Elf_Off
+  get_sh_offset() const
+  { return internal::convert_off<size, big_endian>(this->p_->sh_offset); }
+
+  typename Elf_types<size>::Elf_WXword
+  get_sh_size() const
+  { return internal::convert_wxword<size, big_endian>(this->p_->sh_size); }
+
+  Elf_Word
+  get_sh_link() const
+  { return internal::convert_word<big_endian>(this->p_->sh_link); }
+
+  Elf_Word
+  get_sh_info() const
+  { return internal::convert_word<big_endian>(this->p_->sh_info); }
+
+  typename Elf_types<size>::Elf_WXword
+  get_sh_addralign() const
+  { return
+      internal::convert_wxword<size, big_endian>(this->p_->sh_addralign); }
+
+  typename Elf_types<size>::Elf_WXword
+  get_sh_entsize() const
+  { return internal::convert_wxword<size, big_endian>(this->p_->sh_entsize); }
+
+ private:
+  const internal::Shdr_data<size>* p_;
+};
+
+// Accessor class for an ELF symbol table entry.
+
+template<int size, bool big_endian>
+class Sym
+{
+ public:
+  Sym(const unsigned char* p)
+    : p_(reinterpret_cast<const internal::Sym_data<size>*>(p))
+  { }
+
+  Elf_Word
+  get_st_name() const
+  { return internal::convert_word<big_endian>(this->p_->st_name); }
+
+  typename Elf_types<size>::Elf_Addr
+  get_st_value() const
+  { return internal::convert_addr<size, big_endian>(this->p_->st_value); }
+
+  typename Elf_types<size>::Elf_WXword
+  get_st_size() const
+  { return internal::convert_wxword<big_endian>(this->p_->st_size); }
+
+  unsigned char
+  get_st_info() const
+  { return this->p_->st_info; }
+
+  unsigned char
+  get_st_other() const
+  { return this->p_->st_other; }
+
+  Elf_Half
+  get_st_shndx() const
+  { return internal::convert_half<big_endian>(this->p_->st_shndx); }
+
+ private:
+  const internal::Sym_data<size>* p_;
+};
+
+} // End namespace elfcpp.
+
+#endif // !defined(ELFPCP_H)
diff --git a/elfcpp/elfcpp_config.h b/elfcpp/elfcpp_config.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/elfcpp/elfcpp_config.h
diff --git a/elfcpp/elfcpp_internal.h b/elfcpp/elfcpp_internal.h
new file mode 100644
index 0000000000..f4dd8bd519
--- /dev/null
+++ b/elfcpp/elfcpp_internal.h
@@ -0,0 +1,238 @@
+// elfcpp_internal.h -- internals for elfcpp   -*- C++ -*-
+
+// This is included by elfcpp.h, the external interface, but holds
+// information which we want to keep private.
+
+#include "elfcpp_config.h"
+
+#include <byteswap.h>
+
+#ifndef ELFCPP_INTERNAL_H
+#define ELFCPP_INTERNAL_H
+
+namespace elfcpp
+{
+
+namespace internal
+{
+
+#ifdef WORDS_BIG_ENDIAN
+const bool host_big_endian = true;
+#else
+const bool host_big_endian = false;
+#endif
+
+// Conversion routines between target and host.
+
+// Convert Elf_Half.
+
+template<bool same_endian>
+Elf_Half
+convert_half_host(Elf_Half v);
+
+template<>
+inline Elf_Half
+convert_half_host<true>(Elf_Half v)
+{
+  return v;
+}
+
+template<>
+inline Elf_Half
+convert_half_host<false>(Elf_Half v)
+{
+  return bswap_16(v);
+}
+
+template<bool big_endian>
+inline Elf_Half
+convert_half(Elf_Half v)
+{
+  return convert_half_host<big_endian == host_big_endian>(v);
+}
+
+// Convert Elf_Word.
+
+template<bool same_endian>
+Elf_Word
+convert_word_host(Elf_Word v);
+
+template<>
+inline Elf_Word
+convert_word_host<true>(Elf_Word v)
+{
+  return v;
+}
+
+template<>
+inline Elf_Word
+convert_word_host<false>(Elf_Word v)
+{
+  return bswap_32(v);
+}
+
+template<bool big_endian>
+inline Elf_Word
+convert_word(Elf_Word v)
+{
+  return convert_word_host<big_endian == host_big_endian>(v);
+}
+
+// Convert Elf_Xword.
+
+template<bool same_endian>
+Elf_Xword
+convert_xword_host(Elf_Xword v);
+
+template<>
+inline Elf_Xword
+convert_xword_host<true>(Elf_Xword v)
+{
+  return v;
+}
+
+template<>
+inline Elf_Xword
+convert_xword_host<false>(Elf_Xword v)
+{
+  return bswap_64(v);
+}
+
+template<bool big_endian>
+inline Elf_Xword
+convert_xword(Elf_Xword v)
+{
+  return convert_xword_host<big_endian == host_big_endian>(v);
+}
+
+// Convert Elf_addr.
+
+template<int size, bool same_endian>
+typename Elf_types<size>::Elf_Addr
+convert_addr_size(typename Elf_types<size>::Elf_Addr);
+
+template<>
+inline Elf_types<32>::Elf_Addr
+convert_addr_size<32, true>(Elf_types<32>::Elf_Addr v)
+{
+  return v;
+}
+
+template<>
+inline Elf_types<64>::Elf_Addr
+convert_addr_size<64, true>(Elf_types<64>::Elf_Addr v)
+{
+  return v;
+}
+
+template<>
+inline Elf_types<32>::Elf_Addr
+convert_addr_size<32, false>(Elf_types<32>::Elf_Addr v)
+{
+  return bswap_32(v);
+}
+
+template<>
+inline Elf_types<64>::Elf_Addr
+convert_addr_size<64, false>(Elf_types<64>::Elf_Addr v)
+{
+  return bswap_64(v);
+}
+
+template<int size, bool big_endian>
+inline typename Elf_types<size>::Elf_Addr
+convert_addr(typename Elf_types<size>::Elf_Addr v)
+{
+  return convert_addr_size<size, big_endian == host_big_endian>(v);
+}
+
+// Convert Elf_Off.
+
+template<int size, bool big_endian>
+inline typename Elf_types<size>::Elf_Off
+convert_off(typename Elf_types<size>::Elf_Off v)
+{
+  return convert_addr_size<size, big_endian == host_big_endian>(v);
+}
+
+// Convert Elf_WXword.
+
+template<int size, bool big_endian>
+inline typename Elf_types<size>::Elf_Off
+convert_wxword(typename Elf_types<size>::Elf_Off v)
+{
+  return convert_addr_size<size, big_endian == host_big_endian>(v);
+}
+
+// The ELF file header.
+
+template<int size>
+struct Ehdr_data
+{
+  unsigned char e_ident[EI_NIDENT];
+  Elf_Half e_type;
+  Elf_Half e_machine;
+  Elf_Word e_version;
+  typename Elf_types<size>::Elf_Addr e_entry;
+  typename Elf_types<size>::Elf_Off e_phoff;
+  typename Elf_types<size>::Elf_Off e_shoff;
+  Elf_Word e_flags;
+  Elf_Half e_ehsize;
+  Elf_Half e_phentsize;
+  Elf_Half e_phnum;
+  Elf_Half e_shentsize;
+  Elf_Half e_shnum;
+  Elf_Half e_shstrndx;
+};
+
+// An Elf section header.
+
+template<int size>
+struct Shdr_data
+{
+  Elf_Word sh_name;
+  Elf_Word sh_type;
+  typename Elf_types<size>::Elf_WXword sh_flags;
+  typename Elf_types<size>::Elf_Addr sh_addr;
+  typename Elf_types<size>::Elf_Off sh_offset;
+  typename Elf_types<size>::Elf_WXword sh_size;
+  Elf_Word sh_link;
+  Elf_Word sh_info;
+  typename Elf_types<size>::Elf_WXword sh_addralign;
+  typename Elf_types<size>::Elf_WXword sh_entsize;
+};
+
+// An ELF symbol table entry.  We use template specialization for the
+// 32-bit and 64-bit versions because the fields are in a different
+// order.
+
+template<int size>
+struct Sym_data;
+
+template<>
+struct Sym_data<32>
+{
+  Elf_Word st_name;
+  Elf_types<32>::Elf_Addr st_value;
+  Elf_Word st_size;
+  unsigned char st_info;
+  unsigned char st_other;
+  Elf_Half st_shndx;
+};
+
+template<>
+struct Sym_data<64>
+{
+  Elf_Word st_name;
+  unsigned char st_info;
+  unsigned char st_other;
+  Elf_Half st_shndx;
+  Elf_types<64>::Elf_Addr st_value;
+  Elf_Xword st_size;
+};
+
+} // End namespace internal.
+
+} // End namespace elfcpp.
+
+#endif // !defined(ELFCPP_INTERNAL_H)