aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-03-06 03:01:14 +0100
committerJohn Rigby <john.rigby@linaro.org>2013-05-13 22:21:24 -0600
commit5135f7edbc3e13fb4130e0232c7aea0beb8f519b (patch)
tree36e12d01b594ba49fbb0ccf497102619896a5c1d
parent13549f5d528daaaf7b3b342a32beefb688e8bb30 (diff)
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>
-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 59cd6477d..89bdb91f1 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