* [PATCH] Move the EM_AARCH64 definition to uapi/linux/elf-em.h
@ 2013-05-02 11:56 Dan Aloni
2013-05-02 13:27 ` Catalin Marinas
0 siblings, 1 reply; 6+ messages in thread
From: Dan Aloni @ 2013-05-02 11:56 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Dan Aloni <alonid@stratoscale.com>
CC: Catalin Marinas <catalin.marinas@arm.com>
---
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)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index fe32c0e..b3da1c1 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -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.
*/
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 8e2b7ba..bc946e9 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -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 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] Move the EM_AARCH64 definition to uapi/linux/elf-em.h
2013-05-02 11:56 [PATCH] Move the EM_AARCH64 definition to uapi/linux/elf-em.h Dan Aloni
@ 2013-05-02 13:27 ` Catalin Marinas
2013-05-05 8:24 ` [PATCH] Move the EM_ARM and EM_AARCH64 definitions " Dan Aloni
0 siblings, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2013-05-02 13:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 02, 2013 at 12:56:18PM +0100, Dan Aloni wrote:
> Signed-off-by: Dan Aloni <alonid@stratoscale.com>
> CC: Catalin Marinas <catalin.marinas@arm.com>
> ---
> 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)
>
> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
> index fe32c0e..b3da1c1 100644
> --- a/arch/arm64/include/asm/elf.h
> +++ b/arch/arm64/include/asm/elf.h
> @@ -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.
> */
> diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
> index 8e2b7ba..bc946e9 100644
> --- a/include/uapi/linux/elf-em.h
> +++ b/include/uapi/linux/elf-em.h
> @@ -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).
--
Catalin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
2013-05-02 13:27 ` Catalin Marinas
@ 2013-05-05 8:24 ` Dan Aloni
2013-08-28 13:24 ` [PATCH repost-for-3.12] " Dan Aloni
0 siblings, 1 reply; 6+ messages in thread
From: Dan Aloni @ 2013-05-05 8:24 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Dan Aloni <alonid@stratoscale.com>
CC: Catalin Marinas <catalin.marinas@arm.com>
---
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(-)
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 38050b1..e110a67 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -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
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index fe32c0e..e7fa87f 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -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))
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 8e2b7ba..59c17a2 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -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 */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH repost-for-3.12] Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
2013-05-05 8:24 ` [PATCH] Move the EM_ARM and EM_AARCH64 definitions " Dan Aloni
@ 2013-08-28 13:24 ` Dan Aloni
2013-08-28 14:47 ` Catalin Marinas
2013-08-30 10:09 ` Catalin Marinas
0 siblings, 2 replies; 6+ messages in thread
From: Dan Aloni @ 2013-08-28 13:24 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Dan Aloni <alonid@stratoscale.com>
---
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(-)
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 56211f2..f4b46d3 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -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
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index fe32c0e..e7fa87f 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -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))
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 8e2b7ba..59c17a2 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -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 */
--
1.8.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH repost-for-3.12] Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
2013-08-28 13:24 ` [PATCH repost-for-3.12] " Dan Aloni
@ 2013-08-28 14:47 ` Catalin Marinas
2013-08-30 10:09 ` Catalin Marinas
1 sibling, 0 replies; 6+ messages in thread
From: Catalin Marinas @ 2013-08-28 14:47 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 28, 2013 at 02:24:53PM +0100, Dan Aloni wrote:
> Signed-off-by: Dan Aloni <alonid@stratoscale.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
> index 56211f2..f4b46d3 100644
> --- a/arch/arm/include/asm/elf.h
> +++ b/arch/arm/include/asm/elf.h
> @@ -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
> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
> index fe32c0e..e7fa87f 100644
> --- a/arch/arm64/include/asm/elf.h
> +++ b/arch/arm64/include/asm/elf.h
> @@ -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))
> diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
> index 8e2b7ba..59c17a2 100644
> --- a/include/uapi/linux/elf-em.h
> +++ b/include/uapi/linux/elf-em.h
> @@ -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 */
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).
--
Catalin
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH repost-for-3.12] Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
2013-08-28 13:24 ` [PATCH repost-for-3.12] " Dan Aloni
2013-08-28 14:47 ` Catalin Marinas
@ 2013-08-30 10:09 ` Catalin Marinas
1 sibling, 0 replies; 6+ messages in thread
From: Catalin Marinas @ 2013-08-30 10:09 UTC (permalink / raw)
To: linux-arm-kernel
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.
On Wed, Aug 28, 2013 at 02:24:53PM +0100, Dan Aloni wrote:
> Signed-off-by: Dan Aloni <alonid@stratoscale.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
> index 56211f2..f4b46d3 100644
> --- a/arch/arm/include/asm/elf.h
> +++ b/arch/arm/include/asm/elf.h
> @@ -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
> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
> index fe32c0e..e7fa87f 100644
> --- a/arch/arm64/include/asm/elf.h
> +++ b/arch/arm64/include/asm/elf.h
> @@ -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))
> diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
> index 8e2b7ba..59c17a2 100644
> --- a/include/uapi/linux/elf-em.h
> +++ b/include/uapi/linux/elf-em.h
> @@ -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 */
>
> --
> 1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-30 10:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-02 11:56 [PATCH] Move the EM_AARCH64 definition to uapi/linux/elf-em.h Dan Aloni
2013-05-02 13:27 ` Catalin Marinas
2013-05-05 8:24 ` [PATCH] Move the EM_ARM and EM_AARCH64 definitions " Dan Aloni
2013-08-28 13:24 ` [PATCH repost-for-3.12] " Dan Aloni
2013-08-28 14:47 ` Catalin Marinas
2013-08-30 10:09 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).