From 69c38ef51f6b816997398d9481eb9c86dc80c37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 28 Mar 2010 12:48:29 +0200
Subject: [PATCH] (asm_path): For x86_64, check if compiler is generating
 32-bit code.

Rev: nettle/ChangeLog:1.67
Rev: nettle/configure.ac:1.15
---
 ChangeLog    |  5 +++++
 configure.ac | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7c5c5899..37e0b628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28  Niels M�ller  <nisse@lysator.liu.se>
+
+	* configure.ac (asm_path): For x86_64, check if compiler is
+	generating 32-bit code.
+
 2010-03-27  Niels M�ller  <nisse@lysator.liu.se>
 
 	* testsuite/hmac-test.c (test_main): Rewrote rest of tests to use
diff --git a/configure.ac b/configure.ac
index a6fe72d0..95a4f948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,15 @@ case "$host_cpu" in
     asm_path=x86
     ;;
   [x86_64 | amd64])
-    asm_path=x86_64
+    AC_TRY_COMPILE([
+#if defined(__i386__)
+#error 32-bit x86
+#endif
+    ], [], [
+      asm_path=x86_64
+    ], [
+      asm_path=x86
+    ])
     ;;
   *sparc*)
     AC_TRY_COMPILE([
-- 
GitLab