From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc6vo-0007Sj-Ba for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc6vl-0008N5-RE for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:44 -0400 Received: from mail-pb0-x233.google.com ([2607:f8b0:400e:c01::233]:47107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc6vl-0008N0-LN for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:41 -0400 Received: by mail-pb0-f51.google.com with SMTP id wy7so80014pbc.10 for ; Mon, 13 May 2013 21:33:40 -0700 (PDT) From: John Rigby Date: Mon, 13 May 2013 22:32:54 -0600 Message-Id: <1368505980-17151-7-git-send-email-john.rigby@linaro.org> In-Reply-To: <1368505980-17151-1-git-send-email-john.rigby@linaro.org> References: <1368505980-17151-1-git-send-email-john.rigby@linaro.org> Subject: [Qemu-devel] [PATCH v4 06/12] linux-user: Don't treat aarch64 cpu names specially List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 'Peter Maydell , John Rigby , Riku Voipio , 'Alexander Graf From: Alexander Graf 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 --- linux-user/cpu-uname.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index 59cd647..89bdb91 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 -- 1.8.2.2