From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVTLJ-0002XQ-Af for qemu-devel@nongnu.org; Tue, 29 Nov 2011 14:27:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVTLD-0005eG-Dy for qemu-devel@nongnu.org; Tue, 29 Nov 2011 14:27:49 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58101 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVTLD-0005c4-0m for qemu-devel@nongnu.org; Tue, 29 Nov 2011 14:27:43 -0500 Message-ID: <4ED531FF.50601@suse.de> Date: Tue, 29 Nov 2011 20:26:55 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1322587098-12028-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1322587098-12028-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, patches@linaro.org Am 29.11.2011 18:18, schrieb Peter Maydell: > 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. >=20 > Signed-off-by: Peter Maydell > --- > A minor cleanup because I got fed up with saying "armv4b or armv4l". Nice! Reading "armv4l" on armv7l was pretty confusing at first. > configure | 26 ++++++++++++-------------- > 1 files changed, 12 insertions(+), 14 deletions(-) >=20 > 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=3D"s390" > fi > -elif check_define __ARMEB__ ; then > - cpu=3D"armv4b" > -elif check_define __ARMEL__ ; then > - cpu=3D"armv4l" > +elif check_define __arm__ ; then > + cpu=3D"arm" > elif check_define __hppa__ ; then > cpu=3D"hppa" > else > @@ -307,11 +305,8 @@ case "$cpu" in > x86_64|amd64) > cpu=3D"x86_64" > ;; > - armv*b) > - cpu=3D"armv4b" > - ;; > - armv*l) > - cpu=3D"armv4l" > + armv*b|armv*l|arm) > + cpu=3D"arm" > ;; > hppa|parisc|parisc64) > cpu=3D"hppa" > @@ -1243,7 +1238,13 @@ else > =20 > # 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=3Dyes > + fi > + ;; > + hppa|m68k|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64) > bigendian=3Dyes > ;; > esac > @@ -2871,12 +2872,9 @@ echo "docdir=3D$docdir" >> $config_host_mak > echo "confdir=3D$confdir" >> $config_host_mak > =20 > case "$cpu" in > - i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|pp= c|ppc64|s390|s390x|sparc|sparc64|unicore32) > + i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|pp= c|ppc64|s390|s390x|sparc|sparc64|unicore32|arm) If you place "arm" between "alpha" and "cris" instead (alphabetical order except for i386+x86_64), Reviewed-by: Andreas F=E4rber Andreas > ARCH=3D$cpu > ;; > - armv4b|armv4l) > - ARCH=3Darm > - ;; > *) > if test "$tcg_interpreter" =3D "yes" ; then > echo "Unsupported CPU =3D $cpu, will use TCG with TCI (experim= ental)" --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg