diff --git a/configure b/configure
index ed1e5a4e8187..8ec8a9f111b5 100755
--- a/configure
+++ b/configure
@@ -3397,6 +3397,10 @@ case "${target}" in
 esac
 
 cpu_type=`echo ${host} | sed 's/-.*$//'`
+# Special case cpu_type for x86_64 as it shares AUTO_PROFILE from i386.
+if test "${cpu_type}" = "x86_64" ; then
+  cpu_type="i386"
+fi
 
 
 # Disable libssp for some systems.
diff --git a/configure.ac b/configure.ac
index 33c130f4e02a..5fa101f77fd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -622,6 +622,10 @@ case "${target}" in
 esac
 
 cpu_type=`echo ${host} | sed 's/-.*$//'`
+# Special case cpu_type for x86_64 as it shares AUTO_PROFILE from i386.
+if test "${cpu_type}" = "x86_64" ; then
+  cpu_type="i386"
+fi
 AC_SUBST(cpu_type)
 
 # Disable libssp for some systems.