diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-12-10 16:59:02 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-12-10 16:59:02 +0000 |
| commit | 2cfbdb9a27a8fb08e0249d790a7e6d6053adda59 (patch) | |
| tree | e92ccf8824e22d57a060529ce9a884b2374f342f /wcsmbs | |
| parent | 1b8bf3518186cdc4f22037e5f226c34ffa143b89 (diff) | |
| download | glibc-2cfbdb9a27a8fb08e0249d790a7e6d6053adda59.zip glibc-2cfbdb9a27a8fb08e0249d790a7e6d6053adda59.tar.gz glibc-2cfbdb9a27a8fb08e0249d790a7e6d6053adda59.tar.bz2 | |
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 <joseph@codesourcery.com>
Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[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.
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wcschr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wcsmbs/wcschr.c b/wcsmbs/wcschr.c index 1a35b80..bed66a7 100644 --- a/wcsmbs/wcschr.c +++ b/wcsmbs/wcschr.c @@ -20,6 +20,8 @@ /* Find the first occurrence of WC in WCS. */ #ifdef WCSCHR # define wcschr WCSCHR +#else +# define wcschr __wcschr #endif wchar_t * @@ -35,3 +37,8 @@ wcschr (wcs, wc) return NULL; } libc_hidden_def (wcschr) +#ifndef WCSCHR +# undef wcschr +weak_alias (__wcschr, wcschr) +libc_hidden_weak (wcschr) +#endif |