Handle ELFCLASS32 files for x86-64

src/include/elf.h

Index: src/include/elf.h
diff --git a/src/include/elf.h b/src/include/elf.h
index 780f704a76e2db5f6df1fd35e44e968e800ba682..f10acbfe09521c683139c4dd60bdc05d2cd307cb 100644
--- a/src/include/elf.h
+++ b/src/include/elf.h
@@ -1,46 +1,23 @@
 /*
- * Copyright 2008, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
-
 /* @file
  *
  * Minimal ELF header declaration / constants.  Only Elf values are
- * handled, and constants are defined only for fields that are actualy
+ * handled, and constants are defined only for fields that are actually
  * used.  (Unused constants for used fields are include only for
  * "completeness", though of course in many cases there are more
  * values in use, e.g., the EM_* values for e_machine.)
  *
  * Note: We define both 32 and 64 bit versions of the elf file in
- * separate files, and then unify them here so that elf readers
- * can process elf files without having to specify the bit format.
+ * separate files.  We define sizeless aliases here to keep most other
+ * code width-agnostic.  But in fact, we really only deal with 32-bit
+ * formats internally.  For compatibility with past practice, we
+ * recognize the 64-bit format for x86-64, but we translate that to
+ * 32-bit format in our own data structures.
  *
  * (Re)Created from the ELF specification at
  * http://x86.ddj.com/ftp/manuals/tools/elf.pdf which is referenced
@@ -60,9 +37,8 @@
 #endif
 #if NACL_TARGET_SUBARCH == 64
 # include "native_client/src/include/elf64.h"
-#else
-# include "native_client/src/include/elf32.h"
 #endif
+#include "native_client/src/include/elf32.h"
 
 EXTERN_C_BEGIN
 
@@ -73,36 +49,24 @@ EXTERN_C_BEGIN
  * is fixed, we conditionally include elf64 only if needed.
  */
 
-#if NACL_TARGET_SUBARCH == 64
-# define NACL_PRI_ADDR_ALL_WIDTH "016"
-# define NACL_ELF_CLASS ELFCLASS64
-#elif NACL_TARGET_SUBARCH == 32
-# define NACL_PRI_ADDR_ALL_WIDTH "08"
-# define NACL_ELF_CLASS ELFCLASS32
-#else
-# error "NACL_TARGET_SUBARCH must be defined to be 32 or 64"
-#endif
+#define NACL_ELF_CLASS ELFCLASS32
 
-#define NACL_PRI_ELF_DO_GLUE2(a, b) a##b
-#define NACL_PRI_ELF_GLUE2(a, b) NACL_PRI_ELF_DO_GLUE2(a, b)
-#define NACL_PRI_ELF(fmt) NACL_PRI_ELF_GLUE2(fmt, NACL_TARGET_SUBARCH)
+#define NACL_PRIdElf_Addr   NACL_PRId32
+#define NACL_PRIiElf_Addr   NACL_PRIi32
+#define NACL_PRIoElf_Addr   NACL_PRIo32
+#define NACL_PRIuElf_Addr   NACL_PRIu32
+#define NACL_PRIxElf_Addr   NACL_PRIx32
+#define NACL_PRIXElf_Addr   NACL_PRIX32
 
-#define NACL_PRIdElf_Addr   NACL_PRI_ELF(NACL_PRId)
-#define NACL_PRIiElf_Addr   NACL_PRI_ELF(NACL_PRIi)
-#define NACL_PRIoElf_Addr   NACL_PRI_ELF(NACL_PRIo)
-#define NACL_PRIuElf_Addr   NACL_PRI_ELF(NACL_PRIu)
-#define NACL_PRIxElf_Addr   NACL_PRI_ELF(NACL_PRIx)
-#define NACL_PRIXElf_Addr   NACL_PRI_ELF(NACL_PRIX)
+#define NACL_PRIxElf_AddrAll   "08"NACL_PRIx32
+#define NACL_PRIXElf_AddrAll   "08"NACL_PRIX32
 
-#define NACL_PRIxElf_AddrAll   NACL_PRI_ADDR_ALL_WIDTH NACL_PRI_ELF(NACL_PRIx)
-#define NACL_PRIXElf_AddrAll   NACL_PRI_ADDR_ALL_WIDTH NACL_PRI_ELF(NACL_PRIX)
-
-#define NACL_PRIdElf_Off    NACL_PRI_ELF(NACL_PRId)
-#define NACL_PRIiElf_Off    NACL_PRI_ELF(NACL_PRIi)
-#define NACL_PRIoElf_Off    NACL_PRI_ELF(NACL_PRIo)
-#define NACL_PRIuElf_Off    NACL_PRI_ELF(NACL_PRIu)
-#define NACL_PRIxElf_Off    NACL_PRI_ELF(NACL_PRIx)
-#define NACL_PRIXElf_Off    NACL_PRI_ELF(NACL_PRIX)
+#define NACL_PRIdElf_Off    NACL_PRId32
+#define NACL_PRIiElf_Off    NACL_PRIi32
+#define NACL_PRIoElf_Off    NACL_PRIo32
+#define NACL_PRIuElf_Off    NACL_PRIu32
+#define NACL_PRIxElf_Off    NACL_PRIx32
+#define NACL_PRIXElf_Off    NACL_PRIX32
 
 #define NACL_PRIdElf_Half   NACL_PRId16
 #define NACL_PRIiElf_Half   NACL_PRIi16
@@ -125,47 +89,19 @@ EXTERN_C_BEGIN
 #define NACL_PRIxElf_Sword  NACL_PRIx32z
 #define NACL_PRIXElf_Sword  NACL_PRIX32z
 
-#define NACL_PRIdElf_Xword  NACL_PRI_ELF(NACL_PRId)
-#define NACL_PRIiElf_Xword  NACL_PRI_ELF(NACL_PRIi)
-#define NACL_PRIoElf_Xword  NACL_PRI_ELF(NACL_PRIo)
-#define NACL_PRIuElf_Xword  NACL_PRI_ELF(NACL_PRIu)
-#define NACL_PRIxElf_Xword  NACL_PRI_ELF(NACL_PRIx)
-#define NACL_PRIXElf_Xword  NACL_PRI_ELF(NACL_PRIX)
-
-#define NACL_PRIdElf_Sxword NACL_PRI_ELF(NACL_PRId)
-#define NACL_PRIiElf_Sxword NACL_PRI_ELF(NACL_PRIi)
-#define NACL_PRIoElf_Sxword NACL_PRI_ELF(NACL_PRIo)
-#define NACL_PRIuElf_Sxword NACL_PRI_ELF(NACL_PRIu)
-#define NACL_PRIxElf_Sxword NACL_PRI_ELF(NACL_PRIx)
-#define NACL_PRIXElf_Sxword NACL_PRI_ELF(NACL_PRIX)
-
-#if NACL_TARGET_SUBARCH == 64
+#define NACL_PRIdElf_Xword  NACL_PRId32
+#define NACL_PRIiElf_Xword  NACL_PRIi32
+#define NACL_PRIoElf_Xword  NACL_PRIo32
+#define NACL_PRIuElf_Xword  NACL_PRIu32
+#define NACL_PRIxElf_Xword  NACL_PRIx32
+#define NACL_PRIXElf_Xword  NACL_PRIX32
 
-/* __WORDSIZE == 64 */
-
-/* Define sub architecture neutral types */
-typedef Elf64_Addr   Elf_Addr;
-typedef Elf64_Off    Elf_Off;
-typedef Elf64_Half   Elf_Half;
-typedef Elf64_Word   Elf_Word;
-typedef Elf64_Sword  Elf_Sword;
-typedef Elf64_Xword  Elf_Xword;
-typedef Elf64_Sxword Elf_Sxword;
-
-/* Define ranges for elf types. */
-#define MIN_ELF_ADDR 0x0
-#define MAX_ELF_ADDR 0xffffffffffffffff
-
-/* Define a neutral form of the file header. */
-typedef Elf64_Ehdr Elf_Ehdr;
-
-/* Define a neutral form of a program header. */
-typedef Elf64_Phdr Elf_Phdr;
-
-/* Define neutral section headers. */
-typedef Elf64_Shdr Elf_Shdr;
-
-#else
+#define NACL_PRIdElf_Sxword NACL_PRId32
+#define NACL_PRIiElf_Sxword NACL_PRIi32
+#define NACL_PRIoElf_Sxword NACL_PRIo32
+#define NACL_PRIuElf_Sxword NACL_PRIu32
+#define NACL_PRIxElf_Sxword NACL_PRIx32
+#define NACL_PRIXElf_Sxword NACL_PRIX32
 
 /* Define sub architecture neutral types */
 typedef Elf32_Addr  Elf_Addr;
@@ -189,8 +125,6 @@ typedef Elf32_Phdr Elf_Phdr;
 /* Define neutral section headers. */
 typedef Elf32_Shdr Elf_Shdr;
 
-#endif
-
 EXTERN_C_END
 
 #endif  /* NATIVE_CLIENT_SRC_INCLUDE_ELF_H_ */