From patchwork Mon Jul 1 17:35:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 256180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA4EF2C0089 for ; Tue, 2 Jul 2013 03:36:21 +1000 (EST) Received: from localhost ([::1]:48805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uti1T-00040x-6e for incoming@patchwork.ozlabs.org; Mon, 01 Jul 2013 13:36:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uti0p-0003yO-FO for qemu-devel@nongnu.org; Mon, 01 Jul 2013 13:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uti0h-0002yr-Lu for qemu-devel@nongnu.org; Mon, 01 Jul 2013 13:35:39 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:32885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uti0h-0002vc-El for qemu-devel@nongnu.org; Mon, 01 Jul 2013 13:35:31 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Uti0Y-0002Km-4P; Mon, 01 Jul 2013 18:35:22 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 1 Jul 2013 18:35:08 +0100 Message-Id: <1372700120-8896-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372700120-8896-1-git-send-email-peter.maydell@linaro.org> References: <1372700120-8896-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Cc: Andreas Schwab , Alexander Graf , "Mian M. Hamayun" , patches@linaro.org Subject: [Qemu-devel] [PATCH v5 09/21] linux-user: Don't treat AArch64 cpu names specially X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Message-id: 1368505980-17151-7-git-send-email-john.rigby@linaro.org Signed-off-by: Peter Maydell --- 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