* configure.in: Use m/intel386.h for amd64 with x32 ABI.

(Do not merge to trunk.)

Fixes: debbugs:11669

2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c6060f85e3f..db8de760ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-21  Ulrich Mueller  <ulm@gentoo.org>
+
+        * configure.in: Use m/intel386.h for amd64 with x32 ABI.  (Bug#11669)
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
         * Version 24.1 released.
diff --git a/configure.in b/configure.in
index ad9966b81de..f9aef8195c6 100644
--- a/configure.in
+++ b/configure.in
@@ -749,6 +749,7 @@ if test "$machine" = "amdx86-64"; then
     machine=intel386
     machfile="m/${machine}.h"
   fi
+  AC_CHECK_DECL([__ILP32__], [machfile="m/intel386.h"])
 fi
 
 AC_PATH_PROG(INSTALL_INFO, install-info)