mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Drop armv4l/armv4b distinction in $cpu

Browse Source 
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>
This commit is contained in:
Peter Maydell 2011-11-30 10:57:48 +01:00 committed by Andrzej Zaborowski
parent 81584fd50d
commit 21d89f841a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -287,10 +287,8 @@ elif check_define __s390__ ; then
else else
cpu="s390" cpu="s390"
fi fi
elif check_define __ARMEB__ ; then elif check_define __arm__ ; then
cpu="armv4b" cpu="arm"
elif check_define __ARMEL__ ; then
cpu="armv4l"
elif check_define __hppa__ ; then elif check_define __hppa__ ; then
cpu="hppa" cpu="hppa"
else else
@ -307,11 +305,8 @@ case "$cpu" in
x86_64|amd64) x86_64|amd64)
cpu="x86_64" cpu="x86_64"
;; ;;
armv*b) armv*b|armv*l|arm)
cpu="armv4b" cpu="arm"
;;
armv*l)
cpu="armv4l"
;; ;;
hppa|parisc|parisc64) hppa|parisc|parisc64)
cpu="hppa" cpu="hppa"
@ -1243,7 +1238,13 @@ else
# if cross compiling, cannot launch a program, so make a static guess # if cross compiling, cannot launch a program, so make a static guess
case "$cpu" in 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 bigendian=yes
;; ;;
esac esac
@ -2871,12 +2872,9 @@ echo "docdir=$docdir" >> $config_host_mak
echo "confdir=$confdir" >> $config_host_mak echo "confdir=$confdir" >> $config_host_mak
case "$cpu" in 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 ARCH=$cpu
;; ;;
armv4b|armv4l)
ARCH=arm
;;
*) *)
if test "$tcg_interpreter" = "yes" ; then if test "$tcg_interpreter" = "yes" ; then
echo "Unsupported CPU = $cpu, will use TCG with TCI (experimental)" echo "Unsupported CPU = $cpu, will use TCG with TCI (experimental)"