diff options
| author |   Joseph Myers <joseph@codesourcery.com> | 2014-11-13 19:50:55 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-13 19:50:55 +0000 |
| commit | 2a1cfd94a26e0fa96d8f284897213b65c60142d6 (patch) | |
| tree | 4ea3d0832469c75ddf3cc5d147f96a15e6c98868 /stdlib | |
| parent | S/390: dl-machine.h: Use numbered labels in inline assembly. (diff) | |
| download | glibc-2a1cfd94a26e0fa96d8f284897213b65c60142d6.tar.gz glibc-2a1cfd94a26e0fa96d8f284897213b65c60142d6.tar.bz2 glibc-2a1cfd94a26e0fa96d8f284897213b65c60142d6.zip | |
Fix strtoll / strtoull namespace for 32-bit (bug 17594).
For 32-bit platforms, strtoll and strtoull are strong symbols in libc,
but they are not in ISO C90, and are brought in by references to
__strtoll_internal / __strtoull_internal from scanf. (For 64-bit
platforms, they are properly weak.) This patch makes them weak for
32-bit (it has a side-effect of making other symbols weak that don't
need to be weak, such as strtol, but that's harmless).
Tested for x86 (testsuite, and that the disassembly of installed
shared libraries is unchanged by the patch). This fixes all 120
unXFAILed FAILs of the new linknamespace tests seen for x86 (in fact,
there are now seven XPASSes of those tests for x86
XPASS: conform/POSIX2008/fcntl.h/linknamespace
XPASS: conform/UNIX98/libgen.h/linknamespace
XPASS: conform/XOPEN2K/fcntl.h/linknamespace
XPASS: conform/XOPEN2K/libgen.h/linknamespace
XPASS: conform/XOPEN2K8/fcntl.h/linknamespace
XPASS: conform/XOPEN2K8/libgen.h/linknamespace
XPASS: conform/XPG4/libgen.h/linknamespace
so suggesting that the failures seen for those on x86_64 are in some
way architecture-specific or 64-bit-specific).
[BZ #17594]
* stdlib/strtol.c (SYM__): New macro.
(SYM__1): Likewise.
(__strtol): Likewise.
(strtol): Rename to __strtol and define as weak alias of
__strtol. Use libc_hidden_weak.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/strtol.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/stdlib/strtol.c b/stdlib/strtol.c index f97fc440a5..bd59180595 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -82,6 +82,10 @@ #define INTERNAL(X) INTERNAL1(X) #define INTERNAL1(X) __##X##_internal +#define SYM__(X) SYM__1 (X) +#define SYM__1(X) __ ## X +#define __strtol SYM__ (strtol) + extern INT INTERNAL (__strtol_l) (const STRING_TYPE *, STRING_TYPE **, int, int, __locale_t); @@ -100,11 +104,12 @@ libc_hidden_def (INTERNAL (strtol)) INT -strtol (nptr, endptr, base) +__strtol (nptr, endptr, base) const STRING_TYPE *nptr; STRING_TYPE **endptr; int base; { return INTERNAL (__strtol_l) (nptr, endptr, base, 0, _NL_CURRENT_LOCALE); } -libc_hidden_def (strtol) +weak_alias (__strtol, strtol) +libc_hidden_weak (strtol) |