From a49f57629f4e6cf1966627015f4f10d3ca47ddfc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 3 Mar 2003 09:45:25 +0000 Subject: * sysdeps/ia64/dl-fptr.c (__ia64_make_fptr): Revert last change. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/dl-symaddr.c (_dl_symbol_address): Remove const from argument type. * sysdeps/ia64/dl-lookupcfg.h: Update decl. * sysdeps/wordsize-64/strtol_l.c (strtoll_l): Define as weak alias. * sysdeps/wordsize-64/strtoul_l.c (strtoull_l): Define as weak alias. * locale/Versions (libc: GLIBC_2.3): Move those to ... * sysdeps/wordsize-32/Versions (libc: GLIBC_2.3): ... here, new file. * sysdeps/wordsize-64/Versions (libc: GLIBC_2.3.3) Likewise. * Versions.def (libc): Add GLIBC_2.3.3 set. --- sysdeps/wordsize-64/Versions | 6 ++++++ sysdeps/wordsize-64/strtol_l.c | 3 +++ sysdeps/wordsize-64/strtoul_l.c | 3 +++ 3 files changed, 12 insertions(+) create mode 100644 sysdeps/wordsize-64/Versions (limited to 'sysdeps/wordsize-64') diff --git a/sysdeps/wordsize-64/Versions b/sysdeps/wordsize-64/Versions new file mode 100644 index 0000000000..0d13186ace --- /dev/null +++ b/sysdeps/wordsize-64/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_2.3.3 { + # These were erroneously omitted for 64-bit platforms in 2.3. + strtoll_l; strtoull_l; + } +} diff --git a/sysdeps/wordsize-64/strtol_l.c b/sysdeps/wordsize-64/strtol_l.c index 1ca48b9183..5a5cd8d0b7 100644 --- a/sysdeps/wordsize-64/strtol_l.c +++ b/sysdeps/wordsize-64/strtol_l.c @@ -1,11 +1,14 @@ /* We have to irritate the compiler a bit. */ #define ____strtoll_l_internal ____strtoll_l_internal_XXX #define __strtoll_l __strtoll_l_XXX +#define strtoll_l strtoll_l_XXX #include #undef ____strtoll_l_internal #undef __strtoll_l +#undef strtoll_l strong_alias (____strtol_l_internal, ____strtoll_l_internal) libc_hidden_ver (____strtol_l_internal, ____strtoll_l_internal) weak_alias (__strtol_l, __strtoll_l) +weak_alias (__strtol_l, strtoll_l) diff --git a/sysdeps/wordsize-64/strtoul_l.c b/sysdeps/wordsize-64/strtoul_l.c index 356a8df98f..9ee00a379a 100644 --- a/sysdeps/wordsize-64/strtoul_l.c +++ b/sysdeps/wordsize-64/strtoul_l.c @@ -1,11 +1,14 @@ /* We have to irritate the compiler a bit. */ #define ____strtoull_l_internal ____strtoull_l_internal_XXX #define __strtoull_l __strtoull_l_XXX +#define strtoull_l strtoull_l_XXX #include #undef ____strtoull_l_internal #undef __strtoull_l +#undef strtoull_l strong_alias (____strtoul_l_internal, ____strtoull_l_internal) libc_hidden_ver (____strtoul_l_internal, ____strtoull_l_internal) weak_alias (__strtoul_l, __strtoull_l) +weak_alias (__strtoul_l, strtoull_l) -- cgit 1.4.1