Skip to contentSkip to conversation

Move the EM_AARCH64 definition to uapi/linux/elf-em.h

PATCH New Dan Aloni 2 participants 6 messages May 2, 2013 – Aug 30, 2013

Subsystems (3)
Arm (32-bit) arm64 exec and binfmt
lore
Share & tools
lore

Dan Aloni

author
#0 lore raw

PATCH 1/1 Move the EM_AARCH64 definition to uapi/linux/elf-em.h

Signed-off-by Dan Aloni <[email protected]>
CC Catalin Marinas <[email protected]>
---
 arch/arm64/include/asm/elf.h |    2 --
 include/uapi/linux/elf-em.h  |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(fixed the commit message)

arch/arm64/include/asm/elf.h +0 -2
index fe32c0e..b3da1c1 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * AArch64 static relocation types.
  */
include/uapi/linux/elf-em.h +1 -0
index 8e2b7ba..bc946e9 100644
@@ -34,6 +34,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw

PATCH 1/1 Move the EM_AARCH64 definition to uapi/linux/elf-em.h

Quoted 27 lines · Dan Aloni
Signed-off-by Dan Aloni <[email protected]>
CC Catalin Marinas <[email protected]>
---
 arch/arm64/include/asm/elf.h |    2 --
 include/uapi/linux/elf-em.h  |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(fixed the commit message)

arch/arm64/include/asm/elf.h +0 -2
index fe32c0e..b3da1c1 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * AArch64 static relocation types.
  */
include/uapi/linux/elf-em.h +0 -0
index 8e2b7ba..bc946e9 100644

include/uapi/linux/elf-em.h line 39

Quoted 6 lines
include/uapi/linux/elf-em.h +1 -0
@@ -34,6 +34,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */

Will you do the same for arch/arm? There is EM_ARM defined under arch/arm and arch/arm64 (elf.h).

Signature · 1 line
Catalin
author
#2 lore raw

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

Signed-off-by Dan Aloni <[email protected]>
CC Catalin Marinas <[email protected]>
---
 arch/arm/include/asm/elf.h   |    2 --
 arch/arm64/include/asm/elf.h |    3 ---
 include/uapi/linux/elf-em.h  |    2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/include/asm/elf.h +0 -2
index 38050b1..e110a67 100644
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
 
-#define EM_ARM	40
-
 #define EF_ARM_EABI_MASK	0xff000000
 #define EF_ARM_EABI_UNKNOWN	0x00000000
 #define EF_ARM_EABI_VER1	0x01000000
arch/arm64/include/asm/elf.h +0 -3
index fe32c0e..e7fa87f 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * 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
 
 #ifdef CONFIG_COMPAT
-#define EM_ARM				40
 #define COMPAT_ELF_PLATFORM		("v8l")
 
 #define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))
include/uapi/linux/elf-em.h +2 -0
index 8e2b7ba..59c17a2 100644
@@ -22,6 +22,7 @@
 #define EM_PPC		20	/* PowerPC */
 #define EM_PPC64	21	 /* PowerPC64 */
 #define EM_SPU		23	/* Cell BE SPU */
+#define EM_ARM		40	/* ARM 32 bit */
 #define EM_SH		42	/* SuperH */
 #define EM_SPARCV9	43	/* SPARC v9 64-bit */
 #define EM_IA_64	50	/* HP/Intel IA-64 */

@@ -34,6 +35,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */
Signature · 1 line
1.7.10.4
author
#3 lore raw

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

Signed-off-by Dan Aloni <[email protected]>
---
 arch/arm/include/asm/elf.h   | 2 --
 arch/arm64/include/asm/elf.h | 3 ---
 include/uapi/linux/elf-em.h  | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/include/asm/elf.h +0 -2
index 56211f2..f4b46d3 100644
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
 
-#define EM_ARM	40
-
 #define EF_ARM_EABI_MASK	0xff000000
 #define EF_ARM_EABI_UNKNOWN	0x00000000
 #define EF_ARM_EABI_VER1	0x01000000
arch/arm64/include/asm/elf.h +0 -3
index fe32c0e..e7fa87f 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * 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
 
 #ifdef CONFIG_COMPAT
-#define EM_ARM				40
 #define COMPAT_ELF_PLATFORM		("v8l")
 
 #define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))
include/uapi/linux/elf-em.h +2 -0
index 8e2b7ba..59c17a2 100644
@@ -22,6 +22,7 @@
 #define EM_PPC		20	/* PowerPC */
 #define EM_PPC64	21	 /* PowerPC64 */
 #define EM_SPU		23	/* Cell BE SPU */
+#define EM_ARM		40	/* ARM 32 bit */
 #define EM_SH		42	/* SuperH */
 #define EM_SPARCV9	43	/* SPARC v9 64-bit */
 #define EM_IA_64	50	/* HP/Intel IA-64 */

@@ -34,6 +35,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */
Signature · 1 line
1.8.1.4
maintainer
#4 lore raw

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

Quoted 54 lines · Dan Aloni
Signed-off-by Dan Aloni <[email protected]>
---
 arch/arm/include/asm/elf.h   | 2 --
 arch/arm64/include/asm/elf.h | 3 ---
 include/uapi/linux/elf-em.h  | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/include/asm/elf.h +0 -2
index 56211f2..f4b46d3 100644
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
 
-#define EM_ARM	40
-
 #define EF_ARM_EABI_MASK	0xff000000
 #define EF_ARM_EABI_UNKNOWN	0x00000000
 #define EF_ARM_EABI_VER1	0x01000000
arch/arm64/include/asm/elf.h +0 -3
index fe32c0e..e7fa87f 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * 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
 
 #ifdef CONFIG_COMPAT
-#define EM_ARM				40
 #define COMPAT_ELF_PLATFORM		("v8l")
 
 #define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))
include/uapi/linux/elf-em.h +1 -0
index 8e2b7ba..59c17a2 100644
@@ -22,6 +22,7 @@
 #define EM_PPC		20	/* PowerPC */
 #define EM_PPC64	21	 /* PowerPC64 */
 #define EM_SPU		23	/* Cell BE SPU */
+#define EM_ARM		40	/* ARM 32 bit */
 #define EM_SH		42	/* SuperH */
 #define EM_SPARCV9	43	/* SPARC v9 64-bit */
 #define EM_IA_64	50	/* HP/Intel IA-64 */

include/uapi/linux/elf-em.h line 40

Quoted 6 lines
include/uapi/linux/elf-em.h +1 -0
@@ -34,6 +35,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */

The patch is fine. I can push it if Russell acks the arm parts (or the other way around, I don't have any preference).

Signature · 1 line
Catalin
maintainer
#5 lore raw

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

In reply to Dan Aloni

Russell, are you ok with the patch below? I can push it upstream if you ack it (I don't think it's worth splitting in two patches since arm64 needs EM_ARM for compat as well).

Thanks.

Quoted 63 lines · Dan Aloni
Signed-off-by Dan Aloni <[email protected]>
---
 arch/arm/include/asm/elf.h   | 2 --
 arch/arm64/include/asm/elf.h | 3 ---
 include/uapi/linux/elf-em.h  | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/include/asm/elf.h +0 -2
index 56211f2..f4b46d3 100644
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
 
-#define EM_ARM	40
-
 #define EF_ARM_EABI_MASK	0xff000000
 #define EF_ARM_EABI_UNKNOWN	0x00000000
 #define EF_ARM_EABI_VER1	0x01000000
arch/arm64/include/asm/elf.h +0 -3
index fe32c0e..e7fa87f 100644
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64		183
-
 /*
  * 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
 
 #ifdef CONFIG_COMPAT
-#define EM_ARM				40
 #define COMPAT_ELF_PLATFORM		("v8l")
 
 #define COMPAT_ELF_ET_DYN_BASE		(randomize_et_dyn(2 * TASK_SIZE_32 / 3))
include/uapi/linux/elf-em.h +2 -0
index 8e2b7ba..59c17a2 100644
@@ -22,6 +22,7 @@
 #define EM_PPC		20	/* PowerPC */
 #define EM_PPC64	21	 /* PowerPC64 */
 #define EM_SPU		23	/* Cell BE SPU */
+#define EM_ARM		40	/* ARM 32 bit */
 #define EM_SH		42	/* SuperH */
 #define EM_SPARCV9	43	/* SPARC v9 64-bit */
 #define EM_IA_64	50	/* HP/Intel IA-64 */

@@ -34,6 +35,7 @@
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
+#define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */
Signature · 1 line
1.8.1.4