diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:23:09 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-02 20:23:09 +0000 |
| commit | bb4acb522c9206b8476a88be44606bf1bc1e96f6 (patch) | |
| tree | 70c177bb3a964f12862f22969b4f0726a94e15e5 /include | |
| parent | 6cfae52edfb487ca3b78336a061acb6694338f72 (diff) | |
| download | glibc-bb4acb522c9206b8476a88be44606bf1bc1e96f6.tar glibc-bb4acb522c9206b8476a88be44606bf1bc1e96f6.tar.gz glibc-bb4acb522c9206b8476a88be44606bf1bc1e96f6.tar.bz2 glibc-bb4acb522c9206b8476a88be44606bf1bc1e96f6.zip | |
Fix fnmatch towlower namespace (bug 18469).
fnmatch brings in references to towlower (and thereby towupper), which
isn't in all the standards that contain fnmatch, resulting in
linknamespace test failures. (This is contrary to glibc conventions,
rather than a standards conformance issue, because of the to*
reservation.) This patch fixes this in the usual way, making those
functions into weak aliases.
Tested for x86_64 and x86 (testsuite, and that disassembly of
installed shared libraries is unchanged by the patch). This is on top
of <https://sourceware.org/ml/libc-alpha/2015-06/msg00019.html>, but
the two patches should be independent.
(The __attribute_pure__ on the declarations in include/wctype.h comes
from GCC's built-in attributes for towlower and towupper, and is
needed to get the same code generation for fnmatch before and after
the patch. It seems likely there are cases where the declaration of
__foo in the internal headers is missing attributes from foo in the
public headers, built-in to GCC or both, but I don't know a good way
to detect such missing attributes.)
[BZ #18469]
* wctype/wcfuncs.c (towlower): Rename to __towlower and define as
weak alias of __towlower. Use libc_hidden_weak.
(towupper): Rename to __towupper and define as weak alias of
__towupper. Use libc_hidden_weak.
* include/wctype.h (__towlower): Declare. Use libc_hidden_proto.
(__towupper): Likewise.
* posix/fnmatch.c [HANDLE_MULTIBYTE && _LIBC] (FOLD): Use
__towlower instead of towlower.
Diffstat (limited to 'include')
| -rw-r--r-- | include/wctype.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/wctype.h b/include/wctype.h index b29e82484b..88c78e62a0 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -60,6 +60,8 @@ extern __typeof (iswupper_l) __iswupper_l; extern __typeof (iswxdigit_l) __iswxdigit_l; extern __typeof (towlower_l) __towlower_l; extern __typeof (towupper_l) __towupper_l; +extern __typeof (towlower) __towlower __THROW __attribute_pure__; +extern __typeof (towupper) __towupper __THROW __attribute_pure__; libc_hidden_proto (__towctrans) libc_hidden_proto (__iswctype) @@ -77,6 +79,8 @@ libc_hidden_proto (__iswupper_l) libc_hidden_proto (__iswxdigit_l) libc_hidden_proto (__towlower_l) libc_hidden_proto (__towupper_l) +libc_hidden_proto (__towlower) +libc_hidden_proto (__towupper) /* The spec says that isdigit must only match the decimal digits. We can check this without a memory access. */ |