[Gmp-commit] /var/hg/gmp: Further s390 changes.

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/c7f6201ababb
changeset: 14336:c7f6201ababb
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Sat Oct 15 20:32:39 2011 +0200
description:
Further s390 changes.

diffstat:

 configure.in |  48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r f80107f382a3 -r c7f6201ababb configure.in
--- a/configure.in	Sat Oct 15 15:56:03 2011 +0200
+++ b/configure.in	Sat Oct 15 20:32:39 2011 +0200
@@ -291,6 +291,11 @@
 #undef HAVE_HOST_CPU_pentiumpro
 #undef HAVE_HOST_CPU_pentium2
 #undef HAVE_HOST_CPU_pentium3
+#undef HAVE_HOST_CPU_s390_z900
+#undef HAVE_HOST_CPU_s390_z990
+#undef HAVE_HOST_CPU_s390_z9
+#undef HAVE_HOST_CPU_s390_z10
+#undef HAVE_HOST_CPU_s390_z196
 
 /* Define to 1 iff we have a s390 with 64-bit registers.  */
 #undef HAVE_HOST_CPU_s390_zarch])
@@ -1128,15 +1133,40 @@
     case $host_cpu in
       s390)
 	;;
-      z9)
-	path="s390_32/esame/$host_cpu s390_32/esame s390_32"
-	gcc_cflags_arch="-march=z9-109"
-	gcc_32_cflags="$gcc_cflags -mzarch"
+      z900 | z900esa)
+        cpu="z900"
+        gccarch="$cpu"
+	path="s390_32/esame/$cpu s390_32/esame s390_32"
+	gcc_cflags_arch="-march=$gccarch"
+	AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
         ;;
-      *)
-	path="s390_32/esame/$host_cpu s390_32/esame s390_32"
-        gcc_cflags_arch="-march=$host_cpu"
-	gcc_32_cflags="$gcc_cflags -mzarch"
+      z990 | z990esa)
+        cpu="z990"
+        gccarch="$cpu"
+	path="s390_32/esame/$cpu s390_32/esame s390_32"
+	gcc_cflags_arch="-march=$gccarch"
+	AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
+        ;;
+      z9 | z9esa)
+        cpu="z9"
+	gccarch="z9-109"
+	path="s390_32/esame/$cpu s390_32/esame s390_32"
+	gcc_cflags_arch="-march=$gccarch"
+	AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
+        ;;
+      z10 | z10esa)
+        cpu="z10"
+	gccarch="z10"
+	path="s390_32/esame/$cpu s390_32/esame s390_32"
+	gcc_cflags_arch="-march=$gccarch"
+	AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
+        ;;
+      z196 | z196esa)
+        cpu="z196"
+	gccarch="z196"
+	path="s390_32/esame/$cpu s390_32/esame s390_32"
+	gcc_cflags_arch="-march=$gccarch"
+	AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
         ;;
       esac
 
@@ -1146,7 +1176,7 @@
 	cclist_64="gcc"
 	gcc_64_cflags_optlist="arch"
 	gcc_64_cflags="$gcc_cflags -m64"
-	gcc_cflags="$gcc_cflags -m31"
+	gcc_32_cflags="$gcc_cflags -m31"
 	path_64="s390_64/$host_cpu s390_64"
 	extra_functions=""
 	AC_DEFINE(HAVE_HOST_CPU_s390_zarch)