aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-05-13 22:32:54 -0600
committerPeter Maydell <peter.maydell@linaro.org>2013-05-20 19:13:22 +0100
commit0f9741adf5909b2c1a874fe3f7ffdccb8f759756 (patch)
tree5a46d1d681e7e51952a23fe8d23e6096943bcd97
parent575ffffcbf6763fc09e844fb5930b0b8e2d63b94 (diff)
downloadqemu-arm-0f9741adf5909b2c1a874fe3f7ffdccb8f759756.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
-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 59cd6477d5..89bdb91f12 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