From patchwork Mon Aug 14 12:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1821006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=us9wT+Yj; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RPYSs5Zkkz1yfP for ; Mon, 14 Aug 2023 22:22:51 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C3D7F3858412 for ; Mon, 14 Aug 2023 12:22:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3D7F3858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692015767; bh=QRUKNWM+uDVzh0h0vwzvGIQBAAHlHF9WgLEhs4i7N5Y=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=us9wT+YjjCjCUbciSaYefnd7HXSF94YTBW3gRQ3sKxSNSa3GBXubPBcqV3N9NC7wl UOjcgHskfFKpgzZlFPu9UfNw1vSZvNWQyiVobIxXr4g7Fizh3yNcG12ZFqzbABWRKC pTFmoQptEGBqOVwmfJLyGl9udjAoGYhHVNYLTM2s= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id A80A73858C1F for ; Mon, 14 Aug 2023 12:22:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A80A73858C1F Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37ECLgST014876 for ; Mon, 14 Aug 2023 12:22:31 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sfkxj0fcs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Aug 2023 12:22:30 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37ECADxZ018869 for ; Mon, 14 Aug 2023 12:22:30 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3seq413g4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Aug 2023 12:22:30 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37ECMR3j18940438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 12:22:27 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4912C2004E; Mon, 14 Aug 2023 12:22:27 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2826F20040; Mon, 14 Aug 2023 12:22:27 +0000 (GMT) Received: from a35lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Aug 2023 12:22:27 +0000 (GMT) To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH v2] s390x: Fix static PIE condition for toolchain bootstrapping. Date: Mon, 14 Aug 2023 14:22:24 +0200 Message-ID: <20230814122224.2993204-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.41.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: E2JG23mAxHpeaTKunpsGXdDrbcVfo8Kc X-Proofpoint-GUID: E2JG23mAxHpeaTKunpsGXdDrbcVfo8Kc X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-14_07,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140111 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stefan Liebler via Libc-alpha From: Stefan Liebler Reply-To: Stefan Liebler Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" The static PIE configure check uses link tests. When bootstrapping a cross-toolchain, the link tests fail due to missing crt-files / libc.so. As we explicitely want to test an issue in binutils (ld), we now also explicitely check for known linker versions. See also commit 368b7c614b102122b86af3953daea2b30230d0a8 S390: Use compile-only instead of also link-tests in configure. --- sysdeps/s390/s390-64/configure | 110 ++++++++++++++++++++++++++++-- sysdeps/s390/s390-64/configure.ac | 40 +++++++++-- 2 files changed, 138 insertions(+), 12 deletions(-) diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure index 2784f158ea..824ae9c129 100644 --- a/sysdeps/s390/s390-64/configure +++ b/sysdeps/s390/s390-64/configure @@ -1,13 +1,107 @@ # This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/s390/s390-64. +# Bypass result of runtime configure check for known linker versions as +# e.g. crt-files or libc.so might not be available in bootstrapping +# environments. +case $($LD --version) in + "GNU gold"*) + # As of 2023-08-07, gold does not support static PIE due to + # Bug 22221 - add --no-dynamic-linker option + # https://sourceware.org/bugzilla/show_bug.cgi?id=22221 + libc_cv_s390x_staticpie_req_version=no + ;; + "LLD"*) + # As of 2023-08-07, there is no lld which supports s390x. + libc_cv_s390x_staticpie_req_version=no + ;; + *) + # The required binutils patches are available with bintuils 2.39 + libc_cv_s390x_staticpie_req_version=yes + # Skip AC_CHECK_PROGS and just use the result from main configure.ac. + libc_cv_s390x_staticpie_req_LD=$LD + for ac_prog in $LD +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_libc_cv_s390x_staticpie_req_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$libc_cv_s390x_staticpie_req_LD"; then + ac_cv_prog_libc_cv_s390x_staticpie_req_LD="$libc_cv_s390x_staticpie_req_LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_libc_cv_s390x_staticpie_req_LD="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +libc_cv_s390x_staticpie_req_LD=$ac_cv_prog_libc_cv_s390x_staticpie_req_LD +if test -n "$libc_cv_s390x_staticpie_req_LD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_s390x_staticpie_req_LD" >&5 +printf "%s\n" "$libc_cv_s390x_staticpie_req_LD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$libc_cv_s390x_staticpie_req_LD" && break +done + +if test -z "$libc_cv_s390x_staticpie_req_LD"; then + ac_verc_fail=yes +else + # Found it, now check the version. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking version of $libc_cv_s390x_staticpie_req_LD" >&5 +printf %s "checking version of $libc_cv_s390x_staticpie_req_LD... " >&6; } + ac_prog_version=`$libc_cv_s390x_staticpie_req_LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 2.1[0-9][0-9]*|2.39*|2.[4-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +printf "%s\n" "$ac_prog_version" >&6; } +fi +if test $ac_verc_fail = yes; then + libc_cv_s390x_staticpie_req_version=no +fi + + ;; +esac +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements (version check)" >&5 +printf %s "checking for s390-specific static PIE requirements (version check)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_s390x_staticpie_req_version" >&5 +printf "%s\n" "$libc_cv_s390x_staticpie_req_version" >&6; } + # 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" >&5 -printf %s "checking for s390-specific static PIE requirements... " >&6; } +{ 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; } if { as_var=\ -libc_cv_s390x_staticpie_req; eval test \${$as_var+y}; } +libc_cv_s390x_staticpie_req_runtime; eval test \${$as_var+y}; } then : printf %s "(cached) " >&6 else $as_nop @@ -32,7 +126,7 @@ main () return 0; } EOF - libc_cv_s390x_staticpie_req=no + libc_cv_s390x_staticpie_req_runtime=no if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest1.c -o conftest1.o' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 @@ -58,15 +152,17 @@ EOF printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } then - libc_cv_s390x_staticpie_req=yes + libc_cv_s390x_staticpie_req_runtime=yes fi rm -rf conftest.* fi eval ac_res=\$\ -libc_cv_s390x_staticpie_req +libc_cv_s390x_staticpie_req_runtime { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } -if test $libc_cv_s390x_staticpie_req = yes; then + +if test $libc_cv_s390x_staticpie_req_runtime = yes \ + || test $libc_cv_s390x_staticpie_req_version = yes; then # Static PIE is supported only on 64bit. # Ensure you also have those patches for: # - binutils (ld) diff --git a/sysdeps/s390/s390-64/configure.ac b/sysdeps/s390/s390-64/configure.ac index d009f108b1..4657de0d37 100644 --- a/sysdeps/s390/s390-64/configure.ac +++ b/sysdeps/s390/s390-64/configure.ac @@ -1,11 +1,39 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/s390/s390-64. +# Bypass result of runtime configure check for known linker versions as +# e.g. crt-files or libc.so might not be available in bootstrapping +# environments. +case $($LD --version) in + "GNU gold"*) + # As of 2023-08-07, gold does not support static PIE due to + # Bug 22221 - add --no-dynamic-linker option + # https://sourceware.org/bugzilla/show_bug.cgi?id=22221 + libc_cv_s390x_staticpie_req_version=no + ;; + "LLD"*) + # As of 2023-08-07, there is no lld which supports s390x. + libc_cv_s390x_staticpie_req_version=no + ;; + *) + # The required binutils patches are available with bintuils 2.39 + libc_cv_s390x_staticpie_req_version=yes + # Skip AC_CHECK_PROGS and just use the result from main configure.ac. + libc_cv_s390x_staticpie_req_LD=$LD + AC_CHECK_PROG_VER(libc_cv_s390x_staticpie_req_LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], + [2.1[0-9][0-9]*|2.39*|2.[4-9][0-9]*|[3-9].*|[1-9][0-9]*], + libc_cv_s390x_staticpie_req_version=no) + ;; +esac +AC_MSG_CHECKING([for s390-specific static PIE requirements (version check)]) +AC_MSG_RESULT($libc_cv_s390x_staticpie_req_version) + # 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], \ -[libc_cv_s390x_staticpie_req], [dnl +AC_CACHE_CHECK([for s390-specific static PIE requirements (runtime check)], \ +[libc_cv_s390x_staticpie_req_runtime], [dnl cat > conftest1.c <