From patchwork Tue Jan 30 08:34:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 84902 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8CAC33858433 for ; Tue, 30 Jan 2024 08:36:47 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id D6A093858438 for ; Tue, 30 Jan 2024 08:34:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6A093858438 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D6A093858438 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706603697; cv=none; b=vISPMMKmXtgDu1a9GDkKhhd9IwkDMSEuGs+5Nf9H//VjodIukmaGD1OMO/V9FqA5cHFG7kXL8900cQhb4EbCUkczmzpnLtCSFwdAm983vMY6wf0QQVo5g78ZZm431seFHiRXKIPjYkd7LYyq58YRH/jpJaoOK3xak1BamRVrft8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706603697; c=relaxed/simple; bh=X2iExANtzv/6HYLjlc0dF/Zz/fgvMP+qobceV+SlV3Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=gbk/iGaoRwNzT86UZVdnFd6xzj4NQm3Zhk8GCdmw7T/aOysixE845QqTTwi9ftz60a9gWbCx8jSFrn/RQSvKCiXaSKV33lLBUH6NA2EgW50Q/D5/1W2N7apxlSsUtsg9srFgZwZVaEkjDDacfXpj2+u9S3u1bIyg/09mh7+1+eY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40U8TvnM013268 for ; Tue, 30 Jan 2024 08:34:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=pp1; bh=b/NXP19gmgs4NwpPJpjpmKjNTBL9wICLCtIOUVaqHQo=; b=H/GR6xcJNakeXaZ59wpfs2mCxYhEYwHcGk3w93txUqJcAwX7T0yRzVQ/x3kdNlKC+Zz3 pkILq7pOJLQObYhZyyLUdJyrjMGN+da74ktywTrsG32ggrrt+L0DS/WB+cC85TWnH81T +K5TgcxB3aEZLXapDFAz/gPY2vBTJXU1NF2Rep9mMRYzFpGLZJEi+Dq/eFFteiA3BB3U maIwwf+r7WhhjaOuaw5iRteOcjPn372uHl9oADecX3BXpw/5hVJf94dnVtDDgrG+eKI9 KggBb7HplREqypi2Fi3CXtwd95lfe4NuVoH6ePvSjD52aN2tQ/nbalCndTGZBQxX6AET Zg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vxwd50esx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 30 Jan 2024 08:34:48 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40U7HgQg010569 for ; Tue, 30 Jan 2024 08:34:47 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwd5nnjs7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 30 Jan 2024 08:34:47 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40U8YixZ17564332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Jan 2024 08:34:44 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3FFDA2004D; Tue, 30 Jan 2024 08:34:44 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A5232004B; Tue, 30 Jan 2024 08:34:44 +0000 (GMT) Received: from a35lp69.lnxne.boe (unknown [9.152.108.100]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 30 Jan 2024 08:34:44 +0000 (GMT) From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH] S390: Fix building with --disable-mutli-arch [BZ #31196] Date: Tue, 30 Jan 2024 09:34:32 +0100 Message-ID: <20240130083432.544403-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GHswjNqgTx2QwThcp6ZatwsZ_N0WclXK X-Proofpoint-ORIG-GUID: GHswjNqgTx2QwThcp6ZatwsZ_N0WclXK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-30_02,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 spamscore=0 impostorscore=0 phishscore=0 mlxlogscore=252 mlxscore=0 adultscore=0 clxscore=1015 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401300061 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, 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 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+patchwork=sourceware.org@sourceware.org Starting with commits - 7ea510127e2067efa07865158ac92c330c379950 string: Add libc_hidden_proto for strchrnul - 22999b2f0fb62eed1af4095d062bd1272d6afeb1 string: Add libc_hidden_proto for memrchr building glibc on s390x with --disable-multi-arch fails if only the C-variant of strchrnul / memrchr is used. This is the case if gcc uses -march < z13. The build fails with: ../sysdeps/s390/strchrnul-c.c:28:49: error: ‘__strchrnul_c’ undeclared here (not in a function); did you mean ‘__strchrnul’? 28 | __hidden_ver1 (__strchrnul_c, __GI___strchrnul, __strchrnul_c); With --disable-multi-arch, __strchrnul_c is not available as string/strchrnul.c is just included without defining STRCHRNUL and thus we also don't have to create the internal hidden symbol. --- sysdeps/s390/memrchr-c.c | 4 +++- sysdeps/s390/strchrnul-c.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sysdeps/s390/memrchr-c.c b/sysdeps/s390/memrchr-c.c index b4b85725d3..f6ffe85572 100644 --- a/sysdeps/s390/memrchr-c.c +++ b/sysdeps/s390/memrchr-c.c @@ -25,7 +25,9 @@ # include -# if defined SHARED && IS_IN (libc) +# if HAVE_MEMRCHR_IFUNC +# if defined SHARED && IS_IN (libc) __hidden_ver1 (__memrchr_c, __GI___memrchr, __memrchr_c); +# endif # endif #endif diff --git a/sysdeps/s390/strchrnul-c.c b/sysdeps/s390/strchrnul-c.c index 7f2f1fd540..97fd9ffbf7 100644 --- a/sysdeps/s390/strchrnul-c.c +++ b/sysdeps/s390/strchrnul-c.c @@ -24,7 +24,9 @@ # endif # include -# if defined SHARED && IS_IN (libc) +# if HAVE_STRCHRNUL_IFUNC +# if defined SHARED && IS_IN (libc) __hidden_ver1 (__strchrnul_c, __GI___strchrnul, __strchrnul_c); +# endif # endif #endif