Update.

2001-01-04  Ulrich Drepper  <drepper@redhat.com>

	* Versions.def (ld): Add GLIBC_2.2.

	* catgets/gencat.c: Copyright 2001.
	* csu/version.c: Likewise.
	* debug/catchsegv.sh: Likewise.
	* debug/xtrace.sh: Likewise.
	* elf/ldconfig.c: Likewise.
	* elf/sprof.c: Likewise.
	* iconv/iconv_prog.c: Likewise.
	* locale/locale.c: Likewise.
	* locale/localedef.c: Likewise.
	* malloc/memusage.sh: Likewise.
	* malloc/mtrace.pl: Likewise.
	* nscd/nscd.c: Likewise.
	* posix/getconf.c: Likewise.

2001-01-04  Mark Kettenis  <kettenis@gnu.org>

	* include/stdio.h: Only provide __getwc_unlocked prototype if
	USE_IN_LIBIO is defined.

2001-01-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/socket.S (__socket): Fix error code
	handling.

2001-01-03  Andreas Schwab  <schwab@suse.de>

	* sysdeps/generic/strtoll.c: Remove unused __strtoq_internal alias.
	* sysdeps/generic/strtoull.c: Remove unused __strtouq_internal alias.

	* sysdeps/wordsize-64/strtol.c: Add strtoq alias and fix strtoll alias.
	* sysdeps/wordsize-64/strtoul.c: Add strtouq alias and fix
	strtoull alias.
	* sysdeps/wordsize-64/wcstol.c: Add wcstoq alias and fix wcstoll alias.
	* sysdeps/wordsize-64/wcstoul.c: Add wcstouq alias and fix
	wcstoull alias.

	* sysdeps/generic/strtoul.c: Make sure we find strtol.c in this
	directory.
	* sysdeps/generic/strtol_l.c: Likewise.
	* sysdeps/generic/strtoul_l.c: Likewise.
	* sysdeps/generic/wcstoul.c: Likewise, for wcstol.c.

	* sysdeps/wordsize-64/strtol_l.c: Fix alias.
	* sysdeps/wordsize-64/strtoul_l.c: Likewise.
	* sysdeps/wordsize-64/wcstol_l.c: Fix alias.
	* sysdeps/wordsize-64/wcstoul_l.c: Likewise.

30 files changed, 103 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c0634e..122e1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2001-01-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* Versions.def (ld): Add GLIBC_2.2.
+
+	* catgets/gencat.c: Copyright 2001.
+	* csu/version.c: Likewise.
+	* debug/catchsegv.sh: Likewise.
+	* debug/xtrace.sh: Likewise.
+	* elf/ldconfig.c: Likewise.
+	* elf/sprof.c: Likewise.
+	* iconv/iconv_prog.c: Likewise.
+	* locale/locale.c: Likewise.
+	* locale/localedef.c: Likewise.
+	* malloc/memusage.sh: Likewise.
+	* malloc/mtrace.pl: Likewise.
+	* nscd/nscd.c: Likewise.
+	* posix/getconf.c: Likewise.
+
+2001-01-04  Mark Kettenis  <kettenis@gnu.org>
+
+	* include/stdio.h: Only provide __getwc_unlocked prototype if
+	USE_IN_LIBIO is defined.
+
+2001-01-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/unix/sysv/linux/sh/socket.S (__socket): Fix error code
+	handling.
+
+2001-01-03  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/generic/strtoll.c: Remove unused __strtoq_internal alias.
+	* sysdeps/generic/strtoull.c: Remove unused __strtouq_internal alias.
+
+	* sysdeps/wordsize-64/strtol.c: Add strtoq alias and fix strtoll alias.
+	* sysdeps/wordsize-64/strtoul.c: Add strtouq alias and fix
+	strtoull alias.
+	* sysdeps/wordsize-64/wcstol.c: Add wcstoq alias and fix wcstoll alias.
+	* sysdeps/wordsize-64/wcstoul.c: Add wcstouq alias and fix
+	wcstoull alias.
+
+	* sysdeps/generic/strtoul.c: Make sure we find strtol.c in this
+	directory.
+	* sysdeps/generic/strtol_l.c: Likewise.
+	* sysdeps/generic/strtoul_l.c: Likewise.
+	* sysdeps/generic/wcstoul.c: Likewise, for wcstol.c.
+
+	* sysdeps/wordsize-64/strtol_l.c: Fix alias.
+	* sysdeps/wordsize-64/strtoul_l.c: Likewise.
+	* sysdeps/wordsize-64/wcstol_l.c: Fix alias.
+	* sysdeps/wordsize-64/wcstoul_l.c: Likewise.
+
 2001-01-04  Andreas Jaeger  <aj@suse.de>
 
 	* nss/nsswitch.c: Include files for missing prototypes, remove
diff --git a/Versions.def b/Versions.def
index 2ab35e9..a57ec50 100644
--- a/Versions.def
+++ b/Versions.def
@@ -85,6 +85,7 @@ ld {
   GLIBC_2.0
   GLIBC_2.1
   GLIBC_2.1.1
+  GLIBC_2.2
 }
 libthread_db {
   GLIBC_2.1.3
diff --git a/catgets/gencat.c b/catgets/gencat.c
index 43988e7..60af70b 100644
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 1996.
 
@@ -247,7 +247,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/csu/version.c b/csu/version.c
index a3af346..c7968c9 100644
--- a/csu/version.c
+++ b/csu/version.c
@@ -24,7 +24,7 @@ static const char __libc_version[] = VERSION;
 
 static const char banner[] =
 "GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\
-Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.\n\
+Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n\
diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh
index 0e8c36c..56f19c4 100755
--- a/debug/catchsegv.sh
+++ b/debug/catchsegv.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -39,7 +39,7 @@ if test $# -eq 0; then
       ;;
     --v | --ve | --ver | --vers | --versi | --versio | --version)
       echo 'catchsegv (GNU libc) @VERSION@'
-      echo 'Copyright (C) 1999 Free Software Foundation, Inc.
+      echo 'Copyright (C) 2001 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Ulrich Drepper.'
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index 7faf85b..3c7c7fe 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -1,5 +1,5 @@
 #! @BASH@
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
 
@@ -53,7 +53,7 @@ Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
 
 do_version() {
   echo 'xtrace (GNU libc) @VERSION@'
-  echo $"Copyright (C) 1999 Free Software Foundation, Inc.
+  echo $"Copyright (C) 2001 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Ulrich Drepper."
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 9ee5a7d48..f3f51e3 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -265,7 +265,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"),
 	   "Andreas Jaeger");
 }
