From patchwork Thu Jun 20 09:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1950033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BO5ynA8i; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4b7P0SVZz20KL for ; Thu, 20 Jun 2024 19:40:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 19FD8388A01E for ; Thu, 20 Jun 2024 09:39:58 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2F16C389244E for ; Thu, 20 Jun 2024 09:13:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F16C389244E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2F16C389244E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718874797; cv=none; b=m19ly0yzOFEWpgY2mtEbfqS6WzdAXs36THVWXu+ohQXGR8C9MIvW8Iu4j9nH0p8feAqy2a/NE9Dm1f8YZqG9KOBLdDDLApm7OnBwjvUw/QdsuapkWmjrB0j+aGCpC8MJJTQNoifjzL+zX0qfCVLrBmEAD90jNNILUSNI9zVxU3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718874797; c=relaxed/simple; bh=EK7EOEh5xSpTmfLSMwlUNITfEcLCeAi0Ik2v+HADBgw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Tt9keMWEtchUK0PTJ8IcbhdH3QbI5+XXz6cboT+7u/EHxNvSIsUN7NpUrgXd6y7H/thhWpUntV0XuVBxUQ74GmteudTr3uTfEtmJL2gL/A9vjF8jP611GgDzkYKK3lHXiJ4dn6PeasXrHPDbwLXkG6bYIfGP08U29jkYJRMTsYY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718874794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=OJZMPrX4/AC/gFV2waDfb16tHdRRL0HAQwbYA1iZw58=; b=BO5ynA8iS+AV4L1xPCIkxJQ1pNmZTM+V46CuvDMAzg4qvrSQ600HCsaNc9y8UXsspk4w6r DJz4/hdK3FIGhr9bussn2NkXAYces3TvKvsz9aXzvjJ4s6PD35w4t2uWEsI15LeQ6Mm9cC odVIw2ediq7dMLWRlEbJmYPIKoMa3Mw= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-xl33VkNNPweT14LRQcCyhQ-1; Thu, 20 Jun 2024 05:13:11 -0400 X-MC-Unique: xl33VkNNPweT14LRQcCyhQ-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E0952195608B; Thu, 20 Jun 2024 09:13:10 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.21]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4F731956087; Thu, 20 Jun 2024 09:13:09 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH] s390x: Add missing grep -q flag to static PIE check Date: Thu, 20 Jun 2024 11:13:06 +0200 Message-ID: <87jzikj7tp.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org The test is not a run-time check, so update the description. Also use readelf -W for a more stable output format. This avoids grabled configure diagnostics: checking for s390-specific static PIE requirements (runtime check)... 0x0000000000000017 (JMPREL) 0x280 yes Tested on s390x-linux-gnu. The generated .so files do not change. --- sysdeps/s390/s390-64/configure | 8 ++++---- sysdeps/s390/s390-64/configure.ac | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) base-commit: 086910fc41655152812b515dc324d2ac0dc36e67 diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure index 33c28614c2..7856df7295 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 -q R_390_TLS_TPOFF' { { 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_ACLL=C $READELF -Wd conftest | grep -q JMPREL' { { 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..98f67dafc8 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 <