From patchwork Fri Nov 30 15:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 30476 Received: (qmail 80562 invoked by alias); 30 Nov 2018 17:55:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 80553 invoked by uid 89); 30 Nov 2018 17:55:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH 12/56] S390: Add configure check to detect z13 as mininum architecture level set. Date: Fri, 30 Nov 2018 16:57:50 +0100 In-Reply-To: <1543593514-10251-1-git-send-email-stli@linux.ibm.com> References: <1543593514-10251-1-git-send-email-stli@linux.ibm.com> x-cbid: 18113015-0008-0000-0000-0000029B0399 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18113015-0009-0000-0000-000022055457 Message-Id: <1543593514-10251-13-git-send-email-stli@linux.ibm.com> Add a configure check for z13 in the same way as done for z196. ChangeLog: * config.h.in (HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT): New undefine. * sysdeps/s390/configure.ac: Add check for z13 support. * sysdeps/s390/configure: Regenerated. --- config.h.in | 3 +++ sysdeps/s390/configure | 38 ++++++++++++++++++++++++++++++++++++++ sysdeps/s390/configure.ac | 28 ++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/config.h.in b/config.h.in index beecc39d5b..422a6036ab 100644 --- a/config.h.in +++ b/config.h.in @@ -68,6 +68,9 @@ /* Define if assembler supports z196 zarch instructions as default on S390. */ #undef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT +/* Define if assembler supports z13 zarch instructions as default on S390. */ +#undef HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT + /* Define if assembler supports vector instructions on S390. */ #undef HAVE_S390_VX_ASM_SUPPORT diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure index f30f864436..4a44775e30 100644 --- a/sysdeps/s390/configure +++ b/sysdeps/s390/configure @@ -187,5 +187,43 @@ then fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for S390 z13 zarch instruction support as default" >&5 +$as_echo_n "checking for S390 z13 zarch instruction support as default... " >&6; } +if ${libc_cv_asm_s390_min_z13_zarch+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat > conftest.c <<\EOF +int testinsn (void) +{ + int i; + __asm__ ("vl %%v16,0(%%r15)\n\t" + "vlgvf %0,%%v16,0" + : "=d" (i) : : "memory", "v16"); + return i; +} +EOF +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c + -o conftest.o &> /dev/null' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } ; +then + libc_cv_asm_s390_min_z13_zarch=yes +else + libc_cv_asm_s390_min_z13_zarch=no +fi +rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_s390_min_z13_zarch" >&5 +$as_echo "$libc_cv_asm_s390_min_z13_zarch" >&6; } + +if test "$libc_cv_asm_s390_min_z13_zarch" = yes ; +then + $as_echo "#define HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT 1" >>confdefs.h + +fi + test -n "$critic_missing" && as_fn_error $? " *** $critic_missing" "$LINENO" 5 diff --git a/sysdeps/s390/configure.ac b/sysdeps/s390/configure.ac index 981f7a79dd..4dfb5574b4 100644 --- a/sysdeps/s390/configure.ac +++ b/sysdeps/s390/configure.ac @@ -135,5 +135,33 @@ then AC_DEFINE(HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT) fi +AC_CACHE_CHECK(for S390 z13 zarch instruction support as default, + libc_cv_asm_s390_min_z13_zarch, [dnl +cat > conftest.c <<\EOF +int testinsn (void) +{ + int i; + __asm__ ("vl %%v16,0(%%r15)\n\t" + "vlgvf %0,%%v16,0" + : "=d" (i) : : "memory", "v16"); + return i; +} +EOF +dnl +dnl test, if assembler supports S390 z13 zarch instructions as default +if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c + -o conftest.o &> /dev/null]) ; +then + libc_cv_asm_s390_min_z13_zarch=yes +else + libc_cv_asm_s390_min_z13_zarch=no +fi +rm -f conftest* ]) + +if test "$libc_cv_asm_s390_min_z13_zarch" = yes ; +then + AC_DEFINE(HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT) +fi + test -n "$critic_missing" && AC_MSG_ERROR([ *** $critic_missing])