diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:24:25 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:24:25 +0000 |
| commit | 1769608794096c835095826559c0ba1555f43fc0 (patch) | |
| tree | b48e5b08a8e871d33ba40e36a4c94cfe12744cbc /sysdeps/powerpc/powerpc32/power4 | |
| parent | bb4acb522c9206b8476a88be44606bf1bc1e96f6 (diff) | |
| download | glibc-1769608794096c835095826559c0ba1555f43fc0.tar.gz glibc-1769608794096c835095826559c0ba1555f43fc0.tar.xz glibc-1769608794096c835095826559c0ba1555f43fc0.zip | |
Use libc_hidden_proto / libc_hidden_def with __strnlen.
Various code in glibc uses __strnlen instead of strnlen for namespace reasons. However, __strnlen does not use libc_hidden_proto / libc_hidden_def (as is normally done for any function defined and called within the same library, whether or not exported from the library and whatever namespace it is in), so the compiler does not know that those calls are to a function within libc. This patch uses libc_hidden_proto / libc_hidden_def with __strnlen. On x86_64, it makes no difference to the installed stripped shared libraries. On 32-bit x86, it causes __strnlen calls to go to the same place as strnlen calls (the fallback strnlen implementation), rather than through a PLT entry for the strnlen IFUNC; I'm not sure of the logic behind when calls from within libc should use IFUNCs versus when they should go direct to a particular function implementation, but clearly it doesn't make sense for strnlen and __strnlen to be handled differently in this regard. Tested for x86_64 and x86 (testsuite, and comparison of installed shared libraries as described above). * string/strnlen.c [!STRNLEN] (__strnlen): Use libc_hidden_def. * include/string.h (__strnlen): Use libc_hidden_proto. * sysdeps/aarch64/strnlen.S (__strnlen): Use libc_hidden_def. * sysdeps/i386/i686/multiarch/strnlen-c.c [SHARED] (libc_hidden_def): Define __GI___strnlen as well as __GI_strnlen. * sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S (libc_hidden_def): Undefine and redefine. * sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c [SHARED] (libc_hidden_def): Define __GI___strnlen as well as __GI_strnlen. * sysdeps/powerpc/powerpc32/power7/strnlen.S (__strnlen): Use libc_hidden_def. * sysdeps/tile/tilegx/strnlen.c (__strnlen): Likewise.
Diffstat (limited to 'sysdeps/powerpc/powerpc32/power4')
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S | 3 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S index 32fba1b5f3..e8577545de 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-power7.S @@ -31,6 +31,9 @@ cfi_endproc; \ ASM_SIZE_DIRECTIVE(__strnlen_power7) +#undef libc_hidden_def +#define libc_hidden_def(name) + #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c index 6eaed608db..a5f75160c2 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c @@ -20,7 +20,9 @@ #ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ - __hidden_ver1 (__strnlen_ppc, __GI_strnlen, __strnlen_ppc); + __hidden_ver1 (__strnlen_ppc, __GI_strnlen, __strnlen_ppc); \ + strong_alias (__strnlen_ppc, __strnlen_ppc_1); \ + __hidden_ver1 (__strnlen_ppc_1, __GI___strnlen, __strnlen_ppc_1); #endif #include <string/strnlen.c> |