[v1] linux-user: Split up elfload.c

[PATCH 64/89] linux-user: Move elf parameters to {arm, aarch64}/target_elf.h

Posted by Richard Henderson 3 months, 2 weeks ago

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/aarch64/target_elf.h | 10 ++++++++++
 linux-user/arm/target_elf.h     |  5 +++++
 linux-user/elfload.c            | 29 -----------------------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_elf.h
index d955b3d07f..8f704055ec 100644
--- a/linux-user/aarch64/target_elf.h
+++ b/linux-user/aarch64/target_elf.h
@@ -8,4 +8,14 @@
 #ifndef AARCH64_TARGET_ELF_H
 #define AARCH64_TARGET_ELF_H
 
+#define ELF_ARCH                EM_AARCH64
+#define ELF_CLASS               ELFCLASS64
+#define USE_ELF_CORE_DUMP
+
+#if TARGET_BIG_ENDIAN
+# define VDSO_HEADER            "vdso-be.c.inc"
+#else
+# define VDSO_HEADER            "vdso-le.c.inc"
+#endif
+
 #endif
diff --git a/linux-user/arm/target_elf.h b/linux-user/arm/target_elf.h
index 209076284b..2f8564a484 100644
--- a/linux-user/arm/target_elf.h
+++ b/linux-user/arm/target_elf.h
@@ -8,6 +8,11 @@
 #ifndef ARM_TARGET_ELF_H
 #define ARM_TARGET_ELF_H
 
+#define ELF_ARCH                EM_ARM
+#define ELF_CLASS               ELFCLASS32
+#define EXSTACK_DEFAULT         true
+#define USE_ELF_CORE_DUMP
+
 #define HI_COMMPAGE (intptr_t)0xffff0f00u
 
 #endif
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index d071bca660..dec27496ff 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -138,35 +138,6 @@ typedef abi_uint        target_gid_t;
 #endif
 typedef abi_int         target_pid_t;
 
-#ifdef TARGET_ARM
-
-#ifndef TARGET_AARCH64
-/* 32 bit ARM definitions */
-
-#define ELF_ARCH        EM_ARM
-#define ELF_CLASS       ELFCLASS32
-#define EXSTACK_DEFAULT true
-
-#define USE_ELF_CORE_DUMP
-
-#else
-/* 64 bit ARM definitions */
-
-#define ELF_ARCH        EM_AARCH64
-#define ELF_CLASS       ELFCLASS64
-
-#define USE_ELF_CORE_DUMP
-
-#if TARGET_BIG_ENDIAN
-# define VDSO_HEADER  "vdso-be.c.inc"
-#else
-# define VDSO_HEADER  "vdso-le.c.inc"
-#endif
-
-#endif /* not TARGET_AARCH64 */
-
-#endif /* TARGET_ARM */
-
 #ifdef TARGET_SPARC
 
 #ifndef TARGET_SPARC64
-- 
2.43.0

Re: [PATCH 64/89] linux-user: Move elf parameters to {arm, aarch64}/target_elf.h

Posted by Peter Maydell 3 months, 2 weeks ago

On Wed, 30 Jul 2025 at 01:24, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/aarch64/target_elf.h | 10 ++++++++++
>  linux-user/arm/target_elf.h     |  5 +++++
>  linux-user/elfload.c            | 29 -----------------------------
>  3 files changed, 15 insertions(+), 29 deletions(-)
>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM