From 0ba5bc804330d4fb794a1c70477aa13aacccb975 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 12 Dec 2009 21:43:41 -0800
Subject: [PATCH] When compiler supports x86-64, use x86-64 in preference to
 x86.

---
 src/configure.ac           | 5 +++++
 src/microcode/configure.ac | 5 +++++
 2 files changed, 10 insertions(+)

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}
-- 
2.25.1