From: Alexander Graf Date: Tue, 3 Sep 2013 19:12:12 +0000 (+0100) Subject: linux-user: Don't treat AArch64 cpu names specially X-Git-Tag: v1.7.0-rc0~125^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=067d983127da5c05a365230b12f2f557ec721c97;p=thirdparty%2Fqemu.git 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 Signed-off-by: John Rigby Signed-off-by: Peter Maydell Message-id: 1378235544-22290-13-git-send-email-peter.maydell@linaro.org Message-id: 1368505980-17151-7-git-send-email-john.rigby@linaro.org Signed-off-by: Peter Maydell --- diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index cc713e6553a..5db6e89567e 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