From: Marc-André Lureau <marcandre.lur...@redhat.com>
Rust does not have i386 targets, so distinguish when target cpu is i686.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
configure | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 8adf2127c3..48ff2837d9 100755
--- a/configure
+++ b/configure
@@ -617,6 +617,8 @@ esac
if test ! -z "$cpu" ; then
# command line argument
:
+elif check_define __i686__ ; then
+ cpu="i686"
elif check_define __i386__ ; then
cpu="i386"
elif check_define __x86_64__ ; then
@@ -672,9 +674,12 @@ case "$cpu" in
ppc64le)
ARCH="ppc64"
;;
- i386|i486|i586|i686|i86pc|BePC)
+ i386|i486|i586|i86pc|BePC)
cpu="i386"
;;
+ i686)
+ ARCH="i386"
+ ;;
x86_64|amd64)
cpu="x86_64"
;;
@@ -1673,7 +1678,7 @@ case "$cpu" in
CPU_CFLAGS="-m64"
QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS"
;;
- i386)
+ i386|i686)
CPU_CFLAGS="-m32"
QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS"
;;
@@ -4396,7 +4401,7 @@ QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config
--variable=prefix glib-2.0)/bin"
# Mac OS X ships with a broken assembler
roms=
-if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
+if { test "$cpu" = "i386" || test "$cpu" = "i686" || test "$cpu" = "x86_64"; }
&& \
test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \
test "$targetos" != "Haiku" && test "$softmmu" = yes ; then
# Different host OS linkers have different ideas about the name of the ELF
@@ -4962,7 +4967,7 @@ fi
if test "$linux" = "yes" ; then
mkdir -p linux-headers
case "$cpu" in
- i386|x86_64|x32)
+ i386|i686|x86_64|x32)
linux_arch=x86
;;
ppc|ppc64|ppc64le)
--
2.33.0.113.g6c40894d24
