Move the aarch32 get_elf_platform to arm/elfload.c; pass in CPUState.
Create a simple version in aarch64/elfload.c, which we must do at the
same time because of the ifdef dependency between TARGET_AARCH64
and TARGET_ARM.
Since all versions of get_elf_platform now have the same
signature, remove the ifdef from the declaration in loader.h.
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
linux-user/aarch64/target_elf.h | 1 +
linux-user/arm/target_elf.h | 1 +
linux-user/loader.h | 2 --
linux-user/aarch64/elfload.c | 5 +++++
linux-user/arm/elfload.c | 29 +++++++++++++++++++++++++
linux-user/elfload.c | 38 ++-------------------------------
6 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_elf.h
index 77108f3cb0..dee79ce0c6 100644
--- a/linux-user/aarch64/target_elf.h
+++ b/linux-user/aarch64/target_elf.h
@@ -10,5 +10,6 @@
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_HWCAP2 1
+#define HAVE_ELF_PLATFORM 1
#endif
diff --git a/linux-user/arm/target_elf.h b/linux-user/arm/target_elf.h
index 90470bd87b..856ca41b16 100644
--- a/linux-user/arm/target_elf.h
+++ b/linux-user/arm/target_elf.h
@@ -10,5 +10,6 @@
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_HWCAP2 1
+#define HAVE_ELF_PLATFORM 1
#endif
diff --git a/linux-user/loader.h b/linux-user/loader.h
index 44bb4cbfd3..440871466c 100644
--- a/linux-user/loader.h
+++ b/linux-user/loader.h
@@ -105,8 +105,6 @@ abi_ulong get_elf_hwcap(CPUState *cs);
abi_ulong get_elf_hwcap2(CPUState *cs);
const char *elf_hwcap_str(uint32_t bit);
const char *elf_hwcap2_str(uint32_t bit);
-#if defined(TARGET_I386)
const char *get_elf_platform(CPUState *cs);
-#endif
#endif /* LINUX_USER_LOADER_H */
diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c
index 92c8ea62c6..1030cb8094 100644
--- a/linux-user/aarch64/elfload.c
+++ b/linux-user/aarch64/elfload.c
@@ -342,3 +342,8 @@ const char *elf_hwcap2_str(uint32_t bit)
return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL;
}
+
+const char *get_elf_platform(CPUState *cs)
+{
+ return TARGET_BIG_ENDIAN ? "aarch64_be" : "aarch64";
+}
diff --git a/linux-user/arm/elfload.c b/linux-user/arm/elfload.c
index c7561b005b..7de1f13f4b 100644
--- a/linux-user/arm/elfload.c
+++ b/linux-user/arm/elfload.c
@@ -170,3 +170,32 @@ const char *elf_hwcap2_str(uint32_t bit)
return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL;
}
+
+const char *get_elf_platform(CPUState *cs)
+{
+ CPUARMState *env = cpu_env(cs);
+
+#if TARGET_BIG_ENDIAN
+# define END "b"
+#else
+# define END "l"
+#endif
+
+ if (arm_feature(env, ARM_FEATURE_V8)) {
+ return "v8" END;
+ } else if (arm_feature(env, ARM_FEATURE_V7)) {
+ if (arm_feature(env, ARM_FEATURE_M)) {
+ return "v7m" END;
+ } else {
+ return "v7" END;
+ }
+ } else if (arm_feature(env, ARM_FEATURE_V6)) {
+ return "v6" END;
+ } else if (arm_feature(env, ARM_FEATURE_V5)) {
+ return "v5" END;
+ } else {
+ return "v4" END;
+ }
+
+#undef END
+}
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index e6e509c0a6..0e41737cf1 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -309,6 +309,8 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs,
const CPUX86State *en
#ifdef TARGET_ARM
+#define ELF_PLATFORM get_elf_platform(thread_cpu)
+
#ifndef TARGET_AARCH64
/* 32 bit ARM definitions */
@@ -434,37 +436,6 @@ static bool init_guest_commpage(void)
return true;
}
-#define ELF_PLATFORM get_elf_platform()
-
-static const char *get_elf_platform(void)
-{
- CPUARMState *env = cpu_env(thread_cpu);
-
-#if TARGET_BIG_ENDIAN
-# define END "b"
-#else
-# define END "l"
-#endif
-
- if (arm_feature(env, ARM_FEATURE_V8)) {
- return "v8" END;
- } else if (arm_feature(env, ARM_FEATURE_V7)) {
- if (arm_feature(env, ARM_FEATURE_M)) {
- return "v7m" END;
- } else {
- return "v7" END;
- }
- } else if (arm_feature(env, ARM_FEATURE_V6)) {
- return "v6" END;
- } else if (arm_feature(env, ARM_FEATURE_V5)) {
- return "v5" END;
- } else {
- return "v4" END;
- }
-
-#undef END
-}
-
#if TARGET_BIG_ENDIAN
#include "elf.h"
#include "vdso-be8.c.inc"
@@ -487,11 +458,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t
elf_flags)
#define ELF_ARCH EM_AARCH64
#define ELF_CLASS ELFCLASS64
-#if TARGET_BIG_ENDIAN
-# define ELF_PLATFORM "aarch64_be"
-#else
-# define ELF_PLATFORM "aarch64"
-#endif
static inline void init_thread(struct target_pt_regs *regs,
struct image_info *infop)
--
2.43.0
