* [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
@ 2011-11-29 17:18 Peter Maydell
2011-11-29 19:26 ` Andreas Färber
0 siblings, 1 reply; 5+ messages in thread
From: Peter Maydell @ 2011-11-29 17:18 UTC (permalink / raw)
To: qemu-devel; +Cc: patches
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 <peter.maydell@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
2011-11-29 17:18 [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu Peter Maydell
@ 2011-11-29 19:26 ` Andreas Färber
2011-11-29 20:01 ` Peter Maydell
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Färber @ 2011-11-29 19:26 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, patches
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 <peter.maydell@linaro.org>
> ---
> 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 <afaerber@suse.de>
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
2011-11-29 19:26 ` Andreas Färber
@ 2011-11-29 20:01 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2011-11-29 20:01 UTC (permalink / raw)
To: Andreas Färber; +Cc: qemu-devel, patches
On 29 November 2011 19:26, Andreas Färber <afaerber@suse.de> wrote:
> If you place "arm" between "alpha" and "cris" instead (alphabetical
> order except for i386+x86_64),
>
> Reviewed-by: Andreas Färber <afaerber@suse.de>
Doh, good point. Will send v2 tomorrow.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
2011-11-30 9:57 Peter Maydell
@ 2011-12-05 20:24 ` andrzej zaborowski
0 siblings, 0 replies; 5+ messages in thread
From: andrzej zaborowski @ 2011-12-05 20:24 UTC (permalink / raw)
To: Peter Maydell; +Cc: patches, qemu-devel, Andreas Färber
On 30 November 2011 10:57, Peter Maydell <peter.maydell@linaro.org> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu
@ 2011-11-30 9:57 Peter Maydell
2011-12-05 20:24 ` andrzej zaborowski
0 siblings, 1 reply; 5+ messages in thread
From: Peter Maydell @ 2011-11-30 9:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Andreas Färber, patches
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-05 20:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-29 17:18 [Qemu-devel] [PATCH] configure: Drop armv4l/armv4b distinction in $cpu Peter Maydell
2011-11-29 19:26 ` Andreas Färber
2011-11-29 20:01 ` Peter Maydell
2011-11-30 9:57 Peter Maydell
2011-12-05 20:24 ` andrzej zaborowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.