summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-08-08 14:03:01 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-08-08 20:44:03 +0200
commitf140823c5644807d850d01a3f5b61a0fe5ef53f2 (patch)
treec7e69e16177f5c889af950af4b391e449636dd7e
parent9400601a689a128c25fa9c21e932562e0eeb7a26 (diff)
downloadfocaccia-qemu-f140823c5644807d850d01a3f5b61a0fe5ef53f2.tar.gz
focaccia-qemu-f140823c5644807d850d01a3f5b61a0fe5ef53f2.zip
configure: fix detection for x32 linux-user
x32 uses the same signal handling fragments as x86_64, since host_arch
is set to x86_64 when Meson runs.  Remove the unnecessary forwarder and
set the host_arch variable properly in configure.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Ilya Leoshkevich <iii@linux.ibm.com>
Tested-by: Michael Tokarev <mjt@tls.msk.ru>
Message-ID: <20230808120303.585509-2-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rwxr-xr-xconfigure2
-rw-r--r--linux-user/include/host/x32/host-signal.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 98dc78280e..484d38d81f 100755
--- a/configure
+++ b/configure
@@ -472,6 +472,8 @@ fi
 case "$cpu" in
   riscv*)
     host_arch=riscv ;;
+  x32)
+    host_arch=x86_64 ;;
   *)
     host_arch="$cpu" ;;
 esac
diff --git a/linux-user/include/host/x32/host-signal.h b/linux-user/include/host/x32/host-signal.h
deleted file mode 100644
index 26800591d3..0000000000
--- a/linux-user/include/host/x32/host-signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../x86_64/host-signal.h"