diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2023-07-24 14:15:24 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-07-26 09:45:22 -0300 |
| commit | 648c3b574d4465042116db6016c13bf6cc53db54 (patch) | |
| tree | adfd6e2a77e3a65fd23e6aa421b4634b0154d1c7 | |
| parent | 0eb6b2725ba4aae73c03ac1f05c31cd2a073c99a (diff) | |
| download | glibc-648c3b574d4465042116db6016c13bf6cc53db54.tar glibc-648c3b574d4465042116db6016c13bf6cc53db54.tar.gz glibc-648c3b574d4465042116db6016c13bf6cc53db54.tar.bz2 glibc-648c3b574d4465042116db6016c13bf6cc53db54.zip | |
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 <command-line>: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 <carlos@redhat.com>
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/strchrnul.c | 14 |
1 files 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) |