From patchwork Tue Nov 29 17:18:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5384 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 61EDA23E0E for ; Tue, 29 Nov 2011 17:18:24 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3FE1EA180D2 for ; Tue, 29 Nov 2011 17:18:24 +0000 (UTC) Received: by laah2 with SMTP id h2so1450197laa.11 for ; Tue, 29 Nov 2011 09:18:23 -0800 (PST) Received: by 10.152.144.136 with SMTP id sm8mr32182517lab.33.1322587103907; Tue, 29 Nov 2011 09:18:23 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs12151lal; Tue, 29 Nov 2011 09:18:23 -0800 (PST) Received: by 10.14.4.129 with SMTP id 1mr2823755eej.228.1322587101550; Tue, 29 Nov 2011 09:18:21 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id a59si8869632eeb.22.2011.11.29.09.18.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 09:18:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RVRJy-00038R-Uf; Tue, 29 Nov 2011 17:18:18 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] configure: Drop armv4l/armv4b distinction in $cpu Date: Tue, 29 Nov 2011 17:18:18 +0000 Message-Id: <1322587098-12028-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Drop the distinction between armv4l/armv4b in the $cpu variable (ie host cpu type) in favour of calling everything 'arm'. This makes it the same as the ARCH setting and removes some special casing. The only thing we were using the distinction for was to decide which endianness to use in cross compilation; do a cpp define check there instead. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber --- A minor cleanup because I got fed up with saying "armv4b or armv4l". configure | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/configure b/configure index ac4840d..018bf23 100755 --- a/configure +++ b/configure @@ -287,10 +287,8 @@ elif check_define __s390__ ; then else cpu="s390" fi -elif check_define __ARMEB__ ; then - cpu="armv4b" -elif check_define __ARMEL__ ; then - cpu="armv4l" +elif check_define __arm__ ; then + cpu="arm" elif check_define __hppa__ ; then cpu="hppa" else @@ -307,11 +305,8 @@ case "$cpu" in x86_64|amd64) cpu="x86_64" ;; - armv*b) - cpu="armv4b" - ;; - armv*l) - cpu="armv4l" + armv*b|armv*l|arm) + cpu="arm" ;; hppa|parisc|parisc64) cpu="hppa" @@ -1243,7 +1238,13 @@ else # if cross compiling, cannot launch a program, so make a static guess case "$cpu" in - armv4b|hppa|m68k|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64) + arm) + # ARM can be either way; ask the compiler which one we are + if check_define __ARMEB__; then + bigendian=yes + fi + ;; + hppa|m68k|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64) bigendian=yes ;; esac @@ -2871,12 +2872,9 @@ echo "docdir=$docdir" >> $config_host_mak echo "confdir=$confdir" >> $config_host_mak case "$cpu" in - i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64|unicore32) + i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64|unicore32|arm) ARCH=$cpu ;; - armv4b|armv4l) - ARCH=arm - ;; *) if test "$tcg_interpreter" = "yes" ; then echo "Unsupported CPU = $cpu, will use TCG with TCI (experimental)"