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: 18223 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CBE082774D for ; Mon, 1 Jul 2013 17:35:43 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf11sf4235687vcb.6 for ; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=sDvgeA+NW1l9M81t0Y/6DYT5G9VN0yVbZ0OztLHlYHM=; b=FoecPHNSIR6rJJqZTk1jYM0R8Zb9q8YA59gIA0RKKqUvBItW+mBqkGw88hZJHHblpw kork94aECFwvJVi3w0Modahnm5soH9Ty/BascRob4qCnOHjgTtLm+eeAuREVPbD2H4eX pp4XFyZKwdpl49lc4Ck5QrWvmobfoKgpuEkP2M6afhZ40aH8LVvSmtIm/Oa0QS5D618k hM8XzEeQp067KF4DD9YPZ6hdohVqFd/OwjqOn4/jYBAD0MDsDXuT709/CeRp0qG0ZlSR jQ1nQcxmubmtjrl5j9ar4mTIbsODcpAArVqmOt1OKfLyd//zOp2DH2bFIAk7lEjTmPGI pvQQ== X-Received: by 10.236.119.227 with SMTP id n63mr5204078yhh.38.1372700143558; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.107.66 with SMTP id ha2ls2366976qeb.56.gmail; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) X-Received: by 10.220.59.69 with SMTP id k5mr9967844vch.34.1372700143457; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ek9si4977696vdb.141.2013.07.01.10.35.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Jul 2013 10:35:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ht10so2155764vcb.18 for ; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) X-Received: by 10.52.27.172 with SMTP id u12mr8276696vdg.64.1372700143372; Mon, 01 Jul 2013 10:35:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp289820veb; Mon, 1 Jul 2013 10:35:42 -0700 (PDT) X-Received: by 10.152.28.199 with SMTP id d7mr12496322lah.67.1372700134008; Mon, 01 Jul 2013 10:35:34 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id n2si3858592lbs.126.2013.07.01.10.35.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 01 Jul 2013 10:35:33 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; 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 Cc: patches@linaro.org, Alexander Graf , Andreas Schwab , "Mian M. Hamayun" Subject: [PATCH v5 09/21] linux-user: Don't treat AArch64 cpu names specially 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-Gm-Message-State: ALoCoQmuMnyFiK3naqmfHVF3vclcyVNHdnzrIMm8tWggwZ3eSdqXQ/s0sy8H2Gn3swLQsRSolLU8 X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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