diff options
| author | Richard Henderson | 2022-06-03 23:38:01 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2022-06-21 20:15:39 +0200 |
| commit | 9263ba847352c2ec2fc37ad7f7d0558332bd077f (patch) | |
| tree | 5fd0bc4e7b7b5753b303490a26838200cd91a150 /linux-user | |
| parent | Merge tag 'bsd-user-syscall-2022q2-pull-request' of ssh://github.com/qemu-bsd... (diff) | |
| download | qemu-9263ba847352c2ec2fc37ad7f7d0558332bd077f.tar.gz qemu-9263ba847352c2ec2fc37ad7f7d0558332bd077f.tar.xz qemu-9263ba847352c2ec2fc37ad7f7d0558332bd077f.zip | |
linux-user/x86_64: Fix ELF_PLATFORM
We had been using the i686 platform string for x86_64.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1041
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220603213801.64738-1-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/elfload.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index f7eae357f4..163fc8a1ee 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -130,19 +130,6 @@ typedef abi_int target_pid_t; #ifdef TARGET_I386 -#define ELF_PLATFORM get_elf_platform() - -static const char *get_elf_platform(void) -{ - static char elf_platform[] = "i386"; - int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL); - if (family > 6) - family = 6; - if (family >= 3) - elf_platform[1] = '0' + family; - return elf_platform; -} - #define ELF_HWCAP get_elf_hwcap() static uint32_t get_elf_hwcap(void) @@ -158,6 +145,8 @@ static uint32_t get_elf_hwcap(void) #define ELF_CLASS ELFCLASS64 #define ELF_ARCH EM_X86_64 +#define ELF_PLATFORM "x86_64" + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { regs->rax = 0; @@ -221,6 +210,21 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *en #define ELF_CLASS ELFCLASS32 #define ELF_ARCH EM_386 +#define ELF_PLATFORM get_elf_platform() + +static const char *get_elf_platform(void) +{ + static char elf_platform[] = "i386"; + int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL); + if (family > 6) { + family = 6; + } + if (family >= 3) { + elf_platform[1] = '0' + family; + } + return elf_platform; +} + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { |