mirror of git://sourceware.org/git/glibc.git
2cfbdb9a27
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. |
||
|---|---|---|
| .. | ||
| Makefile | ||
| bcopy-ppc64.c | ||
| bcopy.c | ||
| bzero.c | ||
| ifunc-impl-list.c | ||
| init-arch.h | ||
| memchr-power7.S | ||
| memchr-ppc64.c | ||
| memchr.c | ||
| memcmp-power4.S | ||
| memcmp-power7.S | ||
| memcmp-ppc64.c | ||
| memcmp.c | ||
| memcpy-a2.S | ||
| memcpy-cell.S | ||
| memcpy-power4.S | ||
| memcpy-power6.S | ||
| memcpy-power7.S | ||
| memcpy-ppc64.S | ||
| memcpy.c | ||
| memmove-power7.S | ||
| memmove-ppc64.c | ||
| memmove.c | ||
| mempcpy-power7.S | ||
| mempcpy-ppc64.c | ||
| mempcpy.c | ||
| memrchr-power7.S | ||
| memrchr-ppc64.c | ||
| memrchr.c | ||
| memset-power4.S | ||
| memset-power6.S | ||
| memset-power7.S | ||
| memset-power8.S | ||
| memset-ppc64.S | ||
| memset.c | ||
| rawmemchr-power7.S | ||
| rawmemchr-ppc64.c | ||
| rawmemchr.c | ||
| rtld-memset.c | ||
| rtld-strchr.S | ||
| stpcpy-power7.S | ||
| stpcpy-ppc64.S | ||
| stpcpy.c | ||
| stpncpy-power7.S | ||
| stpncpy-ppc64.c | ||
| stpncpy.c | ||
| strcasecmp-power7.S | ||
| strcasecmp.c | ||
| strcasecmp_l-power7.S | ||
| strcasecmp_l.c | ||
| strcat-power7.c | ||
| strcat-ppc64.c | ||
| strcat.c | ||
| strchr-power7.S | ||
| strchr-ppc64.S | ||
| strchr.c | ||
| strchrnul-power7.S | ||
| strchrnul-ppc64.c | ||
| strchrnul.c | ||
| strcmp-power7.S | ||
| strcmp-ppc64.S | ||
| strcmp.c | ||
| strcpy-power7.S | ||
| strcpy-ppc64.S | ||
| strcpy.c | ||
| strlen-power7.S | ||
| strlen-ppc64.S | ||
| strlen.c | ||
| strncase-power7.c | ||
| strncase.c | ||
| strncase_l-power7.c | ||
| strncase_l.c | ||
| strncat-power7.S | ||
| strncat-ppc64.c | ||
| strncat.c | ||
| strncmp-power4.S | ||
| strncmp-power7.S | ||
| strncmp-ppc64.S | ||
| strncmp.c | ||
| strncpy-power7.S | ||
| strncpy-ppc64.c | ||
| strncpy.c | ||
| strnlen-power7.S | ||
| strnlen-ppc64.c | ||
| strnlen.c | ||
| strrchr-power7.S | ||
| strrchr-ppc64.c | ||
| strrchr.c | ||
| wcschr-power6.c | ||
| wcschr-power7.c | ||
| wcschr-ppc64.c | ||
| wcschr.c | ||
| wcscpy-power6.c | ||
| wcscpy-power7.c | ||
| wcscpy-ppc64.c | ||
| wcscpy.c | ||
| wcsrchr-power6.c | ||
| wcsrchr-power7.c | ||
| wcsrchr-ppc64.c | ||
| wcsrchr.c | ||
| wordcopy-power6.c | ||
| wordcopy-power7.c | ||
| wordcopy-ppc64.c | ||
| wordcopy.c | ||