From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 6AC573892450 for ; Thu, 20 Jun 2024 13:02:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AC573892450 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6AC573892450 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718888540; cv=none; b=VIJXEq6YZDGudicun1SM7tEM0mRFih4AiAbdA86ap9J6ImBYhff2Oh10ymkNITxz6ydYe3WevEnFL3b0niteB+a9OHTV3elkUTWecR2tMJM2r1/ufuCP/5zR9q7geahF4SNBK0jASCJXixexiPFksGn/xmdyjm+oKaOYOsNJzmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718888540; c=relaxed/simple; bh=Zb2Y2ARG9rjas4xl0HyVxDl59QI2j0+vD2J4Qaio3aE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=c7H0OSuQVrYmVVsUQzugihC4BW8UIMgcXPhHnShrEbahNxf2rrYJ0y/JAvSOetzqIDVDlOACf/A3pnHDrLJ5wykRgBc+84bJSlhZsBDmGj1fKHrpiV6KXWezk598KFzVZh63i/7snHkiCHRkAsoZhqfpJPMh5AtPC7AmwiK7KNs= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: Florian Weimer Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v3] s390x: Capture grep output in static PIE check In-Reply-To: <87v823hjr7.fsf@oldenburg.str.redhat.com> (Florian Weimer's message of "Thu, 20 Jun 2024 14:38:20 +0200") Organization: Gentoo References: <87v823hjr7.fsf@oldenburg.str.redhat.com> Date: Thu, 20 Jun 2024 14:02:12 +0100 Message-ID: <87msnfvkbv.fsf@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Florian Weimer writes: > The test is not a run-time check, so update the description. > Also use readelf -W for a more stable output format and fix > an LC_ALL typo. > > This avoids garbled configure messages: > > checking for s390-specific static PIE requirements (runtime check)... 0x0000000000000017 (JMPREL) 0x280 > yes Looks good. Thanks! > > --- > v3: Fix LC_ALL typo. > sysdeps/s390/s390-64/configure | 8 ++++---- > sysdeps/s390/s390-64/configure.ac | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure > index 33c28614c2..9ea6940c85 100644 > --- a/sysdeps/s390/s390-64/configure > +++ b/sysdeps/s390/s390-64/configure > @@ -4,8 +4,8 @@ > # Minimal checking for static PIE support in ld. > # Compare to ld testcase/bugzilla: > # /ld/testsuite/ld-elf/pr22263-1.rd > -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements (runtime check)" >&5 > -printf %s "checking for s390-specific static PIE requirements (runtime check)... " >&6; } > +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements" >&5 > +printf %s "checking for s390-specific static PIE requirements... " >&6; } > if { as_var=\ > libc_cv_s390x_staticpie_req_runtime; eval test \${$as_var+y}; } > then : > @@ -62,13 +62,13 @@ EOF > ac_status=$? > printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; } \ > - && { ac_try='! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF' > + && { ac_try='! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF >&5' > { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > (eval $ac_try) 2>&5 > ac_status=$? > printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; } \ > - && { ac_try='LC_ACLL=C $READELF -d conftest | grep JMPREL' > + && { ac_try='LC_ALL=C $READELF -Wd conftest | grep JMPREL >&5' > { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > (eval $ac_try) 2>&5 > ac_status=$? > diff --git a/sysdeps/s390/s390-64/configure.ac b/sysdeps/s390/s390-64/configure.ac > index fd729e1496..aaf71eabb1 100644 > --- a/sysdeps/s390/s390-64/configure.ac > +++ b/sysdeps/s390/s390-64/configure.ac > @@ -4,7 +4,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. > # Minimal checking for static PIE support in ld. > # Compare to ld testcase/bugzilla: > # /ld/testsuite/ld-elf/pr22263-1.rd > -AC_CACHE_CHECK([for s390-specific static PIE requirements (runtime check)], \ > +AC_CACHE_CHECK([for s390-specific static PIE requirements], \ > [libc_cv_s390x_staticpie_req_runtime], [dnl > cat > conftest1.c < __thread int * foo; > @@ -42,8 +42,8 @@ EOF > if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest1.c -o conftest1.o]) \ > && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest2.c -o conftest2.o]) \ > && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static-pie -nostartfiles -nostdlib -fPIE -o conftest conftest1.o conftest2.o]) \ > - && AC_TRY_COMMAND([! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF]) \ > - && AC_TRY_COMMAND([LC_ACLL=C $READELF -d conftest | grep JMPREL]) > + && AC_TRY_COMMAND([! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF] >&AS_MESSAGE_LOG_FD) \ > + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wd conftest | grep JMPREL >&AS_MESSAGE_LOG_FD]) > then > libc_cv_s390x_staticpie_req_runtime=yes > fi > > base-commit: 71dafdf5f19dd2b0729e4774149944911a405bc6