diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-11-30 10:57:48 +0100 |
|---|---|---|
| committer | Andrzej Zaborowski <balrog@zabor.org> | 2011-12-05 21:38:53 +0100 |
| commit | 21d89f841a8ff547cfe7ba97952fe4d5054b0421 (patch) | |
| tree | 42c3a83e59642ba87ec0608eac04ac311f4d0590 | |
| parent | 81584fd50deb3c324cafc854a946dbb6b83c2fc6 (diff) | |
| download | focaccia-qemu-21d89f841a8ff547cfe7ba97952fe4d5054b0421.tar.gz focaccia-qemu-21d89f841a8ff547cfe7ba97952fe4d5054b0421.zip | |
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 <afaerber@suse.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
| -rwxr-xr-x | configure | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/configure b/configure index ac4840d45b..5fbd81285f 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)" |