From 2cfbdb9a27a8fb08e0249d790a7e6d6053adda59 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 10 Dec 2014 16:59:02 +0000 Subject: Fix strftime wcschr namespace (bug 17634). Use of strftime, a C90 function, ends up bringing in wcschr, which is not a C90 function. Although not a conformance bug (C90 reserves wcs*), this is still contrary to glibc practice of avoiding relying on those reservations; this patch arranges for the internal uses to use __wcschr instead, with wcschr being a weak alias. This is more complicated than some such patches because of the various IFUNC definitions of wcschr (which include code redefining libc_hidden_def in a way that involves creating __GI_wcschr manually and so also needs to create __GI___wcschr after the change of internal uses to use __wcschr). Tested for x86_64 and 32-bit x86 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). 2014-12-10 Joseph Myers Adhemerval Zanella [BZ #17634] * wcsmbs/wcschr.c [!WCSCHR] (wcschr): Define as __wcschr. Undefine after defining function. Define as weak alias of __wcschr. Use libc_hidden_weak. * include/wchar.h (__wcschr): Declare. Use libc_hidden_proto. * sysdeps/i386/i686/multiarch/wcschr-c.c [IS_IN (libc) && SHARED] (libc_hidden_def): Also define __GI___wcschr alias. * sysdeps/i386/i686/multiarch/wcschr.S (wcschr): Rename to __wcschr and define as weak alias of __wcschr. * sysdeps/powerpc/power6/wcschr.c [!WCSCHR] (WCSCHR): Define as __wcschr. [!WCSCHR] (DEFAULT_WCSCHR): Define. [DEFAULT_WCSCHR] (__wcschr): Use libc_hidden_def. [DEFAULT_WCSCHR] (wcschr): Define as weak alias of __wcschr. Use libc_hidden_weak. Do not use libc_hidden_def. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c [IS_IN (libc) && SHARED] (libc_hidden_def): Also define __GI___wcschr alias. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c [IS_IN (libc)] (wcschr): Define as macro expanding to __redirect_wcschr. [IS_IN (libc)] (__wcschr_ppc): Use __redirect_wcschr in typeof. [IS_IN (libc)] (__wcschr_power6): Likewise. [IS_IN (libc)] (__wcschr_power7): Likewise. [IS_IN (libc)] (__libc_wcschr): New. Define with libc_ifunc instead of wcschr. [IS_IN (libc)] (wcschr): Undefine and define as weak alias of __libc_wcschr. [!IS_IN (libc)] (libc_hidden_def): Do not undefine and redefine. * sysdeps/powerpc/powerpc64/multiarch/wcschr.c (wcschr): Rename to __wcschr and define as weak alias of __wcschr. Use libc_hidden_builtin_def. * sysdeps/x86_64/wcschr.S (wcschr): Rename to __wcschr and define as weak alias of __wcschr. Use libc_hidden_weak. * time/alt_digit.c (_nl_get_walt_digit): Use __wcschr instead of wcschr. * time/era.c (_nl_init_era_entries): Likewise. * conform/Makefile (test-xfail-ISO/time.h/linknamespace): Remove variable. (test-xfail-XPG3/time.h/linknamespace): Likewise. (test-xfail-XPG4/time.h/linknamespace): Likewise. --- sysdeps/i386/i686/multiarch/wcschr-c.c | 4 +++- sysdeps/i386/i686/multiarch/wcschr.S | 5 +++-- sysdeps/powerpc/power6/wcschr.c | 9 ++++++++- sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c | 4 +++- sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c | 15 +++++++++------ sysdeps/powerpc/powerpc64/multiarch/wcschr.c | 4 +++- sysdeps/x86_64/wcschr.S | 8 +++++--- 7 files changed, 34 insertions(+), 15 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c index 4c5f0f6b25..786c132fcd 100644 --- a/sysdeps/i386/i686/multiarch/wcschr-c.c +++ b/sysdeps/i386/i686/multiarch/wcschr-c.c @@ -4,7 +4,9 @@ # ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ - __hidden_ver1 (__wcschr_ia32, __GI_wcschr, __wcschr_ia32); + __hidden_ver1 (__wcschr_ia32, __GI_wcschr, __wcschr_ia32); \ + strong_alias (__wcschr_ia32, __wcschr_ia32_1); \ + __hidden_ver1 (__wcschr_ia32_1, __GI___wcschr, __wcschr_ia32_1); # endif # define WCSCHR __wcschr_ia32 #endif diff --git a/sysdeps/i386/i686/multiarch/wcschr.S b/sysdeps/i386/i686/multiarch/wcschr.S index 9a80a33618..ccbc058001 100644 --- a/sysdeps/i386/i686/multiarch/wcschr.S +++ b/sysdeps/i386/i686/multiarch/wcschr.S @@ -23,7 +23,7 @@ #if IS_IN (libc) .text -ENTRY(wcschr) +ENTRY(__wcschr) .type wcschr, @gnu_indirect_function pushl %ebx cfi_adjust_cfa_offset (4) @@ -40,5 +40,6 @@ ENTRY(wcschr) cfi_adjust_cfa_offset (-4); cfi_restore (ebx) ret -END(wcschr) +END(__wcschr) +weak_alias (__wcschr, wcschr) #endif diff --git a/sysdeps/powerpc/power6/wcschr.c b/sysdeps/powerpc/power6/wcschr.c index 7045677b51..af5dc8caae 100644 --- a/sysdeps/powerpc/power6/wcschr.c +++ b/sysdeps/powerpc/power6/wcschr.c @@ -19,7 +19,8 @@ #include #ifndef WCSCHR -# define WCSCHR wcschr +# define WCSCHR __wcschr +# define DEFAULT_WCSCHR #endif /* Find the first occurrence of WC in WCS. */ @@ -86,4 +87,10 @@ WCSCHR (const wchar_t *wcs, const wchar_t wc) return NULL; } +#ifdef DEFAULT_WCSCHR +libc_hidden_def (__wcschr) +weak_alias (__wcschr, wcschr) +libc_hidden_weak (wcschr) +#else libc_hidden_def (wcschr) +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c index 9a067afacd..d698efc9a9 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c @@ -21,7 +21,9 @@ # ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ - __hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc); + __hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc); \ + strong_alias (__wcschr_ppc, __wcschr_ppc_1); \ + __hidden_ver1 (__wcschr_ppc_1, __GI___wcschr, __wcschr_ppc_1); # endif # define WCSCHR __wcschr_ppc #endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c index 6b8cd9c528..ae5c517ae1 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c @@ -17,22 +17,25 @@ . */ #if IS_IN (libc) +# define wcschr __redirect_wcschr # include # include # include "init-arch.h" -extern __typeof (wcschr) __wcschr_ppc attribute_hidden; -extern __typeof (wcschr) __wcschr_power6 attribute_hidden; -extern __typeof (wcschr) __wcschr_power7 attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_ppc attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_power6 attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_power7 attribute_hidden; -libc_ifunc (wcschr, +extern __typeof (__redirect_wcschr) __libc_wcschr; + +libc_ifunc (__libc_wcschr, (hwcap & PPC_FEATURE_HAS_VSX) ? __wcschr_power7 : (hwcap & PPC_FEATURE_ARCH_2_05) ? __wcschr_power6 : __wcschr_ppc); +#undef wcschr +weak_alias (__libc_wcschr, wcschr) #else -#undef libc_hidden_def -#define libc_hidden_def(a) #include #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c index 6b8cd9c528..658cd9306f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c @@ -25,12 +25,14 @@ extern __typeof (wcschr) __wcschr_ppc attribute_hidden; extern __typeof (wcschr) __wcschr_power6 attribute_hidden; extern __typeof (wcschr) __wcschr_power7 attribute_hidden; -libc_ifunc (wcschr, +libc_ifunc (__wcschr, (hwcap & PPC_FEATURE_HAS_VSX) ? __wcschr_power7 : (hwcap & PPC_FEATURE_ARCH_2_05) ? __wcschr_power6 : __wcschr_ppc); +weak_alias (__wcschr, wcschr) +libc_hidden_builtin_def (wcschr) #else #undef libc_hidden_def #define libc_hidden_def(a) diff --git a/sysdeps/x86_64/wcschr.S b/sysdeps/x86_64/wcschr.S index faca759467..5c2f2d4010 100644 --- a/sysdeps/x86_64/wcschr.S +++ b/sysdeps/x86_64/wcschr.S @@ -20,7 +20,7 @@ #include .text -ENTRY (wcschr) +ENTRY (__wcschr) movd %rsi, %xmm1 pxor %xmm2, %xmm2 @@ -149,6 +149,8 @@ L(return_null): xor %rax, %rax ret -END (wcschr) +END (__wcschr) -libc_hidden_def(wcschr) +libc_hidden_def(__wcschr) +weak_alias (__wcschr, wcschr) +libc_hidden_weak (wcschr) -- cgit 1.4.1