From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 0FE1E3858C52; Wed, 26 Jul 2023 14:22:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FE1E3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690381320; bh=wswjfxyVRVNqoOjl0SLnz+e+6ctcNjT3EbMia+6Qx9U=; h=From:To:Subject:Date:From; b=YfnfiFnqLAhWh3UBIisz71RWxaPXqdU6HRc35XGjwT76luTqlTeim1+6ByPn3oXWj VG2yOiYTG1yR0BJEKjP5O0tt3110YBfK7OaL7dnvQlOal9WsU8Sfs4ragjxMZM3bpI 5sFfYpV8Mh13bCrC5/7V/Bx+qKGg8Rm0XhFriFuc= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] powerpc: Fix powerpc64 strchrnul build with old gcc X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 0eb6b2725ba4aae73c03ac1f05c31cd2a073c99a X-Git-Newrev: 648c3b574d4465042116db6016c13bf6cc53db54 Message-Id: <20230726142200.0FE1E3858C52@sourceware.org> Date: Wed, 26 Jul 2023 14:22:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=648c3b574d4465042116db6016c13bf6cc53db54 commit 648c3b574d4465042116db6016c13bf6cc53db54 Author: Adhemerval Zanella Netto Date: Mon Jul 24 14:15:24 2023 -0300 powerpc: Fix powerpc64 strchrnul build with old gcc The compiler might not see that internal definition is an alias due the libc_ifunc macro, which redefines __strchrnul. With gcc 6 it fails with: In file included from :0:0: ./../include/libc-symbols.h:472:33: error: ‘__EI___strchrnul’ aliased to undefined symbol ‘__GI___strchrnul’ extern thread __typeof (name) __EI_##name \ ^ ./../include/libc-symbols.h:468:3: note: in expansion of macro ‘__hidden_ver2’ __hidden_ver2 (, local, internal, name) ^~~~~~~~~~~~~ ./../include/libc-symbols.h:476:29: note: in expansion of macro ‘__hidden_ver1’ # define hidden_def(name) __hidden_ver1(__GI_##name, name, name); ^~~~~~~~~~~~~ ./../include/libc-symbols.h:557:32: note: in expansion of macro ‘hidden_def’ # define libc_hidden_def(name) hidden_def (name) ^~~~~~~~~~ ../sysdeps/powerpc/powerpc64/multiarch/strchrnul.c:38:1: note: in expansion of macro ‘libc_hidden_def’ libc_hidden_def (__strchrnul) ^~~~~~~~~~~~~~~ Use libc_ifunc_hidden as stpcpy. Checked on powerpc64 with gcc 6 and gcc 13. Reviewed-by: Carlos O'Donell Diff: --- sysdeps/powerpc/powerpc64/multiarch/strchrnul.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c index 94873507a6..87dd41f72d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c @@ -27,13 +27,13 @@ extern __typeof (__strchrnul) __strchrnul_power8 attribute_hidden; /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__strchrnul, - (hwcap2 & PPC_FEATURE2_ARCH_2_07 - && hwcap & PPC_FEATURE_HAS_ALTIVEC) - ? __strchrnul_power8 : - (hwcap & PPC_FEATURE_ARCH_2_06) - ? __strchrnul_power7 - : __strchrnul_ppc); +libc_ifunc_hidden (__strchrnul, __strchrnul, + (hwcap2 & PPC_FEATURE2_ARCH_2_07 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __strchrnul_power8 : + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __strchrnul_power7 + : __strchrnul_ppc); libc_hidden_def (__strchrnul) weak_alias (__strchrnul, strchrnul)