From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id ABC533858D37 for ; Thu, 1 Feb 2024 09:12:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ABC533858D37 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 ABC533858D37 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=1706778782; cv=none; b=dhjZ6jr7RP/eDtqHJeae3rzz5FdDpd7AaSuNFb+HvwjpaJIGIJmCUH3w0WZjhdBbVJm2nwo6Gm/EDQ6oJpAY1kwgkZ+t+cm4cAfXOA4yqM0HnitulvvLVDR2lqkkipUdy8GinpxBDAu5/j/RJa2yy7usImqaxqZVkTRCAMgvYBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706778782; c=relaxed/simple; bh=oiF7J8vjz+BTWoZBBP9IAWMuN+Jk+USa3HLRyo7pZWY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FZf82m3GrWeyQGEICps0hspHrbR0/pSULvwciW5oGY6OrnQnjVP9zU3d/0TbICZoGcpZ4265c1NxgEF/s8V4Uzv1modB76wGACeWRl4KQOt0/OVb2aFKweRJAMxhhDmoI7OytloYMOCLjkYMu75PNtsoR2UsM1WX9fDlTvEvbsY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 4118ktee029320; Thu, 1 Feb 2024 09:12:47 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=4OdrLwxP9/wDvvyKiuBNJDqtvnLiGDtOB1j3o3FqxJo=; b=p15sI0zS483pqlhkE9xh6YFbj/K5qS/m6rdp5T+zJwbOnKdJpZkHmII8WBDkjIDYgWzk /6zTTAORgyrr88TeWLppGRZ0KaDR2unpthOUxT6F7xQYHp+TjeXmINs78/NwZw04tc78 67srzvptnswy51aYyS+Yt8T2W+3QERtlCIoftxemC6G8ktfUWke0+wzkT1vO7VvZiw0w fHGBY3m4v54JqISpDxMJCLkwKxZXinDNoJlEGAeEuevthkRR0LLyn6JZ4VkSR6DJpneP HsaRfvzYdxcF8JU6vij4mR7HQP1jksnG+0Uqsb8gf23eGohT1L9K47RzycOaCW+EjD0x Gg== 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 3w083arpcy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Feb 2024 09:12:46 +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 4116mYlx010569; Thu, 1 Feb 2024 09:12:45 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwd5p34wf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Feb 2024 09:12:45 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4119Cgb857540970 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Feb 2024 09:12:42 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 08B6420043; Thu, 1 Feb 2024 09:12:42 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D79B820040; Thu, 1 Feb 2024 09:12:41 +0000 (GMT) Received: from li-75e136cc-3486-11b2-a85c-daad184f266e.boeblingen.de.ibm.com (unknown [9.152.222.232]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 1 Feb 2024 09:12:41 +0000 (GMT) From: Stefan Liebler To: libc-stable@sourceware.org Cc: Stefan Liebler , =?UTF-8?q?Andreas=20K=20=2E=20H=C3=BCttel?= Subject: [COMMITTED 2.38] S390: Fix building with --disable-mutli-arch [BZ #31196] Date: Thu, 1 Feb 2024 10:12:29 +0100 Message-ID: <20240201091229.23087-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: TCo2UQybgtO7UMn8GEHWlgO6gxOnPFT0 X-Proofpoint-ORIG-GUID: TCo2UQybgtO7UMn8GEHWlgO6gxOnPFT0 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-31_10,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 mlxlogscore=361 clxscore=1011 bulkscore=0 priorityscore=1501 adultscore=0 mlxscore=0 impostorscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402010074 X-Spam-Status: No, score=-11.3 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 List-Id: 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. Tested-by: Andreas K. Hüttel (cherry picked from commit cc1b91eabd806057aa7e3058a84bf129ed36e157) --- 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 bdf3c7bbe0..fadd63087a 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 f6f5bae311..97fbc16edb 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 -- 2.43.0