From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id C04793858425 for ; Tue, 30 Jan 2024 19:00:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C04793858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C04793858425 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706641208; cv=none; b=RhiWEWx/nzLvU3kw366078C3QjPJbK8TnSWGLeDP+7afqoxvCXURNgJ5QFziNeZEUIjfadXRZLptOF1EVs5cmxXd4BHNYgky4Haab1gZBZsGENn9HjPBTk9ytJd6YV/D/ppiZeRczgqowh1NhOC+aSJ30fkjvfefhvGc6I4jiYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706641208; c=relaxed/simple; bh=iX1Vb55qLQJEKoTjcXUPaxw/joGM3tcalDexFJyKVIw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=DIX8PxAoKLQ4eLlFfTl2p92KChvOSJ9x1xDFbNDvdQ6UtaB/IDzofkuAwg51VHB/2X8rZXrDudCi4OjaR1mTdZ1+n2ED0ugBIDYSw7+oFhikAuLcXBzjVUkPNBV6u7rPsDhOhKE6f8ZNAx568QfmZsJyE7cdQfua8qUkoT4Yr2g= ARC-Authentication-Results: i=1; server2.sourceware.org References: <20240130083432.544403-1-stli@linux.ibm.com> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Sam James To: Stefan Liebler Cc: libc-alpha@sourceware.org Subject: Re: [PATCH] S390: Fix building with --disable-mutli-arch [BZ #31196] Date: Tue, 30 Jan 2024 18:59:30 +0000 Organization: Gentoo In-reply-to: <20240130083432.544403-1-stli@linux.ibm.com> Message-ID: <874jeu8x58.fsf@gentoo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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: Stefan Liebler writes: > Starting with commits > - 7ea510127e2067efa07865158ac92c330c379950 > string: Add libc_hidden_proto for strchrnul > - 22999b2f0fb62eed1af4095d062bd1272d6afeb1 > string: Add libc_hidden_proto for memrchr Nit: s/mutli/multi/ in title (it's obvious what it means ofc but mentioning it because it impacts ability to grep). Thanks! > > 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: =E2=80=98__strchrnul_c=E2=80= =99 undeclared here (not in a function); did you mean =E2=80=98__strchrnul= =E2=80=99? > 28 | __hidden_ver1 (__strchrnul_c, __GI___strchrnul, __strchrnul_c); > > With --disable-multi-arch, __strchrnul_c is not available as string/strch= rnul.c > is just included without defining STRCHRNUL and thus we also don't have t= o 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 @@ >=20=20 > # include >=20=20 > -# 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 >=20=20 > # 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