From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO8LN-000085-F4 for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:37:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RO8LK-00084X-7v for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:37:33 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:59121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO8LK-00084T-1q for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:37:30 -0500 Received: by wyh22 with SMTP id 22so1736297wyh.4 for ; Wed, 09 Nov 2011 05:37:29 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 9 Nov 2011 14:37:23 +0100 Message-Id: <1320845843-2627-2-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1320845843-2627-1-git-send-email-benoit.canet@gmail.com> References: <1320845843-2627-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH] arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= The cpu capabilities passed by the elf loader in AT_HWCAP where a constant. Make AT_HWCAP reflect the emulated cpu features in order to give correct clues to eglibc. Fix : [Bug 887516] [NEW] VFP support reported for the PXA270 Signed-off-by: Benoit Canet --- linux-user/elfload.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a413976..c22ccf4 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -375,10 +375,33 @@ bool guest_validate_base(unsigned long guest_base) return 1; /* All good */ } -#define ELF_HWCAP (ARM_HWCAP_ARM_SWP | ARM_HWCAP_ARM_HALF \ - | ARM_HWCAP_ARM_THUMB | ARM_HWCAP_ARM_FAST_MULT \ - | ARM_HWCAP_ARM_FPA | ARM_HWCAP_ARM_VFP \ - | ARM_HWCAP_ARM_NEON | ARM_HWCAP_ARM_VFPv3 ) + +#define ELF_HWCAP get_elf_hwcap() + +static uint32_t get_elf_hwcap(void) +{ + CPUState *e = thread_env; + uint32_t hwcaps = 0; + + hwcaps |= ARM_HWCAP_ARM_SWP; + hwcaps |= ARM_HWCAP_ARM_HALF; + hwcaps |= ARM_HWCAP_ARM_THUMB; + hwcaps |= ARM_HWCAP_ARM_FAST_MULT; + hwcaps |= ARM_HWCAP_ARM_FPA; + + /* probe for the extra features */ +#define GET_FEATURE(feat, hwcap) \ + do {if (arm_feature(e, feat)) { hwcaps |= hwcap; } } while (0) + GET_FEATURE(ARM_FEATURE_VFP, ARM_HWCAP_ARM_VFP); + GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); + GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); + GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); + GET_FEATURE(ARM_FEATURE_VFP3, ARM_HWCAP_ARM_VFPv3); + GET_FEATURE(ARM_FEATURE_VFP_FP16, ARM_HWCAP_ARM_VFPv3D16); +#undef GET_FEATURE + + return hwcaps; +} #endif -- 1.7.5.4