fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / elf.h

diff --git a/include/linux/elf.h b/include/linux/elf.h
index d3bfacb..60713e6 100644 (file)
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,8 +3,11 @@
 
 #include <linux/types.h>
 #include <linux/auxvec.h>
+#include <linux/elf-em.h>
 #include <asm/elf.h>
 
+struct file;
+
 #ifndef elf_read_implies_exec
   /* Executables for which elf_read_implies_exec() returns TRUE will
      have the READ_IMPLIES_EXEC personality flag set automatically.
@@ -55,64 +58,6 @@ typedef __s64        Elf64_Sxword;
 #define ET_LOPROC 0xff00
 #define ET_HIPROC 0xffff
 
-/* These constants define the various ELF target machines */
-#define EM_NONE  0
-#define EM_M32   1
-#define EM_SPARC 2
-#define EM_386   3
-#define EM_68K   4
-#define EM_88K   5
-#define EM_486   6   /* Perhaps disused */
-#define EM_860   7
-
-#define EM_MIPS                8       /* MIPS R3000 (officially, big-endian only) */
-
-#define EM_MIPS_RS4_BE 10      /* MIPS R4000 big-endian */
-
-#define EM_PARISC      15      /* HPPA */
-
-#define EM_SPARC32PLUS 18      /* Sun's "v8plus" */
-
-#define EM_PPC        20       /* PowerPC */
-#define EM_PPC64       21       /* PowerPC64 */
-
-#define EM_SH         42       /* SuperH */
-
-#define EM_SPARCV9     43      /* SPARC v9 64-bit */
-
-#define EM_IA_64       50      /* HP/Intel IA-64 */
-
-#define EM_X86_64      62      /* AMD x86-64 */
-
-#define EM_S390                22      /* IBM S/390 */
-
-#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
-
-#define EM_V850                87      /* NEC v850 */
-
-#define EM_M32R                88      /* Renesas M32R */
-
-#define EM_H8_300       46      /* Renesas H8/300,300H,H8S */
-
-/*
- * This is an interim value that we will use until the committee comes
- * up with a final number.
- */
-#define EM_ALPHA       0x9026
-
-/* Bogus old v850 magic number, used by old tools.  */
-#define EM_CYGNUS_V850 0x9080
-
-/* Bogus old m32r magic number, used by old tools.  */
-#define EM_CYGNUS_M32R 0x9041
-
-/*
- * This is the old interim value for S/390 architecture
- */
-#define EM_S390_OLD     0xA390
-
-#define EM_FRV         0x5441          /* Fujitsu FR-V */
-
 /* This is the info that is needed to parse the dynamic section of the file */
 #define DT_NULL                0
 #define DT_NEEDED      1
@@ -415,6 +360,7 @@ extern Elf32_Dyn _DYNAMIC [];
 #define elfhdr         elf32_hdr
 #define elf_phdr       elf32_phdr
 #define elf_note       elf32_note
+#define elf_addr_t     Elf32_Off
 
 #else
 
@@ -422,8 +368,16 @@ extern Elf64_Dyn _DYNAMIC [];
 #define elfhdr         elf64_hdr
 #define elf_phdr       elf64_phdr
 #define elf_note       elf64_note
+#define elf_addr_t     Elf64_Off
 
 #endif
 
+#ifndef ARCH_HAVE_EXTRA_ELF_NOTES
+static inline int arch_notes_size(void) { return 0; }
+static inline void arch_write_notes(struct file *file) { }
+
+#define ELF_CORE_EXTRA_NOTES_SIZE arch_notes_size()
+#define ELF_CORE_WRITE_EXTRA_NOTES arch_write_notes(file)
+#endif /* ARCH_HAVE_EXTRA_ELF_NOTES */
 
 #endif /* _LINUX_ELF_H */