diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-09 21:07:30 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-09 21:07:30 +0000 |
| commit | 2f44ee08dbf51d39ef5692699cc35f93faf64db1 (patch) | |
| tree | b913fa3ca4962e28816eaf8a2d9fa03db0620ff2 /wcsmbs | |
| parent | d3ab671c942ba15a5b20f383ce71e387f17ae2c4 (diff) | |
| download | glibc-2f44ee08dbf51d39ef5692699cc35f93faf64db1.tar.gz glibc-2f44ee08dbf51d39ef5692699cc35f93faf64db1.tar.xz glibc-2f44ee08dbf51d39ef5692699cc35f93faf64db1.zip | |
Fix regcomp wcscoll, wcscmp namespace (bug 18497).
regcomp brings in references to wcscoll, which isn't in all the standards that contain regcomp. In turn, wcscoll brings in references to wcscmp, also not in all those standards. This patch fixes this by making those functions into weak aliases of __wcscoll and __wcscmp and calling those names instead as needed. Tested for x86_64 and x86 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). [BZ #18497] * wcsmbs/wcscmp.c [!WCSCMP] (WCSCMP): Define as __wcscmp instead of wcscmp. (wcscmp): Define as weak alias of WCSCMP. * wcsmbs/wcscoll.c (STRCOLL): Define as __wcscoll instead of wcscoll. (USE_HIDDEN_DEF): Define. [!USE_IN_EXTENDED_LOCALE_MODEL] (wcscoll): Define as weak alias of __wcscoll. Don't use libc_hidden_weak. * wcsmbs/wcscoll_l.c (STRCMP): Define as __wcscmp instead of wcscmp. * sysdeps/i386/i686/multiarch/wcscmp-c.c [SHARED] (libc_hidden_def): Define __GI___wcscmp instead of __GI_wcscmp. (weak_alias): Undefine and redefine. * sysdeps/i386/i686/multiarch/wcscmp.S (wcscmp): Rename to __wcscmp and define as weak alias of __wcscmp. * sysdeps/x86_64/wcscmp.S (wcscmp): Likewise. * include/wchar.h (__wcscmp): Declare. Use libc_hidden_proto. (__wcscoll): Likewise. (wcscmp): Don't use libc_hidden_proto. (wcscoll): Likewise. * posix/regcomp.c (build_range_exp): Call __wcscoll instead of wcscoll. * posix/regexec.c (check_node_accept_bytes): Likewise. * conform/Makefile (test-xfail-XPG3/regex.h/linknamespace): Remove variable. (test-xfail-XPG4/regex.h/linknamespace): Likewise. (test-xfail-POSIX/regex.h/linknamespace): Likewise.
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wcscmp.c | 3 | ||||
| -rw-r--r-- | wcsmbs/wcscoll.c | 5 | ||||
| -rw-r--r-- | wcsmbs/wcscoll_l.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c index 88efc5b55d..fcfe0c5bcb 100644 --- a/wcsmbs/wcscmp.c +++ b/wcsmbs/wcscmp.c @@ -19,7 +19,7 @@ #include <wchar.h> #ifndef WCSCMP -# define WCSCMP wcscmp +# define WCSCMP __wcscmp #endif /* Compare S1 and S2, returning less than, equal to or @@ -44,3 +44,4 @@ WCSCMP (s1, s2) return c1 < c2 ? -1 : 1; } libc_hidden_def (WCSCMP) +weak_alias (WCSCMP, wcscmp) diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index c64dd24519..717693079b 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -21,11 +21,12 @@ #define STRING_TYPE wchar_t #define USTRING_TYPE wint_t -#define STRCOLL wcscoll +#define STRCOLL __wcscoll #define STRCOLL_L __wcscoll_l +#define USE_HIDDEN_DEF #include "../string/strcoll.c" #ifndef USE_IN_EXTENDED_LOCALE_MODEL -libc_hidden_weak (wcscoll) +weak_alias (__wcscoll, wcscoll) #endif diff --git a/wcsmbs/wcscoll_l.c b/wcsmbs/wcscoll_l.c index 9f60cee9ea..6d9384ad64 100644 --- a/wcsmbs/wcscoll_l.c +++ b/wcsmbs/wcscoll_l.c @@ -24,7 +24,7 @@ #define USTRING_TYPE wint_t #define STRCOLL __wcscoll_l #define STRDIFF __wcsdiff -#define STRCMP wcscmp +#define STRCMP __wcscmp #define WEIGHT_H "../locale/weightwc.h" #define SUFFIX WC #define L(arg) L##arg |