From: Niels Möller <nisse@lysator.liu.se>
Date: Thu, 24 Nov 2011 14:09:30 +0000 (+0100)
Subject: * configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
X-Git-Tag: converted-master-branch-to-git~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788ba4abcd9aec546b0f351bedb7109e9078ee95;p=thirdparty%2Fnettle.git

* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
on w64.

Rev: nettle/ChangeLog:1.237
Rev: nettle/configure.ac:1.51
---

diff --git a/ChangeLog b/ChangeLog
index dfb8c824..7309b7ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-24  Niels Möller  <nisse@lysator.liu.se>
 
+	* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
+	on w64.
+
 	* serpent-internal.h (ROL64): Use (uint64_t) 1 rather than 1L, for
 	systems. Needed for M$ w64.
 	(RSHIFT64): Likewise. Also added a missing parenthesis.
diff --git a/configure.ac b/configure.ac
index 3849947c..3b2a3e6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -579,7 +579,7 @@ if test x$enable_openssl = xyes ; then
 fi
 
 AH_TEMPLATE([WITH_OPENSSL],
-	    [Define if you have openssl's libcrypto (used for benchmarking)])
+	    [Define if you have openssl's libcrypto (used for benchmarking)]) dnl'
 
 if test x$enable_openssl = xyes ; then
   AC_DEFINE(WITH_OPENSSL)
@@ -587,10 +587,13 @@ fi
 
 AC_SUBST(OPENSSL_LIBFLAGS)
 
-# Choose strategy for Camellia round
 AH_BOTTOM(
-[/* Needs include of <limits.h> before use. */
-#define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
+[#if defined(__x86_64__) || defined(__arch64__)
+# define HAVE_NATIVE_64_BIT 1
+#else
+/* Needs include of <limits.h> before use. */
+# define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
+#endif
 ])
 
 # clock_gettime is in librt on *-*-osf5.1 and on glibc, so add -lrt to