Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
On 30 November 2011 10:57, Peter Maydell wrote: > 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. Thanks, applied this patch. Cheers
[Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
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
Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
On 29 November 2011 19:26, Andreas Färber wrote: > If you place "arm" between "alpha" and "cris" instead (alphabetical > order except for i386+x86_64), > > Reviewed-by: Andreas Färber Doh, good point. Will send v2 tomorrow. -- PMM
Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
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. > > 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(-) > > 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) If you place "arm" between "alpha" and "cris" instead (alphabetical order except for i386+x86_64), Reviewed-by: Andreas Färber Andreas > ARCH=$cpu >;; > - armv4b|armv4l) > -ARCH=arm > - ;; >*) > if test "$tcg_interpreter" = "yes" ; then > echo "Unsupported CPU = $cpu, will use TCG with TCI (experimental)" -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
[Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
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 --- 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)" -- 1.7.1
