fa3bfd
From 63be4dc8f5be08f40df927377bdf0bae5239ce53 Mon Sep 17 00:00:00 2001
fa3bfd
From: Stefan Liebler <stli@linux.vnet.ibm.com>
fa3bfd
Date: Thu, 27 Jul 2017 10:53:58 +0200
fa3bfd
Subject: [PATCH 01/10] S390: Configure checks
fa3bfd
 HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT.
fa3bfd
fa3bfd
This configure check was added upstream with commit
fa3bfd
e9b424881a4f85284e56d8b561c54ff57a7c1c9b
fa3bfd
"S390: Do not set FE_INEXACT with feraiseexcept (FE_OWERFLOW|FE_UNDERFLOW)."
fa3bfd
fa3bfd
HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT will be defined if gcc/assembler
fa3bfd
can handle zarch z196 instructions by default.
fa3bfd
Thus it is defined on s390x-glibc on RHEL 7, but not for s390-glibc.
fa3bfd
fa3bfd
ChangeLog:
fa3bfd
fa3bfd
	* config.h.in (HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT):
fa3bfd
	New undefine.
fa3bfd
	* sysdeps/s390/configure.ac: Add test for z196 zarch support.
fa3bfd
	* sysdeps/s390/configure: Regenerated.
fa3bfd
---
fa3bfd
 config.h.in               |  3 +++
fa3bfd
 sysdeps/s390/configure    | 36 ++++++++++++++++++++++++++++++++++++
fa3bfd
 sysdeps/s390/configure.in | 26 ++++++++++++++++++++++++++
fa3bfd
 3 files changed, 65 insertions(+)
fa3bfd
fa3bfd
diff --git a/config.h.in b/config.h.in
fa3bfd
index 66ac85a..07bc713 100644
fa3bfd
--- a/config.h.in
fa3bfd
+++ b/config.h.in
fa3bfd
@@ -110,6 +110,9 @@
fa3bfd
 /* Define if assembler supports Intel MPX.  */
fa3bfd
 #undef  HAVE_MPX_SUPPORT
fa3bfd
 
fa3bfd
+/* Define if assembler supports z196 zarch instructions as default on S390.  */
fa3bfd
+#undef  HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
fa3bfd
+
fa3bfd
 /* Define if assembler supports vector instructions on S390.  */
fa3bfd
 #undef  HAVE_S390_VX_ASM_SUPPORT
fa3bfd
 
fa3bfd
diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure
fa3bfd
index eb49a4c..bb670f3 100644
fa3bfd
--- a/sysdeps/s390/configure
fa3bfd
+++ b/sysdeps/s390/configure
fa3bfd
@@ -75,3 +75,39 @@ then
fa3bfd
   $as_echo "#define HAVE_S390_VX_GCC_SUPPORT 1" >>confdefs.h
fa3bfd
 
fa3bfd
 fi
fa3bfd
+
fa3bfd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for S390 z196 zarch instruction support as default" >&5
fa3bfd
+$as_echo_n "checking for S390 z196 zarch instruction support as default... " >&6; }
fa3bfd
+if ${libc_cv_asm_s390_min_z196_zarch+:} false; then :
fa3bfd
+  $as_echo_n "(cached) " >&6
fa3bfd
+else
fa3bfd
+  cat > conftest.c <<\EOF
fa3bfd
+float testinsn (double e)
fa3bfd
+{
fa3bfd
+    float d;
fa3bfd
+    __asm__ ("ledbra %0,5,%1,4" : "=f" (d) : "f" (e) );
fa3bfd
+    return d;
fa3bfd
+}
fa3bfd
+EOF
fa3bfd
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
fa3bfd
+			-o conftest.o &> /dev/null'
fa3bfd
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
fa3bfd
+  (eval $ac_try) 2>&5
fa3bfd
+  ac_status=$?
fa3bfd
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
fa3bfd
+  test $ac_status = 0; }; } ;
fa3bfd
+then
fa3bfd
+  libc_cv_asm_s390_min_z196_zarch=yes
fa3bfd
+else
fa3bfd
+  libc_cv_asm_s390_min_z196_zarch=no
fa3bfd
+fi
fa3bfd
+rm -f conftest*
fa3bfd
+fi
fa3bfd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_s390_min_z196_zarch" >&5
fa3bfd
+$as_echo "$libc_cv_asm_s390_min_z196_zarch" >&6; }
fa3bfd
+
fa3bfd
+if test "$libc_cv_asm_s390_min_z196_zarch" = yes ;
fa3bfd
+then
fa3bfd
+  $as_echo "#define HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT 1" >>confdefs.h
fa3bfd
+
fa3bfd
+fi
fa3bfd
diff --git a/sysdeps/s390/configure.in b/sysdeps/s390/configure.in
fa3bfd
index a3b1f25..bad92bd 100644
fa3bfd
--- a/sysdeps/s390/configure.in
fa3bfd
+++ b/sysdeps/s390/configure.in
fa3bfd
@@ -53,3 +53,29 @@ if test "$libc_cv_gcc_s390_vx" = yes ;
fa3bfd
 then
fa3bfd
   AC_DEFINE(HAVE_S390_VX_GCC_SUPPORT)
fa3bfd
 fi
fa3bfd
+
fa3bfd
+AC_CACHE_CHECK(for S390 z196 zarch instruction support as default,
fa3bfd
+	       libc_cv_asm_s390_min_z196_zarch, [dnl
fa3bfd
+cat > conftest.c <<\EOF
fa3bfd
+float testinsn (double e)
fa3bfd
+{
fa3bfd
+    float d;
fa3bfd
+    __asm__ ("ledbra %0,5,%1,4" : "=f" (d) : "f" (e) );
fa3bfd
+    return d;
fa3bfd
+}
fa3bfd
+EOF
fa3bfd
+dnl
fa3bfd
+dnl test, if assembler supports S390 z196 zarch instructions as default
fa3bfd
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
fa3bfd
+			-o conftest.o &> /dev/null]) ;
fa3bfd
+then
fa3bfd
+  libc_cv_asm_s390_min_z196_zarch=yes
fa3bfd
+else
fa3bfd
+  libc_cv_asm_s390_min_z196_zarch=no
fa3bfd
+fi
fa3bfd
+rm -f conftest* ])
fa3bfd
+
fa3bfd
+if test "$libc_cv_asm_s390_min_z196_zarch" = yes ;
fa3bfd
+then
fa3bfd
+  AC_DEFINE(HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT)
fa3bfd
+fi
fa3bfd
-- 
fa3bfd
1.8.3.1
fa3bfd