1 files changed, 6 insertions, 143 deletions
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index d043f80bc2fd..f035c45d7b5e 100644
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -1,145 +1,8 @@
-#ifndef __ASMSPARC_ELF_H
+#ifndef ___ASM_SPARC_ELF_H
-#define __ASMSPARC_ELF_H
+#define ___ASM_SPARC_ELF_H
+#if defined(__sparc__) && defined(__arch64__)
-/*
+#include <asm-sparc/elf_64.h>
- * ELF register definitions..
- */
-#include <asm/ptrace.h>
-/*
- * Sparc section types
- */
-#define STT_REGISTER            13
-/*
- * Sparc ELF relocation types
- */
-#define R_SPARC_NONE            0
-#define R_SPARC_8               1
-#define R_SPARC_16              2
-#define R_SPARC_32              3
-#define R_SPARC_DISP8           4
-#define R_SPARC_DISP16          5
-#define R_SPARC_DISP32          6
-#define R_SPARC_WDISP30         7
-#define R_SPARC_WDISP22         8
-#define R_SPARC_HI22            9
-#define R_SPARC_22              10
-#define R_SPARC_13              11
-#define R_SPARC_LO10            12
-#define R_SPARC_GOT10           13
-#define R_SPARC_GOT13           14
-#define R_SPARC_GOT22           15
-#define R_SPARC_PC10            16
-#define R_SPARC_PC22            17
-#define R_SPARC_WPLT30          18
-#define R_SPARC_COPY            19
-#define R_SPARC_GLOB_DAT        20
-#define R_SPARC_JMP_SLOT        21
-#define R_SPARC_RELATIVE        22
-#define R_SPARC_UA32            23
-#define R_SPARC_PLT32           24
-#define R_SPARC_HIPLT22         25
-#define R_SPARC_LOPLT10         26
-#define R_SPARC_PCPLT32         27
-#define R_SPARC_PCPLT22         28
-#define R_SPARC_PCPLT10         29
-#define R_SPARC_10              30
-#define R_SPARC_11              31
-#define R_SPARC_64              32
-#define R_SPARC_OLO10           33
-#define R_SPARC_WDISP16         40
-#define R_SPARC_WDISP19         41
-#define R_SPARC_7               43
-#define R_SPARC_5               44
-#define R_SPARC_6               45
-/* Bits present in AT_HWCAP, primarily for Sparc32.  */
-#define HWCAP_SPARC_FLUSH       1    /* CPU supports flush instruction. */
-#define HWCAP_SPARC_STBAR       2
-#define HWCAP_SPARC_SWAP        4
-#define HWCAP_SPARC_MULDIV      8
-#define HWCAP_SPARC_V9          16
-#define HWCAP_SPARC_ULTRA3      32
-#define CORE_DUMP_USE_REGSET
-/* Format is:
- *      G0 --> G7
- *      O0 --> O7
- *      L0 --> L7
- *      I0 --> I7
- *      PSR, PC, nPC, Y, WIM, TBR
- */
-typedef unsigned long elf_greg_t;
-#define ELF_NGREG 38
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-typedef struct {
-        union {
-                unsigned long   pr_regs[32];
-                double          pr_dregs[16];
-        } pr_fr;
-        unsigned long __unused;
-        unsigned long   pr_fsr;
-        unsigned char   pr_qcnt;
-        unsigned char   pr_q_entrysize;
-        unsigned char   pr_en;
-        unsigned int    pr_q[64];
-} elf_fpregset_t;
-#include <asm/mbus.h>
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ((x)->e_machine == EM_SPARC)
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_ARCH        EM_SPARC
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#define USE_ELF_CORE_DUMP
-#ifndef CONFIG_SUN4
-#define ELF_EXEC_PAGESIZE       4096
 #else
-#define ELF_EXEC_PAGESIZE       8192
+#include <asm-sparc/elf_32.h>
+#endif
 #endif
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-#define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  This can NOT be done in userspace
-   on Sparc.  */
-/* Sun4c has none of the capabilities, most sun4m's have them all.
- * XXX This is gross, set some global variable at boot time. -DaveM
- */
-#define ELF_HWCAP       ((ARCH_SUN4C_SUN4) ? 0 : \
-                         (HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \
-                          HWCAP_SPARC_SWAP | \
-                          ((srmmu_modtype != Cypress && \
-                            srmmu_modtype != Cypress_vE && \
-                            srmmu_modtype != Cypress_vD) ? \
-                           HWCAP_SPARC_MULDIV : 0)))
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo. */
-#define ELF_PLATFORM    (NULL)
-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#endif /* !(__ASMSPARC_ELF_H) */

diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index d043f80bc2fd..f035c45d7b5e 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h
@@ -1,145 +1,8 @@
1	#ifndef __ASMSPARC_ELF_H	1	#ifndef ___ASM_SPARC_ELF_H
2	#define __ASMSPARC_ELF_H	2	#define ___ASM_SPARC_ELF_H
3		3	#if defined(__sparc__) && defined(__arch64__)
4	/*	4	#include <asm-sparc/elf_64.h>
5	* ELF register definitions..
6	*/
7
8	#include <asm/ptrace.h>
9
10	/*
11	* Sparc section types
12	*/
13	#define STT_REGISTER 13
14
15	/*
16	* Sparc ELF relocation types
17	*/
18	#define R_SPARC_NONE 0
19	#define R_SPARC_8 1
20	#define R_SPARC_16 2
21	#define R_SPARC_32 3
22	#define R_SPARC_DISP8 4
23	#define R_SPARC_DISP16 5
24	#define R_SPARC_DISP32 6
25	#define R_SPARC_WDISP30 7
26	#define R_SPARC_WDISP22 8
27	#define R_SPARC_HI22 9
28	#define R_SPARC_22 10
29	#define R_SPARC_13 11
30	#define R_SPARC_LO10 12
31	#define R_SPARC_GOT10 13
32	#define R_SPARC_GOT13 14
33	#define R_SPARC_GOT22 15
34	#define R_SPARC_PC10 16
35	#define R_SPARC_PC22 17
36	#define R_SPARC_WPLT30 18
37	#define R_SPARC_COPY 19
38	#define R_SPARC_GLOB_DAT 20
39	#define R_SPARC_JMP_SLOT 21
40	#define R_SPARC_RELATIVE 22
41	#define R_SPARC_UA32 23
42	#define R_SPARC_PLT32 24
43	#define R_SPARC_HIPLT22 25
44	#define R_SPARC_LOPLT10 26
45	#define R_SPARC_PCPLT32 27
46	#define R_SPARC_PCPLT22 28
47	#define R_SPARC_PCPLT10 29
48	#define R_SPARC_10 30
49	#define R_SPARC_11 31
50	#define R_SPARC_64 32
51	#define R_SPARC_OLO10 33
52	#define R_SPARC_WDISP16 40
53	#define R_SPARC_WDISP19 41
54	#define R_SPARC_7 43
55	#define R_SPARC_5 44
56	#define R_SPARC_6 45
57
58	/* Bits present in AT_HWCAP, primarily for Sparc32. */
59
60	#define HWCAP_SPARC_FLUSH 1 /* CPU supports flush instruction. */
61	#define HWCAP_SPARC_STBAR 2
62	#define HWCAP_SPARC_SWAP 4
63	#define HWCAP_SPARC_MULDIV 8
64	#define HWCAP_SPARC_V9 16
65	#define HWCAP_SPARC_ULTRA3 32
66
67	#define CORE_DUMP_USE_REGSET
68
69	/* Format is:
70	* G0 --> G7
71	* O0 --> O7
72	* L0 --> L7
73	* I0 --> I7
74	* PSR, PC, nPC, Y, WIM, TBR
75	*/
76	typedef unsigned long elf_greg_t;
77	#define ELF_NGREG 38
78	typedef elf_greg_t elf_gregset_t[ELF_NGREG];
79
80	typedef struct {
81	union {
82	unsigned long pr_regs[32];
83	double pr_dregs[16];
84	} pr_fr;
85	unsigned long __unused;
86	unsigned long pr_fsr;
87	unsigned char pr_qcnt;
88	unsigned char pr_q_entrysize;
89	unsigned char pr_en;
90	unsigned int pr_q[64];
91	} elf_fpregset_t;
92
93	#include <asm/mbus.h>
94
95	/*
96	* This is used to ensure we don't load something for the wrong architecture.
97	*/
98	#define elf_check_arch(x) ((x)->e_machine == EM_SPARC)
99
100	/*
101	* These are used to set parameters in the core dumps.
102	*/
103	#define ELF_ARCH EM_SPARC
104	#define ELF_CLASS ELFCLASS32
105	#define ELF_DATA ELFDATA2MSB
106
107	#define USE_ELF_CORE_DUMP
108	#ifndef CONFIG_SUN4
109	#define ELF_EXEC_PAGESIZE 4096
110	#else	5	#else
111	#define ELF_EXEC_PAGESIZE 8192	6	#include <asm-sparc/elf_32.h>
		7	#endif
112	#endif	8	#endif
113
114
115	/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
116	use of this is to invoke "./ld.so someprog" to test out a new version of
117	the loader. We need to make sure that it is out of the way of the program
118	that it will "exec", and that there is sufficient room for the brk. */
119
120	#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
121
122	/* This yields a mask that user programs can use to figure out what
123	instruction set this cpu supports. This can NOT be done in userspace
124	on Sparc. */
125
126	/* Sun4c has none of the capabilities, most sun4m's have them all.
127	* XXX This is gross, set some global variable at boot time. -DaveM
128	*/
129	#define ELF_HWCAP ((ARCH_SUN4C_SUN4) ? 0 : \
130	(HWCAP_SPARC_FLUSH \| HWCAP_SPARC_STBAR \| \
131	HWCAP_SPARC_SWAP \| \
132	((srmmu_modtype != Cypress && \
133	srmmu_modtype != Cypress_vE && \
134	srmmu_modtype != Cypress_vD) ? \
135	HWCAP_SPARC_MULDIV : 0)))
136
137	/* This yields a string that ld.so will use to load implementation
138	specific libraries for optimization. This is more specific in
139	intent than poking at uname or /proc/cpuinfo. */
140
141	#define ELF_PLATFORM (NULL)
142
143	#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
144
145	#endif /* !(__ASMSPARC_ELF_H) */