|
 |
bdc76f |
commit a899a5512f618d5c4093a2d65e8dee07c791b0ab
|
|
|
bdc76f |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
bdc76f |
Date: Fri Mar 22 11:14:08 2019 +0100
|
|
|
bdc76f |
|
|
|
bdc76f |
S390: Add configure check to detect support for arch13.
|
|
|
bdc76f |
|
|
|
bdc76f |
Add two configure checks which detect if arch13 is supported
|
|
|
bdc76f |
by the assembler at all - by explicitely setting the machine -
|
|
|
bdc76f |
and if it is supported with default settings.
|
|
|
bdc76f |
|
|
|
bdc76f |
ChangeLog:
|
|
|
bdc76f |
|
|
|
bdc76f |
* config.h.in (HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT,
|
|
|
bdc76f |
HAVE_S390_ARCH13_ASM_SUPPORT): New undefine.
|
|
|
bdc76f |
* sysdeps/s390/configure.ac: Add checks for arch13 support.
|
|
|
bdc76f |
* sysdeps/s390/configure: Regenerated.
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/config.h.in b/config.h.in
|
|
|
bdc76f |
index 422a6036ab16e3b6..f63f6c8442914aa1 100644
|
|
|
bdc76f |
--- a/config.h.in
|
|
|
bdc76f |
+++ b/config.h.in
|
|
|
bdc76f |
@@ -71,6 +71,9 @@
|
|
|
bdc76f |
/* Define if assembler supports z13 zarch instructions as default on S390. */
|
|
|
bdc76f |
#undef HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
+/* Define if assembler supports arch13 zarch instruction as default on S390. */
|
|
|
bdc76f |
+#undef HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
+
|
|
|
bdc76f |
/* Define if assembler supports vector instructions on S390. */
|
|
|
bdc76f |
#undef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
@@ -78,6 +81,9 @@
|
|
|
bdc76f |
on S390. */
|
|
|
bdc76f |
#undef HAVE_S390_VX_GCC_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
+/* Define if assembler supports arch13 instructions on S390. */
|
|
|
bdc76f |
+#undef HAVE_S390_ARCH13_ASM_SUPPORT
|
|
|
bdc76f |
+
|
|
|
bdc76f |
/* Define if assembler supports Intel MPX. */
|
|
|
bdc76f |
#undef HAVE_MPX_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure
|
|
|
bdc76f |
index 4a44775e3083d8c3..fa46e9e351e37e55 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/configure
|
|
|
bdc76f |
+++ b/sysdeps/s390/configure
|
|
|
bdc76f |
@@ -112,6 +112,43 @@ then
|
|
|
bdc76f |
|
|
|
bdc76f |
fi
|
|
|
bdc76f |
|
|
|
bdc76f |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for S390 arch13 zarch instruction support" >&5
|
|
|
bdc76f |
+$as_echo_n "checking for S390 arch13 zarch instruction support... " >&6; }
|
|
|
bdc76f |
+if ${libc_cv_asm_s390_arch13+:} false; then :
|
|
|
bdc76f |
+ $as_echo_n "(cached) " >&6
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ cat > conftest.c <<\EOF
|
|
|
bdc76f |
+void testinsn (char *buf)
|
|
|
bdc76f |
+{
|
|
|
bdc76f |
+ __asm__ (".machine \"arch13\" \n\t"
|
|
|
bdc76f |
+ ".machinemode \"zarch_nohighgprs\" \n\t"
|
|
|
bdc76f |
+ "lghi %%r0,16 \n\t"
|
|
|
bdc76f |
+ "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
|
|
|
bdc76f |
+}
|
|
|
bdc76f |
+EOF
|
|
|
bdc76f |
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
|
|
|
bdc76f |
+ -o conftest.o &> /dev/null'
|
|
|
bdc76f |
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
|
|
|
bdc76f |
+ (eval $ac_try) 2>&5
|
|
|
bdc76f |
+ ac_status=$?
|
|
|
bdc76f |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
bdc76f |
+ test $ac_status = 0; }; } ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ libc_cv_asm_s390_arch13=yes
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ libc_cv_asm_s390_arch13=no
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+rm -f conftest*
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_s390_arch13" >&5
|
|
|
bdc76f |
+$as_echo "$libc_cv_asm_s390_arch13" >&6; }
|
|
|
bdc76f |
+if test "$libc_cv_asm_s390_arch13" = yes ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ $as_echo "#define HAVE_S390_ARCH13_ASM_SUPPORT 1" >>confdefs.h
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+
|
|
|
bdc76f |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for S390 z10 zarch instruction support as default" >&5
|
|
|
bdc76f |
$as_echo_n "checking for S390 z10 zarch instruction support as default... " >&6; }
|
|
|
bdc76f |
if ${libc_cv_asm_s390_min_z10_zarch+:} false; then :
|
|
|
bdc76f |
@@ -225,5 +262,39 @@ then
|
|
|
bdc76f |
|
|
|
bdc76f |
fi
|
|
|
bdc76f |
|
|
|
bdc76f |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for S390 arch13 zarch instruction support as default" >&5
|
|
|
bdc76f |
+$as_echo_n "checking for S390 arch13 zarch instruction support as default... " >&6; }
|
|
|
bdc76f |
+if ${libc_cv_asm_s390_min_arch13_zarch+:} false; then :
|
|
|
bdc76f |
+ $as_echo_n "(cached) " >&6
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ cat > conftest.c <<\EOF
|
|
|
bdc76f |
+void testinsn (char *buf)
|
|
|
bdc76f |
+{
|
|
|
bdc76f |
+ __asm__ ("lghi %%r0,16 \n\t"
|
|
|
bdc76f |
+ "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
|
|
|
bdc76f |
+}
|
|
|
bdc76f |
+EOF
|
|
|
bdc76f |
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
|
|
|
bdc76f |
+ -o conftest.o &> /dev/null'
|
|
|
bdc76f |
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
|
|
|
bdc76f |
+ (eval $ac_try) 2>&5
|
|
|
bdc76f |
+ ac_status=$?
|
|
|
bdc76f |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
bdc76f |
+ test $ac_status = 0; }; } ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ libc_cv_asm_s390_min_arch13_zarch=yes
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ libc_cv_asm_s390_min_arch13_zarch=no
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+rm -f conftest*
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_s390_min_arch13_zarch" >&5
|
|
|
bdc76f |
+$as_echo "$libc_cv_asm_s390_min_arch13_zarch" >&6; }
|
|
|
bdc76f |
+if test "$libc_cv_asm_s390_min_arch13_zarch" = yes ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ $as_echo "#define HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT 1" >>confdefs.h
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+
|
|
|
bdc76f |
test -n "$critic_missing" && as_fn_error $? "
|
|
|
bdc76f |
*** $critic_missing" "$LINENO" 5
|
|
|
bdc76f |
diff --git a/sysdeps/s390/configure.ac b/sysdeps/s390/configure.ac
|
|
|
bdc76f |
index 4dfb5574b49d5949..3ed5a8ef87f9694b 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/configure.ac
|
|
|
bdc76f |
+++ b/sysdeps/s390/configure.ac
|
|
|
bdc76f |
@@ -80,6 +80,32 @@ then
|
|
|
bdc76f |
AC_DEFINE(HAVE_S390_VX_GCC_SUPPORT)
|
|
|
bdc76f |
fi
|
|
|
bdc76f |
|
|
|
bdc76f |
+AC_CACHE_CHECK(for S390 arch13 zarch instruction support,
|
|
|
bdc76f |
+ libc_cv_asm_s390_arch13, [dnl
|
|
|
bdc76f |
+cat > conftest.c <<\EOF
|
|
|
bdc76f |
+void testinsn (char *buf)
|
|
|
bdc76f |
+{
|
|
|
bdc76f |
+ __asm__ (".machine \"arch13\" \n\t"
|
|
|
bdc76f |
+ ".machinemode \"zarch_nohighgprs\" \n\t"
|
|
|
bdc76f |
+ "lghi %%r0,16 \n\t"
|
|
|
bdc76f |
+ "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
|
|
|
bdc76f |
+}
|
|
|
bdc76f |
+EOF
|
|
|
bdc76f |
+dnl test, if assembler supports S390 arch13 instructions
|
|
|
bdc76f |
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
|
|
|
bdc76f |
+ -o conftest.o &> /dev/null]) ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ libc_cv_asm_s390_arch13=yes
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ libc_cv_asm_s390_arch13=no
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+rm -f conftest* ])
|
|
|
bdc76f |
+if test "$libc_cv_asm_s390_arch13" = yes ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ AC_DEFINE(HAVE_S390_ARCH13_ASM_SUPPORT)
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+
|
|
|
bdc76f |
AC_CACHE_CHECK(for S390 z10 zarch instruction support as default,
|
|
|
bdc76f |
libc_cv_asm_s390_min_z10_zarch, [dnl
|
|
|
bdc76f |
cat > conftest.c <<\EOF
|
|
|
bdc76f |
@@ -163,5 +189,28 @@ then
|
|
|
bdc76f |
AC_DEFINE(HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT)
|
|
|
bdc76f |
fi
|
|
|
bdc76f |
|
|
|
bdc76f |
+AC_CACHE_CHECK(for S390 arch13 zarch instruction support as default,
|
|
|
bdc76f |
+ libc_cv_asm_s390_min_arch13_zarch, [dnl
|
|
|
bdc76f |
+cat > conftest.c <<\EOF
|
|
|
bdc76f |
+void testinsn (char *buf)
|
|
|
bdc76f |
+{
|
|
|
bdc76f |
+ __asm__ ("lghi %%r0,16 \n\t"
|
|
|
bdc76f |
+ "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
|
|
|
bdc76f |
+}
|
|
|
bdc76f |
+EOF
|
|
|
bdc76f |
+dnl test, if assembler supports S390 arch13 zarch instructions as default
|
|
|
bdc76f |
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
|
|
|
bdc76f |
+ -o conftest.o &> /dev/null]) ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ libc_cv_asm_s390_min_arch13_zarch=yes
|
|
|
bdc76f |
+else
|
|
|
bdc76f |
+ libc_cv_asm_s390_min_arch13_zarch=no
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+rm -f conftest* ])
|
|
|
bdc76f |
+if test "$libc_cv_asm_s390_min_arch13_zarch" = yes ;
|
|
|
bdc76f |
+then
|
|
|
bdc76f |
+ AC_DEFINE(HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT)
|
|
|
bdc76f |
+fi
|
|
|
bdc76f |
+
|
|
|
bdc76f |
test -n "$critic_missing" && AC_MSG_ERROR([
|
|
|
bdc76f |
*** $critic_missing])
|