aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-11-09 09:36:10 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-12-18 10:57:36 +0100
commit4da270be1c4ac32c0e60a364e3173b57b1f79dba (patch)
treeea54292d0d4c72b2e738bbe8193cc9d9ee905328 /configure
parentd8ff892dc23e9921db49d2053036240675bb50f8 (diff)
configure: unify x86_64 and x32
The only difference between the two, as far as either configure or Meson are concerned, is in the multilib flags passed to the compiler. For QEMU, this fixes the handling of TYPE_OLDDEVT in include/exec/user/thunk.h and enables testing of dirty ring buffer, because both are using HOST_X86_64. For tests/tcg, this means that on a hypothetical x32 host the cross compiler will not be used to build the tests. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure b/configure
index 85caf2e9ef..108b7621e2 100755
--- a/configure
+++ b/configure
@@ -647,6 +647,7 @@ case "$cpu" in
cpu="i386"
CPU_CFLAGS="-m32" ;;
x32)
+ cpu="x86_64"
CPU_CFLAGS="-mx32" ;;
x86_64|amd64)
cpu="x86_64"
@@ -3719,7 +3720,7 @@ fi
if test "$linux" = "yes" ; then
mkdir -p linux-headers
case "$cpu" in
- i386|x86_64|x32)
+ i386|x86_64)
linux_arch=x86
;;
ppc|ppc64)
@@ -3901,9 +3902,6 @@ if test "$skip_meson" = no; then
i386)
echo "cpu_family = 'x86'" >> $cross
;;
- x86_64|x32)
- echo "cpu_family = 'x86_64'" >> $cross
- ;;
*)
echo "cpu_family = '$ARCH'" >> $cross
;;