From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 13 Dec 2009 05:43:41 +0000 (-0800)
Subject: When compiler supports x86-64, use x86-64 in preference to x86.
X-Git-Tag: 20100708-Gtk~214
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0ba5bc804330d4fb794a1c70477aa13aacccb975;p=mit-scheme.git

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

diff --git a/src/configure.ac b/src/configure.ac
index ae94b020b..4659b0a67 100644
--- 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 d94e0cb7a..c66f4d0fc 100644
--- 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}