From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVh3Q-0005or-GU for qemu-devel@nongnu.org; Wed, 30 Nov 2011 05:06:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVgvJ-0002xJ-4e for qemu-devel@nongnu.org; Wed, 30 Nov 2011 04:58:18 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVgvH-0002wO-Ik for qemu-devel@nongnu.org; Wed, 30 Nov 2011 04:57:52 -0500 From: Peter Maydell Date: Wed, 30 Nov 2011 09:57:48 +0000 Message-Id: <1322647068-13611-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org 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. Reviewed-by: Andreas Färber Signed-off-by: Peter Maydell --- v1->v2: put 'arm' in the right alpha order in a case statement; so I've added Andreas' conditional reviewed-by accordingly. configure | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/configure b/configure index ac4840d..5fbd812 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|arm|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64|unicore32) ARCH=$cpu ;; - armv4b|armv4l) - ARCH=arm - ;; *) if test "$tcg_interpreter" = "yes" ; then echo "Unsupported CPU = $cpu, will use TCG with TCI (experimental)" -- 1.7.1