When compiler supports x86-64, use x86-64 in preference to x86.

diff --git a/src/configure.ac b/src/configure.ac
index ae94b020b75f9f1b9845a48cc0fb17e3ca9dc91a..4659b0a67f0bc867efbcb18379fcf186628ed6b5 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -38,6 +38,11 @@ AC_ARG_ENABLE([host-scheme-test],
 : ${enable_host_scheme_test=yes}
 
 AC_CANONICAL_HOST
+case ${host_cpu} in
+i?86)
+    AC_CHECK_DECL([__x86_64__],[host_cpu=x86_64])
+    ;;
+esac
 
 AC_MSG_CHECKING([for native-code support])
 SCM_ARCH=`microcode/choose-arch.sh "${enable_native_code}" "${host_cpu}"`

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index d94e0cb7a29f1666cafc26406afaa3da9f656c7f..c66f4d0fcbee32895bc16b66aac78910f653e5e9 100644 (file)
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -203,6 +203,11 @@ EXE_NAME=
 INSTALL_INCLUDE=
 
 AC_CANONICAL_HOST
+case ${host_cpu} in
+i?86)
+    AC_CHECK_DECL([__x86_64__],[host_cpu=x86_64])
+    ;;
+esac
 
 dnl Save these prior to running AC_PROG_CC.
 SAVED_CFLAGS=${CFLAGS}