Message ID | 1362535280-5068-7-git-send-email-agraf@suse.de |
---|---|
State | New |
Headers | show |
diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index 59cd647..50231c1 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_ARM64) + /* 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
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> --- linux-user/cpu-uname.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)