1 files changed, 1 insertions, 58 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h
index d3bfacb24496..b70d1d2c8d28 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,6 +3,7 @@
 #include <linux/types.h>
 #include <linux/auxvec.h>
+#include <linux/elf-em.h>
 #include <asm/elf.h>
 #ifndef elf_read_implies_exec
@@ -55,64 +56,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

diff --git a/include/linux/elf.h b/include/linux/elf.h index d3bfacb24496..b70d1d2c8d28 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h
@@ -3,6 +3,7 @@
3		3
4	#include <linux/types.h>	4	#include <linux/types.h>
5	#include <linux/auxvec.h>	5	#include <linux/auxvec.h>
		6	#include <linux/elf-em.h>
6	#include <asm/elf.h>	7	#include <asm/elf.h>
7		8
8	#ifndef elf_read_implies_exec	9	#ifndef elf_read_implies_exec
@@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword;
55	#define ET_LOPROC 0xff00	56	#define ET_LOPROC 0xff00
56	#define ET_HIPROC 0xffff	57	#define ET_HIPROC 0xffff
57		58
58	/* These constants define the various ELF target machines */
59	#define EM_NONE 0
60	#define EM_M32 1
61	#define EM_SPARC 2
62	#define EM_386 3
63	#define EM_68K 4
64	#define EM_88K 5
65	#define EM_486 6 /* Perhaps disused */
66	#define EM_860 7
67
68	#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
69
70	#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
71
72	#define EM_PARISC 15 /* HPPA */
73
74	#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
75
76	#define EM_PPC 20 /* PowerPC */
77	#define EM_PPC64 21 /* PowerPC64 */
78
79	#define EM_SH 42 /* SuperH */
80
81	#define EM_SPARCV9 43 /* SPARC v9 64-bit */
82
83	#define EM_IA_64 50 /* HP/Intel IA-64 */
84
85	#define EM_X86_64 62 /* AMD x86-64 */
86
87	#define EM_S390 22 /* IBM S/390 */
88
89	#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
90
91	#define EM_V850 87 /* NEC v850 */
92
93	#define EM_M32R 88 /* Renesas M32R */
94
95	#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */
96
97	/*
98	* This is an interim value that we will use until the committee comes
99	* up with a final number.
100	*/
101	#define EM_ALPHA 0x9026
102
103	/* Bogus old v850 magic number, used by old tools. */
104	#define EM_CYGNUS_V850 0x9080
105
106	/* Bogus old m32r magic number, used by old tools. */
107	#define EM_CYGNUS_M32R 0x9041
108
109	/*
110	* This is the old interim value for S/390 architecture
111	*/
112	#define EM_S390_OLD 0xA390
113
114	#define EM_FRV 0x5441 /* Fujitsu FR-V */
115
116	/* This is the info that is needed to parse the dynamic section of the file */	59	/* This is the info that is needed to parse the dynamic section of the file */
117	#define DT_NULL 0	60	#define DT_NULL 0
118	#define DT_NEEDED 1	61	#define DT_NEEDED 1