From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stli@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1962)
 id A3AE83857B98; Tue, 21 Jun 2022 08:17:31 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3AE83857B98
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Stefan Liebler <stli@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] s390: use $READELF
X-Act-Checkin: glibc
X-Git-Author: Sam James <sam@gentoo.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e5446dfea11e969212939197b606424a718d9b65
X-Git-Newrev: c376ff3287b9b0f78a4f8951313c6dae60cbdfea
Message-Id: <20220621081731.A3AE83857B98@sourceware.org>
Date: Tue, 21 Jun 2022 08:17:31 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2022 08:17:31 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c376ff3287b9b0f78a4f8951313c6dae60cbdfea

commit c376ff3287b9b0f78a4f8951313c6dae60cbdfea
Author: Sam James <sam@gentoo.org>
Date:   Thu Jun 9 03:56:22 2022 +0100

    s390: use $READELF
    
    We already check for it in root configure.ac with AC_CHECK_TOOL. Let's
    use the result.
    
    Tested on s390x-ibm-linux-gnu.
    
    Signed-off-by: Sam James <sam@gentoo.org>
    Reviewed-by: Stefan Liebler <stli@linux.ibm.com>

Diff:
---
 sysdeps/s390/s390-64/configure    | 2 +-
 sysdeps/s390/s390-64/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure
index 101c570d2e..e1b419ef27 100644
--- a/sysdeps/s390/s390-64/configure
+++ b/sysdeps/s390/s390-64/configure
@@ -50,7 +50,7 @@ EOF
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } \
-     && { ac_try='! readelf -Wr conftest | grep R_390_TLS_TPOFF'
+     && { ac_try='! $READELF -Wr conftest | grep R_390_TLS_TPOFF'
   { { 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 2583a4a335..245d83493c 100644
--- a/sysdeps/s390/s390-64/configure.ac
+++ b/sysdeps/s390/s390-64/configure.ac
@@ -31,7 +31,7 @@ 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 -pie -o conftest conftest1.o conftest2.o]) \
-     && AC_TRY_COMMAND([! readelf -Wr conftest | grep R_390_TLS_TPOFF])
+     && AC_TRY_COMMAND([! $READELF -Wr conftest | grep R_390_TLS_TPOFF])
   then
     libc_cv_s390x_staticpie_req=yes
   fi