[Gmp-commit] /var/hg/gmp: AC_DEFINE and use HAVE_HOST_CPU_s390_zarch.

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/7eac7c685c97
changeset: 14324:7eac7c685c97
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Fri Oct 14 08:40:40 2011 +0200
description:
AC_DEFINE and use HAVE_HOST_CPU_s390_zarch.

diffstat:

 ChangeLog    |  5 +++++
 configure.in |  6 +++++-
 longlong.h   |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r d971eb70312b -r 7eac7c685c97 ChangeLog
--- a/ChangeLog	Thu Oct 13 17:42:21 2011 +0200
+++ b/ChangeLog	Fri Oct 14 08:40:40 2011 +0200
@@ -1,3 +1,8 @@
+2011-10-14  Torbjorn Granlund  <tege at gmplib.org>
+
+	* configure.in: AC_DEFINE HAVE_HOST_CPU_s390_zarch.
+	* longlong.h (s390): Use it.
+
 2011-10-13  Torbjorn Granlund  <tege at gmplib.org>
 
 	* longlong.h (s390): Put back an accidentally deleted #else.
diff -r d971eb70312b -r 7eac7c685c97 configure.in
--- a/configure.in	Thu Oct 13 17:42:21 2011 +0200
+++ b/configure.in	Fri Oct 14 08:40:40 2011 +0200
@@ -290,7 +290,10 @@
 #undef HAVE_HOST_CPU_pentiummmx
 #undef HAVE_HOST_CPU_pentiumpro
 #undef HAVE_HOST_CPU_pentium2
-#undef HAVE_HOST_CPU_pentium3])
+#undef HAVE_HOST_CPU_pentium3
+
+/* Define to 1 iff we have a s390 with 64-bit registers.  */
+#undef HAVE_HOST_CPU_s390_zarch])
 
 
 # Table of compilers, options, and mpn paths.  This code has various related
@@ -1130,6 +1133,7 @@
 	path_32="s390_32/esame s390_32"
 	path_64="s390_64"
 	extra_functions=""
+	AC_DEFINE(HAVE_HOST_CPU_s390_zarch)
 	;;
       esac
     ;;
diff -r d971eb70312b -r 7eac7c685c97 longlong.h
--- a/longlong.h	Thu Oct 13 17:42:21 2011 +0200
+++ b/longlong.h	Fri Oct 14 08:40:40 2011 +0200
@@ -654,7 +654,7 @@
 #endif /* hppa */
 
 #if (defined (__i370__) || defined (__s390__) || defined (__mvs__)) && W_TYPE_SIZE == 32
-#if defined (__zarch__)
+#if defined (__zarch__) || defined (HAVE_HOST_CPU_s390_zarch)
 #define add_ssaaaa(sh, sl, ah, al, bh, bl)				\
   do {									\
 /*  if (__builtin_constant_p (bl))					\