* 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.

7 files changed, 35 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index cb72f13..9f668f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2003-03-03  Roland McGrath  <roland@redhat.com>
 
+	* 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/ia64/dl-fptr.c (__ia64_make_fptr): Add const to MAP arg.
 	* sysdeps/ia64/dl-machine.h: Update decl.
 
diff --git a/Versions.def b/Versions.def
index e07e306..aa31657 100644
--- a/Versions.def
+++ b/Versions.def
@@ -18,6 +18,7 @@ libc {
   GLIBC_2.3
   GLIBC_2.3.1
   GLIBC_2.3.2
+  GLIBC_2.3.3
 %ifdef USE_IN_LIBIO
   HURD_CTHREADS_0.3
 %endif
diff --git a/locale/Versions b/locale/Versions
index 3a69dae..7211934 100644
--- a/locale/Versions
+++ b/locale/Versions
@@ -59,13 +59,12 @@ libc {
     iswcntrl_l; iswctype_l; iswdigit_l; iswgraph_l; iswlower_l;
     iswprint_l; iswpunct_l; iswspace_l; iswupper_l; iswxdigit_l;
     isxdigit_l; strcasecmp_l; strcoll_l; strfmon_l; strncasecmp_l;
-    strtod_l; strtof_l; strtol_l; strtold_l; strtoll_l; strtoul_l;
-    strtoull_l; strxfrm_l; toascii_l; tolower_l; toupper_l;
+    strtod_l; strtof_l; strtol_l; strtold_l; strtoul_l;
+    strxfrm_l; toascii_l; tolower_l; toupper_l;
     towctrans_l; towlower_l; towupper_l; wcscasecmp_l; wcscoll_l;
     wcsncasecmp_l; wcstod_l; wcstof_l; wcstol_l; wcstold_l;
     wcstoll_l; wcstoul_l; wcstoull_l; wcsxfrm_l; wctype_l;
     wctrans_l; nl_langinfo_l;
-
   }
   GLIBC_PRIVATE {
     # global variables
diff --git a/sysdeps/wordsize-32/Versions b/sysdeps/wordsize-32/Versions
new file mode 100644
index 0000000..e950290
--- /dev/null
+++ b/sysdeps/wordsize-32/Versions
@@ -0,0 +1,7 @@
+libc {
+  GLIBC_2.3 {
+    # These were erroneously omitted for 64-bit platforms in 2.3
+    # and so we don't put them in locale/Versions.
+    strtoll_l; strtoull_l;
+  }
+}
diff --git a/sysdeps/wordsize-64/Versions b/sysdeps/wordsize-64/Versions
new file mode 100644
index 0000000..0d13186
--- /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 1ca48b9..5a5cd8d 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 <sysdeps/generic/strtol_l.c>
 
 #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 356a8df..9ee00a3 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 <sysdeps/generic/strtoul_l.c>
 
 #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)