Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909e3ee4 authored by Dan Aloni's avatar Dan Aloni Committed by Catalin Marinas
Browse files

Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h 



Signed-off-by: default avatarDan Aloni <alonid@stratoscale.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f3a1d7d5

arch/arm/include/asm/elf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 




typedef struct user_fp elf_fpregset_t;

typedef struct user_fp elf_fpregset_t;





#define EM_ARM	40



#define EF_ARM_EABI_MASK	0xff000000

#define EF_ARM_EABI_MASK	0xff000000

#define EF_ARM_EABI_UNKNOWN	0x00000000

#define EF_ARM_EABI_UNKNOWN	0x00000000

#define EF_ARM_EABI_VER1	0x01000000

#define EF_ARM_EABI_VER1	0x01000000

arch/arm64/include/asm/elf.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t; 
typedef elf_greg_t elf_gregset_t[ELF_NGREG];

typedef elf_greg_t elf_gregset_t[ELF_NGREG];

typedef struct user_fpsimd_state elf_fpregset_t;

typedef struct user_fpsimd_state elf_fpregset_t;





#define EM_AARCH64		183



/*

/*

 * AArch64 static relocation types.

 * AArch64 static relocation types.

 */

 */
@@ -151,7 +149,6 @@ extern unsigned long arch_randomize_brk(struct mm_struct *mm); 
#define arch_randomize_brk arch_randomize_brk

#define arch_randomize_brk arch_randomize_brk





#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

#define EM_ARM				40

#define COMPAT_ELF_PLATFORM		("v8l")

#define COMPAT_ELF_PLATFORM		("v8l")





#define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))

#define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))

include/uapi/linux/elf-em.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define EM_PPC		20	/* PowerPC */

#define EM_PPC		20	/* PowerPC */

#define EM_PPC64	21	 /* PowerPC64 */

#define EM_PPC64	21	 /* PowerPC64 */

#define EM_SPU		23	/* Cell BE SPU */

#define EM_SPU		23	/* Cell BE SPU */

#define EM_ARM		40	/* ARM 32 bit */

#define EM_SH		42	/* SuperH */

#define EM_SH		42	/* SuperH */

#define EM_SPARCV9	43	/* SPARC v9 64-bit */

#define EM_SPARCV9	43	/* SPARC v9 64-bit */

#define EM_IA_64	50	/* HP/Intel IA-64 */

#define EM_IA_64	50	/* HP/Intel IA-64 */
@@ -34,6 +35,7 @@ 
#define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */

#define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */

#define EM_BLACKFIN     106     /* ADI Blackfin Processor */

#define EM_BLACKFIN     106     /* ADI Blackfin Processor */

#define EM_TI_C6000	140	/* TI C6X DSPs */

#define EM_TI_C6000	140	/* TI C6X DSPs */

#define EM_AARCH64	183	/* ARM 64 bit */

#define EM_FRV		0x5441	/* Fujitsu FR-V */

#define EM_FRV		0x5441	/* Fujitsu FR-V */

#define EM_AVR32	0x18ad	/* Atmel AVR32 */

#define EM_AVR32	0x18ad	/* Atmel AVR32 */