summaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-02 14:45:12 +0100
committerRiku Voipio <riku.voipio@linaro.org>2014-05-02 21:59:36 +0300
commit43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e (patch)
treeb5d3a03f97694500690fc5c2dfbe0e64ffd217a0 /linux-user
parente586822a58b6609edb5ea929e8a4aa394d32389f (diff)
downloadqemu-43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e.tar.gz
qemu-43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e.tar.bz2
qemu-43ce393ee5f7b96d2ac22fedc40d6b6fb3f65a3e.zip
linux-user/elfload.c: Fix incorrect ARM HWCAP bits
The ELF HWCAP bits for ARM features THUMBEE, NEON, VFPv3 and VFPv3D16 are all off by one compared to the kernel definitions. Fix this discrepancy and add in the missing CRUNCH bit which was the cause of the off-by-one error. (We don't emulate any of the CPUs which have that weird hardware, so it's otherwise uninteresting to us.) Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/elfload.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index ecf6f350e3..18ea1b34a1 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -346,10 +346,11 @@ enum
ARM_HWCAP_ARM_EDSP = 1 << 7,
ARM_HWCAP_ARM_JAVA = 1 << 8,
ARM_HWCAP_ARM_IWMMXT = 1 << 9,
- ARM_HWCAP_ARM_THUMBEE = 1 << 10,
- ARM_HWCAP_ARM_NEON = 1 << 11,
- ARM_HWCAP_ARM_VFPv3 = 1 << 12,
- ARM_HWCAP_ARM_VFPv3D16 = 1 << 13,
+ ARM_HWCAP_ARM_CRUNCH = 1 << 10,
+ ARM_HWCAP_ARM_THUMBEE = 1 << 11,
+ ARM_HWCAP_ARM_NEON = 1 << 12,
+ ARM_HWCAP_ARM_VFPv3 = 1 << 13,
+ ARM_HWCAP_ARM_VFPv3D16 = 1 << 14,
};
#ifndef TARGET_AARCH64