Use target_big_endian() for the platform name, uname machine,
/proc/cpuinfo suffix and vDSO selection. Give the generated
vDSOs distinct symbols so both can be included.

Preserve the behavior of the existing fixed-endian targets.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
 linux-user/aarch64/target_elf.h     |  6 +-----
 linux-user/aarch64/target_syscall.h |  6 +-----
 linux-user/arm/target_proc.h        |  2 +-
 linux-user/aarch64/elfload.c        | 10 +++++++++-
 linux-user/aarch64/meson.build      | 10 ++++------
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_elf.h
index 4cdeb64b0d4e..ebd23cfbceda 100644
--- a/linux-user/aarch64/target_elf.h
+++ b/linux-user/aarch64/target_elf.h
@@ -27,10 +27,6 @@ typedef struct target_elf_gregset_t {
     struct target_user_pt_regs pt;
 } target_elf_gregset_t;
 
-#if TARGET_BIG_ENDIAN
-# define VDSO_HEADER            "vdso-be.c.inc"
-#else
-# define VDSO_HEADER            "vdso-le.c.inc"
-#endif
+#define HAVE_VDSO_IMAGE_INFO    1
 
 #endif
diff --git a/linux-user/aarch64/target_syscall.h 
b/linux-user/aarch64/target_syscall.h
index bd05f6c7fe5d..f3c570a5b2eb 100644
--- a/linux-user/aarch64/target_syscall.h
+++ b/linux-user/aarch64/target_syscall.h
@@ -1,11 +1,7 @@
 #ifndef AARCH64_TARGET_SYSCALL_H
 #define AARCH64_TARGET_SYSCALL_H
 
-#if TARGET_BIG_ENDIAN
-#define UNAME_MACHINE "aarch64_be"
-#else
-#define UNAME_MACHINE "aarch64"
-#endif
+#define UNAME_MACHINE (target_big_endian() ? "aarch64_be" : "aarch64")
 #define UNAME_MINIMUM_RELEASE "3.8.0"
 #define TARGET_CLONE_BACKWARDS
 #define TARGET_MCL_CURRENT 1
diff --git a/linux-user/arm/target_proc.h b/linux-user/arm/target_proc.h
index 13c33d44d5ed..d3186ca655cf 100644
--- a/linux-user/arm/target_proc.h
+++ b/linux-user/arm/target_proc.h
@@ -25,7 +25,7 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 #endif
 
     arch = 8;
-    elf_name = "v8" END_SUFFIX;
+    elf_name = target_big_endian() ? "v8b" : "v8l";
     midr_rev = FIELD_EX32(midr, MIDR_EL1, REVISION);
     midr_part = FIELD_EX32(midr, MIDR_EL1, PARTNUM);
     midr_var = FIELD_EX32(midr, MIDR_EL1, VARIANT);
diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c
index f87f22f6903a..8e75da826e62 100644
--- a/linux-user/aarch64/elfload.c
+++ b/linux-user/aarch64/elfload.c
@@ -379,7 +379,15 @@ const char *elf_hwcap2_str(uint32_t bit)
 
 const char *get_elf_platform(CPUState *cs)
 {
-    return TARGET_BIG_ENDIAN ? "aarch64_be" : "aarch64";
+    return target_big_endian() ? "aarch64_be" : "aarch64";
+}
+
+#include "vdso-be.c.inc"
+#include "vdso-le.c.inc"
+
+const VdsoImageInfo *get_vdso_image_info(uint32_t elf_flags)
+{
+    return target_big_endian() ? &vdso_be_image_info : &vdso_le_image_info;
 }
 
 bool arch_parse_elf_property(uint32_t pr_type, uint32_t pr_datasz,
diff --git a/linux-user/aarch64/meson.build b/linux-user/aarch64/meson.build
index f25a67a21ef6..a5f9a47a9a27 100644
--- a/linux-user/aarch64/meson.build
+++ b/linux-user/aarch64/meson.build
@@ -1,12 +1,10 @@
-# TARGET_BIG_ENDIAN is defined to 'n' for little-endian; which means it
-# is always true as far as source_set.apply() is concerned.  Always build
-# both header files and include the right one via #if.
-
 vdso_be_inc = gen_vdso.process('vdso-be.so',
-                               extra_args: ['-r', '__kernel_rt_sigreturn'])
+                               extra_args: ['-r', '__kernel_rt_sigreturn',
+                                            '-p', 'vdso_be'])
 
 vdso_le_inc = gen_vdso.process('vdso-le.so',
-                               extra_args: ['-r', '__kernel_rt_sigreturn'])
+                               extra_args: ['-r', '__kernel_rt_sigreturn',
+                                            '-p', 'vdso_le'])
 
 linux_user_ss.add(when: 'TARGET_AARCH64', if_true: [vdso_be_inc, vdso_le_inc])
 
-- 
2.55.0

Reply via email to