diff --git a/elf/sprof.c b/elf/sprof.c
index a4de9f4..2dccf8f 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -1,5 +1,5 @@
 /* Read and display shared object profiling data.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -357,7 +357,7 @@ Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),
-	   "2000");
+	   "2001");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 1470721..644b15b 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -1,5 +1,5 @@
 /* Convert text in given files from the specified from-set to the to-set.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -352,7 +352,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/include/stdio.h b/include/stdio.h
index e4ae353..4fe3bb0 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -66,7 +66,9 @@ extern void __funlockfile (FILE *__stream);
 extern int __ftrylockfile (FILE *__stream);
 
 extern int __getc_unlocked (FILE *__fp);
+#  ifdef USE_IN_LIBIO
 extern wint_t __getwc_unlocked (FILE *__fp);
+#  endif
 
 
 # endif
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 823be8d..c8734b8 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -1,5 +1,5 @@
 /* Implementation of the locale program according to POSIX 9945-2.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -270,7 +270,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 0a60d5c..197e61e 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -312,7 +312,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index 744991f..70595e8 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -1,5 +1,5 @@
 #! @BASH@
-# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999.
 
@@ -65,7 +65,7 @@ Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
 
 do_version() {
   echo 'memusage (GNU libc) @VERSION@'
-  echo $"Copyright (C) 2000 Free Software Foundation, Inc.
+  echo $"Copyright (C) 2001 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Ulrich Drepper."
diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl
index 8be50f4..8647a69 100644
--- a/malloc/mtrace.pl
+++ b/malloc/mtrace.pl
@@ -1,7 +1,7 @@
 #! @PERL@
 eval "exec @PERL@ -S $0 $*"
     if 0;
-# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@gnu.org>, 1997.
 # Based on the mtrace.awk script.
@@ -44,7 +44,7 @@ arglist: while (@ARGV) {
 	$ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
 	$ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
 	print "mtrace (GNU $PACKAGE) $VERSION\n";
-	print "Copyright (C) 1999 Free Software Foundation, Inc.\n";
+	print "Copyright (C) 2001 Free Software Foundation, Inc.\n";
 	print "This is free software; see the source for copying conditions.  There is NO\n";
 	print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
 	print "Written by Ulrich Drepper <drepper\@gnu.org>\n";
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 409f9c1..a67da74 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
@@ -288,7 +288,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2000");
+"), "2001");
   fprintf (stream, gettext ("Written by %s.\n"),
 	   "Thorsten Kukuk and Ulrich Drepper");
 }
diff --git a/posix/getconf.c b/posix/getconf.c
index 52cfc7d..a1eb7ae 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 1995-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -752,7 +752,7 @@ main (int argc, char *argv[])
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1999");
+"), "2001");
       fprintf (stderr, gettext ("Written by %s.\n"), "Roland McGrath");
       return 0;
     }
diff --git a/sysdeps/generic/strtol_l.c b/sysdeps/generic/strtol_l.c
index f6f9bd8..1d750a1 100644
--- a/sysdeps/generic/strtol_l.c
+++ b/sysdeps/generic/strtol_l.c
@@ -25,4 +25,4 @@
 extern long int ____strtol_l_internal (const char *, char **, int, int,
 				       __locale_t);
 
-#include <strtol.c>
+#include "strtol.c"
diff --git a/sysdeps/generic/strtoll.c b/sysdeps/generic/strtoll.c
index cfa98c8..e507abb 100644
--- a/sysdeps/generic/strtoll.c
+++ b/sysdeps/generic/strtoll.c
@@ -21,5 +21,4 @@
 
 #include <strtol.c>
 
-strong_alias (__strtoll_internal, __strtoq_internal)
 weak_alias (strtoll, strtoq)
diff --git a/sysdeps/generic/strtoul.c b/sysdeps/generic/strtoul.c
index f1e0e16..ca0fb1f 100644
--- a/sysdeps/generic/strtoul.c
+++ b/sysdeps/generic/strtoul.c
@@ -18,4 +18,4 @@
 
 #define	UNSIGNED	1
 
-#include <strtol.c>
+#include "strtol.c"
diff --git a/sysdeps/generic/strtoul_l.c b/sysdeps/generic/strtoul_l.c
index c64c0c0..a915d36 100644
--- a/sysdeps/generic/strtoul_l.c
+++ b/sysdeps/generic/strtoul_l.c
@@ -25,4 +25,4 @@
 extern unsigned long int ____strtoul_l_internal (const char *, char **, int,
 						 int, __locale_t);
 
-#include <strtoul.c>
+#include "strtoul.c"
diff --git a/sysdeps/generic/strtoull.c b/sysdeps/generic/strtoull.c
index 80ccf91..5ec3756 100644
--- a/sysdeps/generic/strtoull.c
+++ b/sysdeps/generic/strtoull.c
@@ -22,6 +22,5 @@
 #include <strtoul.c>
 
 #ifdef _LIBC
-strong_alias (__strtoull_internal, __strtouq_internal)
 weak_alias (strtoull, strtouq)
 #endif
diff --git a/sysdeps/generic/wcstol_l.c b/sysdeps/generic/wcstol_l.c
index abe7a98..a7110a1 100644
--- a/sysdeps/generic/wcstol_l.c
+++ b/sysdeps/generic/wcstol_l.c
@@ -27,4 +27,4 @@
 extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int,
 				       __locale_t);
 
-#include <wcstol.c>
+#include "wcstol.c"
diff --git a/sysdeps/wordsize-64/strtol.c b/sysdeps/wordsize-64/strtol.c
index 2a18f7a..4ffbca6 100644
--- a/sysdeps/wordsize-64/strtol.c
+++ b/sysdeps/wordsize-64/strtol.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __strtoll_internal __strtoll_internal_XXX
 #define strtoll strtoll_XXX
+#define strtoq strtoq_XXX
 
 #include <sysdeps/generic/strtol.c>
 
 #undef __strtoll_internal
 #undef strtoll
+#undef strtoq
 strong_alias (__strtol_internal, __strtoll_internal)
-weak_alias (__strtoll_internal, strtoll)
+weak_alias (strtol, strtoll)
+weak_alias (strtol, strtoq)
diff --git a/sysdeps/wordsize-64/strtol_l.c b/sysdeps/wordsize-64/strtol_l.c
index a2de024..a3f519f 100644
--- a/sysdeps/wordsize-64/strtol_l.c
+++ b/sysdeps/wordsize-64/strtol_l.c
@@ -7,4 +7,4 @@
 #undef ____strtoll_l_internal
 #undef __strtoll_l
 strong_alias (____strtol_l_internal, ____strtoll_l_internal)
-weak_alias (____strtoll_l_internal, __strtoll_l)
+weak_alias (__strtol_l, __strtoll_l)
diff --git a/sysdeps/wordsize-64/strtoul.c b/sysdeps/wordsize-64/strtoul.c
index 838474f..0e82c4c 100644
--- a/sysdeps/wordsize-64/strtoul.c
+++ b/sysdeps/wordsize-64/strtoul.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __strtoull_internal __strtoull_internal_XXX
 #define strtoull strtoull_XXX
+#define strtouq strtouq_XXX
 
 #include <sysdeps/generic/strtoul.c>
 
 #undef __strtoull_internal
 #undef strtoull
+#undef strtouq
 strong_alias (__strtoul_internal, __strtoull_internal)
-weak_alias (__strtoull_internal, strtoull)
+weak_alias (strtoul, strtoull)
+weak_alias (strtoul, strtouq)
diff --git a/sysdeps/wordsize-64/strtoul_l.c b/sysdeps/wordsize-64/strtoul_l.c
index 2997afa..a590829 100644
--- a/sysdeps/wordsize-64/strtoul_l.c
+++ b/sysdeps/wordsize-64/strtoul_l.c
@@ -7,4 +7,4 @@
 #undef ____strtoull_l_internal
 #undef __strtoull_l
 strong_alias (____strtoul_l_internal, ____strtoull_l_internal)
-weak_alias (____strtoull_l_internal, __strtoull_l)
+weak_alias (__strtoul_l, __strtoull_l)
diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c
index f7873b7..fcfbcf3 100644
--- a/sysdeps/wordsize-64/wcstol.c
+++ b/sysdeps/wordsize-64/wcstol.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __wcstoll_internal __wcstoll_internal_XXX
 #define wcstoll wcstoll_XXX
+#define wcstoq wcstoq_XXX
 
 #include <sysdeps/generic/wcstol.c>
 
 #undef __wcstoll_internal
 #undef wcstoll
+#undef wcstoq
 strong_alias (__wcstol_internal, __wcstoll_internal)
-weak_alias (__wcstoll_internal, wcstoll)
+weak_alias (wcstol, wcstoll)
+weak_alias (wcstol, wcstoq)
diff --git a/sysdeps/wordsize-64/wcstol_l.c b/sysdeps/wordsize-64/wcstol_l.c
index acfd046..06bf40e 100644
--- a/sysdeps/wordsize-64/wcstol_l.c
+++ b/sysdeps/wordsize-64/wcstol_l.c
@@ -7,4 +7,4 @@
 #undef ____wcstoll_l_internal
 #undef __wcstoll_l
 strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
-weak_alias (____wcstoll_l_internal, __wcstoll_l)
+weak_alias (__wcstol_l, __wcstoll_l)
diff --git a/sysdeps/wordsize-64/wcstoul.c b/sysdeps/wordsize-64/wcstoul.c
index 235e1e3..a6c5fd9 100644
--- a/sysdeps/wordsize-64/wcstoul.c
+++ b/sysdeps/wordsize-64/wcstoul.c
@@ -1,10 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define __wcstoull_internal __wcstoull_internal_XXX
 #define wcstoull wcstoull_XXX
+#define wcstouq wcstouq_XXX
 
 #include <sysdeps/generic/wcstoul.c>
 
 #undef __wcstoull_internal
 #undef wcstoull
+#undef wcstouq
 strong_alias (__wcstoul_internal, __wcstoull_internal)
-weak_alias (__wcstoull_internal, wcstoull)
+weak_alias (wcstoul, wcstoull)
+weak_alias (wcstoul, wcstouq)
diff --git a/sysdeps/wordsize-64/wcstoul_l.c b/sysdeps/wordsize-64/wcstoul_l.c
index 24e54df..2289caf 100644
--- a/sysdeps/wordsize-64/wcstoul_l.c
+++ b/sysdeps/wordsize-64/wcstoul_l.c
@@ -7,4 +7,4 @@
 #undef ____wcstoull_l_internal
 #undef __wcstoull_l
 strong_alias (____wcstoul_l_internal, ____wcstoull_l_internal)
-weak_alias (____wcstoull_l_internal, __wcstoull_l)
+weak_alias (__wcstoul_l, __wcstoull_l)