aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-08-09 14:19:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-09-03 19:39:30 +0100
commit603f412b2d8c8cffcd884d02fc6de0203898a879 (patch)
tree1a8d4d8519a345b526b0f6d907914e9eb3f3ca1c
parentbc581876ed8e4c6a47e768c36298e8d2ae3ba7af (diff)
downloadqemu-arm-603f412b2d8c8cffcd884d02fc6de0203898a879.tar.gz
linux-user: Don't treat AArch64 cpu names specially
32-bit ARM has a lot of different names for different types of CPUs it supports. On AArch64, we don't have this, so we really don't want to execute the 32-bit logic. Stub it out for AArch64 linux-user guests. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: John Rigby <john.rigby@linaro.org> Message-id: 1368505980-17151-7-git-send-email-john.rigby@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--linux-user/cpu-uname.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c
index cc713e6553..5db6e89567 100644
--- a/linux-user/cpu-uname.c
+++ b/linux-user/cpu-uname.c
@@ -30,7 +30,8 @@
* return here */
const char *cpu_to_uname_machine(void *cpu_env)
{
-#ifdef TARGET_ARM
+#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+
/* utsname machine name on linux arm is CPU arch name + endianness, e.g.
* armv7l; to get a list of CPU arch names from the linux source, use:
* grep arch_name: -A1 linux/arch/arm/mm/proc-*.S