summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjorn Granlund <tg@gmplib.org>2021-11-14 12:45:32 +0100
committerTorbjorn Granlund <tg@gmplib.org>2021-11-14 12:45:32 +0100
commit1a499c7ccd1ad85b4b92b76aa0bed5f572bd148d (patch)
treeaf179cd43c19f13d0fc04c08ff194cab014cdc01
parent928ed2280f77ae1d4c0d5bf88635cf38b29f27f2 (diff)
downloadgmp-1a499c7ccd1ad85b4b92b76aa0bed5f572bd148d.tar.gz
(S390_PATTERN): Rewrite to handle path inheritance.
-rw-r--r--configure.ac32
1 files changed, 13 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index e2903e1ca..c220a9b5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1365,56 +1365,58 @@ case $host in
gcc_cflags="$gcc_cflags $fomit_frame_pointer"
gcc_cflags_optlist="arch"
path="s390_32"
+ path_64="s390_64"
if test "$enable_assembly" = "yes" ; then
extra_functions="udiv_w_sdiv"
fi
gcc_32_cflags_maybe="-m31"
- unset cpu gccarch xpath
+ unset cpu
case $host_cpu in
s390)
;;
z900 | z900esa)
cpu="z900"
- gccarch="$cpu"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
;;
z990 | z990esa)
cpu="z990"
- gccarch="$cpu"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
;;
z9 | z9esa)
cpu="z9"
- gccarch="z9-109"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
;;
z10 | z10esa)
cpu="z10"
- gccarch="z10"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
;;
z196 | z196esa)
cpu="z196"
- gccarch="z196"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
;;
z13 | z13esa)
cpu="z13"
- gccarch="z13"
+ gcc_cflags_arch="-march=$cpu"
extra_functions=""
+ path_64="s390_64/z13 $path_64"
;;
z14 | z14esa)
cpu="z14"
- gccarch="z14"
+ gcc_cflags_arch="-march=$cpu -march=z13"
extra_functions=""
- xpath="z13"
+ path_64="s390_64/z14 s390_64/z13 $path_64"
;;
z15 | z15esa)
cpu="z15"
- gccarch="z15"
+ gcc_cflags_arch="-march=$cpu -march=z14 -march=z13"
extra_functions=""
- xpath="z14 z13"
+ path_64="s390_64/z15 s390_64/z14 s390_64/z13 $path_64"
;;
esac
@@ -1422,14 +1424,6 @@ case $host in
AC_DEFINE_UNQUOTED(HAVE_HOST_CPU_s390_$cpu)
AC_DEFINE(HAVE_HOST_CPU_s390_zarch)
path="s390_32/esame s390_32"
- path_64=""
- for i in $cpu $xpath; do
- path_64="$path_64 s390_64/$i"
- done
- fi
- path_64="$path_64 s390_64"
- if test x"$gccarch" != x ; then
- gcc_cflags_arch="-march=$gccarch"
fi
case $host in