From: Laurent Vivier <laurent@vivier.eu>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH] linux-user/x86_64: Fix ELF_PLATFORM
Date: Tue, 21 Jun 2022 20:16:15 +0200 [thread overview]
Message-ID: <61c5e6b6-2893-45b5-63b6-45dbe40f1944@vivier.eu> (raw)
In-Reply-To: <20220603213801.64738-1-richard.henderson@linaro.org>
Le 03/06/2022 à 23:38, Richard Henderson a écrit :
> 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>
> ---
> linux-user/elfload.c | 30 +++++++++++++++++-------------
> 1 file 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)
> {
Applied to my linux-user-for-7.1 branch.
Thanks,
Laurent
prev parent reply other threads:[~2022-06-21 18:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 21:38 [PATCH] linux-user/x86_64: Fix ELF_PLATFORM Richard Henderson
2022-06-04 10:43 ` Philippe Mathieu-Daudé via
2022-06-04 14:09 ` Laurent Vivier
2022-06-21 18:16 ` Laurent Vivier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=61c5e6b6-2893-45b5-63b6-45dbe40f1944@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.