Update.

	* sysdeps/generic/ldsodefs.h (__rtld_global_attribute__): Define.
	(_rtld_global): Use it.

	* sysdeps/gnu/Dist: Remove errlist-compat.c.
	* sysdeps/gnu/Makefile (errlist-compat.c): Build this file in the
	object directory.  Pass all Versions files to the awk script.
	* sysdeps/gnu/errlist-compat.c: Removed.
	* sysdeps/gnu/errlist.awk: Use #errlist-compat comments from the
	first Versions file in the search path which has them.
	Allow multiple errlist symbol versions to have the same count of
	errors.
	* sysdeps/gnu/errlist-compat.awk: Include <errlist-compat.c> instead
	of "errlist-compat.c".
	* sysdeps/gnu/errlist.c: Regenerated.
	* sysdeps/unix/sysv/linux/mips/Versions (libc): Add #errlist-compat
	comments at GLIBC_2.0, GLIBC_2.1 and GLIBC_2.3.
	* sysdeps/unix/sysv/linux/alpha/Versions: Likewise.
	(librt): Add aio_cancel and aio_cancel64 as GLIBC_2.3.
	* sysdeps/unix/sysv/linux/hppa/Versions: Likewise.
	* sysdeps/unix/sysv/linux/sparc/Versions: New file.
	* sysdeps/unix/sysv/linux/alpha/bits/errno.h: New file.
	* sysdeps/unix/sysv/linux/hppa/bits/errno.h (ECANCELED): Define to
	ECANCELLED if not defined by kernel headers.
	* sysdeps/unix/sysv/linux/bits/errno.h: Don't redefine ECANCELED if
	already defined by kernel headers.
	* sysdeps/unix/sysv/linux/sparc/bits/errno.h: New file.
	* sysdeps/pthread/aio_cancel.c: Don't include aio.h and its
	aio_cancel64 renaming hack nor provide weak_alias if aio_cancel
	is a macro.
	* Versions.def (GLIBC_2.3) [librt]: Add.

	* sysdeps/unix/sysv/linux/alpha/pipe.S: New file.

2002-08-28  Ulrich Drepper  <drepper@redhat.com>

	* include/libc-symbols.h [!__ASSEMBLER__] (declare_symbol_1): Add
	missing comma to .type directive.

2002-08-28  Jakub Jelinek  <jakub@redhat.com>

23 files changed, 385 insertions, 80 deletions

diff --git a/ChangeLog b/ChangeLog
index 394559105e..b40ffe9786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,46 @@
 
 2002-08-28  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/generic/ldsodefs.h (__rtld_global_attribute__): Define.
+	(_rtld_global): Use it.
+
+	* sysdeps/gnu/Dist: Remove errlist-compat.c.
+	* sysdeps/gnu/Makefile (errlist-compat.c): Build this file in the
+	object directory.  Pass all Versions files to the awk script.
+	* sysdeps/gnu/errlist-compat.c: Removed.
+	* sysdeps/gnu/errlist.awk: Use #errlist-compat comments from the
+	first Versions file in the search path which has them.
+	Allow multiple errlist symbol versions to have the same count of
+	errors.
+	* sysdeps/gnu/errlist-compat.awk: Include <errlist-compat.c> instead
+	of "errlist-compat.c".
+	* sysdeps/gnu/errlist.c: Regenerated.
+	* sysdeps/unix/sysv/linux/mips/Versions (libc): Add #errlist-compat
+	comments at GLIBC_2.0, GLIBC_2.1 and GLIBC_2.3.
+	* sysdeps/unix/sysv/linux/alpha/Versions: Likewise.
+	(librt): Add aio_cancel and aio_cancel64 as GLIBC_2.3.
+	* sysdeps/unix/sysv/linux/hppa/Versions: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/Versions: New file.
+	* sysdeps/unix/sysv/linux/alpha/bits/errno.h: New file.
+	* sysdeps/unix/sysv/linux/hppa/bits/errno.h (ECANCELED): Define to
+	ECANCELLED if not defined by kernel headers.
+	* sysdeps/unix/sysv/linux/bits/errno.h: Don't redefine ECANCELED if
+	already defined by kernel headers.
+	* sysdeps/unix/sysv/linux/sparc/bits/errno.h: New file.
+	* sysdeps/pthread/aio_cancel.c: Don't include aio.h and its
+	aio_cancel64 renaming hack nor provide weak_alias if aio_cancel
+	is a macro.
+	* Versions.def (GLIBC_2.3) [librt]: Add.
+
+	* sysdeps/unix/sysv/linux/alpha/pipe.S: New file.
+
+2002-08-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/libc-symbols.h [!__ASSEMBLER__] (declare_symbol_1): Add
+	missing comma to .type directive.
+
+2002-08-28  Jakub Jelinek  <jakub@redhat.com>
+
 	* sysdeps/ia64/elf/configure.in (PI_STATIC_AND_HIDDEN): Define
 	unconditionally.
 	* sysdeps/alpha/elf/configure.in (libc_cv_alpha_hidden_gprel): New
diff --git a/Versions.def b/Versions.def
index e90eeeb759..de3ef03625 100644
--- a/Versions.def
+++ b/Versions.def
@@ -78,6 +78,7 @@ libresolv {
 librt {
   GLIBC_2.1
   GLIBC_2.2
+  GLIBC_2.3
 }
 libutil {
   GLIBC_2.0
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 434e7c7182..1091ce6cdf 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/hppa/aio_cancel.c: New file.
+	* sysdeps/unix/sysv/linux/sparc/aio_cancel.c: New file.
+	* sysdeps/unix/sysv/linux/alpha/aio_cancel.c: New file.
+
 2002-08-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/timer_routines.c (thread_func): Change return
@@ -14,7 +20,7 @@
 	__pthread_handles[0] and __pthread_handles[1].
 	* Makefile (libpthread-routines): Add pthandles (must be last).
 
-2002-08-26  Brian Youmans <3diff@gnu.org>
+2002-08-26  Brian Youmans  <3diff@gnu.org>
 
 	* Examples/ex10.c: Corrected version number in Lesser GPL copying
 	permission notice from 2 to 2.1.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/alpha/aio_cancel.c b/linuxthreads/sysdeps/unix/sysv/linux/alpha/aio_cancel.c
new file mode 100644
index 0000000000..0d6da82919
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/alpha/aio_cancel.c
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel	__new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel	__old_aio_cancel
+#define ECANCELED	125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/hppa/aio_cancel.c b/linuxthreads/sysdeps/unix/sysv/linux/hppa/aio_cancel.c
new file mode 100644
index 0000000000..0d6da82919
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/hppa/aio_cancel.c
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel	__new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel	__old_aio_cancel
+#define ECANCELED	125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/aio_cancel.c b/linuxthreads/sysdeps/unix/sysv/linux/sparc/aio_cancel.c
new file mode 100644
index 0000000000..0d6da82919
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/aio_cancel.c
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel	__new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel	__old_aio_cancel
+#define ECANCELED	125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 06e68c25c3..0d85506ea3 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -374,12 +374,14 @@ struct rtld_global
   EXTERN struct link_map _dl_rtld_map;
 #ifdef SHARED
 };
-extern struct rtld_global _rtld_global;
+# define __rtld_global_attribute__
 # ifdef IS_IN_rtld
 #  ifdef HAVE_VISIBILITY_ATTRIBUTE
 #   ifdef HAVE_SDATA_SECTION
 #    define __rtld_local_attribute__ \
 	    __attribute__ ((visibility ("hidden"), section (".sdata")))
+#    undef __rtld_global_attribute__
+#    define __rtld_global_attribute__ __attribute__ ((section (".sdata")))
 #   else
 #    define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
 #   endif
@@ -388,6 +390,7 @@ extern struct rtld_global _rtld_global;
 #  endif
 extern struct rtld_global _rtld_local __rtld_local_attribute__;
 # endif
+extern struct rtld_global _rtld_global __rtld_global_attribute__;
 #endif
 #undef EXTERN
 
diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
index 9442793f71..526c79b838 100644
--- a/sysdeps/gnu/Dist
+++ b/sysdeps/gnu/Dist
@@ -1,5 +1,4 @@
 errlist.awk
-errlist-compat.c
 errlist-compat.awk
 utmpx.h
 bits/utmpx.h
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 65b9258507..048e36a415 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -29,24 +29,24 @@ ifeq ($(with-cvs),yes)
 	test ! -d CVS || cvs commit -m'Regenerated from $^' $@
 endif
 
+ifeq ($(subdir),stdio-common)
+
 vpath errlist.c $(full_config_sysdirs)
-$(..)sysdeps/gnu/errlist-compat.c: errlist.c \
+$(objpfx)errlist-compat.c: errlist.c \
 				   $(..)sysdeps/gnu/errlist-compat.awk \
-				   $(..)sysdeps/gnu/Versions
+				   $(common-objpfx)Versions.v.i
 	$(AWK) -v maxerr=`\
 	  $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DEMIT_ERR_MAX $< -o - \
 	  | sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
-	       -f $(filter-out $<,$^) > $@T
+	       -f $(..)sysdeps/gnu/errlist-compat.awk \
+	       $(wildcard $(patsubst %,$(..)%/Versions,\
+		 $(config-sysdirs) $(add-ons))) > $@T
 # Make it unwritable so noone will edit it by mistake.
 	-chmod a-w $@T
 	mv -f $@T $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs commit -m'Regenerated from $^' $@
-endif
 
-ifeq ($(subdir),stdio-common)
 # This will force the generation above to happy if need be.
-$(objpfx)errlist.d: $(..)sysdeps/gnu/errlist-compat.c
+$(objpfx)errlist.d: $(objpfx)errlist-compat.c
 endif
 
 ifeq ($(subdir),login)
diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
index 88b4d4f126..c9a7a9cc44 100644
--- a/sysdeps/gnu/errlist-compat.awk
+++ b/sysdeps/gnu/errlist-compat.awk
@@ -29,19 +29,25 @@
 # necessary compatibility symbols for older, smaller versions of sys_errlist.
 #
 
-BEGIN { highest = 0 }
-
 # These two rules catch the Versions file contents.
 NF == 2 && $2 == "{" { last_version = $1; next }
 $1 == "#errlist-compat" {
-  n = $2 + 0;
-  if (n < 100) {
+  # Don't process any further Versions files
+  ARGC = ARGIND + 1;
+  cnt = $2 + 0;
+  if (cnt < 100) {
     print "*** this line seems bogus:", $0 > "/dev/stderr";
     exit 1;
   }
-  version[n] = last_version;
-  if (n > highest)
-    highest = n;
+  version[pos + 0] = cnt SUBSEP last_version;
+  pos++;
+  if (cnt < highest) {
+    printf "*** %s #errlist-compat counts are not sorted\n", ARGV[ARGIND];
+    exit 1;
+  }
+  if (cnt > highest)
+    highest = cnt;
+  highest_version = last_version;
   next;
 }
 
@@ -50,20 +56,20 @@ END {
 
   if (highest != count) {
     printf "*** errlist.c count %d vs Versions sys_errlist@%s count %d\n", \
-      count, version[highest], highest > "/dev/stderr";
+      count, highest_version, highest > "/dev/stderr";
     exit 1;
   }
 
   lastv = "";
-  for (n = 0; n <= count; ++n)
-    if (n in version) {
-      v = version[n];
-      gsub(/[^A-Z0-9_]/, "_", v);
-      if (lastv != "")
-	compat[lastv] = v;
-      lastv = v;
-      vcount[v] = n;
-    }
+  for (n = 0; n < pos; ++n) {
+    split(version[n], t, SUBSEP)
+    v = t[2];
+    gsub(/[^A-Z0-9_]/, "_", v);
+    if (lastv != "")
+      compat[lastv] = v;
+    lastv = v;
+    vcount[v] = t[1];
+  }
 
   print "/* This file was generated by errlist-compat.awk; DO NOT EDIT!  */\n";
   print "#include <shlib-compat.h>\n";
diff --git a/sysdeps/gnu/errlist-compat.c b/sysdeps/gnu/errlist-compat.c
deleted file mode 100644
index 741677bb1b..0000000000
--- a/sysdeps/gnu/errlist-compat.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This file was generated by errlist-compat.awk; DO NOT EDIT!  */
-
-#include <shlib-compat.h>
-
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-# include <bits/wordsize.h>
-extern const char *const __sys_errlist_GLIBC_2_0[];
-const int __sys_nerr_GLIBC_2_0 = 123;
-strong_alias (_sys_errlist_internal, __sys_errlist_GLIBC_2_0)
-declare_symbol (__sys_errlist_GLIBC_2_0, object, __WORDSIZE/8*123)
-compat_symbol (libc, __sys_errlist_GLIBC_2_0, sys_errlist, GLIBC_2_0);
-compat_symbol (libc, __sys_nerr_GLIBC_2_0, sys_nerr, GLIBC_2_0);
-extern const char *const ___sys_errlist_GLIBC_2_0[];
-extern const int __sys_nerr_GLIBC_2_0;
-strong_alias (__sys_errlist_GLIBC_2_0, ___sys_errlist_GLIBC_2_0)
-strong_alias (__sys_nerr_GLIBC_2_0, ___sys_nerr_GLIBC_2_0)
-compat_symbol (libc, ___sys_errlist_GLIBC_2_0, _sys_errlist, GLIBC_2_0);
-compat_symbol (libc, ___sys_nerr_GLIBC_2_0, _sys_nerr, GLIBC_2_0);
-#endif
-
-#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
-# include <bits/wordsize.h>
-extern const char *const __sys_errlist_GLIBC_2_1[];
-const int __sys_nerr_GLIBC_2_1 = 125;
-strong_alias (_sys_errlist_internal, __sys_errlist_GLIBC_2_1)
-declare_symbol (__sys_errlist_GLIBC_2_1, object, __WORDSIZE/8*125)
-compat_symbol (libc, __sys_errlist_GLIBC_2_1, sys_errlist, GLIBC_2_1);
-compat_symbol (libc, __sys_nerr_GLIBC_2_1, sys_nerr, GLIBC_2_1);
-extern const char *const ___sys_errlist_GLIBC_2_1[];
-extern const int __sys_nerr_GLIBC_2_1;
-strong_alias (__sys_errlist_GLIBC_2_1, ___sys_errlist_GLIBC_2_1)
-strong_alias (__sys_nerr_GLIBC_2_1, ___sys_nerr_GLIBC_2_1)
-compat_symbol (libc, ___sys_errlist_GLIBC_2_1, _sys_errlist, GLIBC_2_1);
-compat_symbol (libc, ___sys_nerr_GLIBC_2_1, _sys_nerr, GLIBC_2_1);
-#endif
-
-extern const char *const __sys_errlist_internal[];
-extern const int __sys_nerr_internal;
-strong_alias (_sys_errlist_internal, __sys_errlist_internal)
-strong_alias (_sys_nerr_internal, __sys_nerr_internal)
-versioned_symbol (libc, _sys_errlist_internal, sys_errlist, GLIBC_2_3);
-versioned_symbol (libc, __sys_errlist_internal, _sys_errlist, GLIBC_2_3);
-versioned_symbol (libc, _sys_nerr_internal, sys_nerr, GLIBC_2_3);
-versioned_symbol (libc, __sys_nerr_internal, _sys_nerr, GLIBC_2_3);
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index b9b1291a59..952cb8073c 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -101,7 +101,7 @@ END {
   print "  = sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0];";
   print "";
   print "#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT";
-  print "# include \"errlist-compat.c\"";
+  print "# include <errlist-compat.c>";
   print "#endif";
   print "";
   print "#ifdef EMIT_ERR_MAX";
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 7261a510bf..8131038047 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -1406,7 +1406,7 @@ const int _sys_nerr_internal
   = sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0];
 
 #if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT
-# include "errlist-compat.c"
+# include <errlist-compat.c>
 #endif
 
 #ifdef EMIT_ERR_MAX
diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c
index d62586b903..b2f7be1935 100644
--- a/sysdeps/pthread/aio_cancel.c
+++ b/sysdeps/pthread/aio_cancel.c
@@ -24,10 +24,12 @@
    we want to avoid code duplication by using aliases.  But gcc sees
    the different parameter lists and prints a warning.  We define here
    a function so that aio_cancel64 has no prototype.  */
+#ifndef aio_cancel
 #define aio_cancel64 XXX
 #include <aio.h>
 /* And undo the hack.  */
 #undef aio_cancel64
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -146,4 +148,6 @@ aio_cancel (fildes, aiocbp)
   return result;
 }
 
+#ifndef aio_cancel
 weak_alias (aio_cancel, aio_cancel64)
+#endif
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index c18816ca6f..89ec9db1c4 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -1,5 +1,14 @@
 libc {
+  # The comment lines with "#errlist-compat" are magic; see
+  # sysdeps/gnu/errlist-compat.awk.
+  # When you get an error from errlist-compat.awk, you need to add a new
+  # version here.  Don't do this blindly, since this means changing the ABI
+  # for all GNU/Linux configurations.
+
   GLIBC_2.0 {
+    #errlist-compat	131
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
     # Unfortunately in wider use.
     _inb; _inw; _inl; _outb; _outw; _outl; _bus_base; _bus_base_sparse;
     _hae_shift;
@@ -24,6 +33,9 @@ libc {
     pciconfig_read; pciconfig_write; sethae;
   }
   GLIBC_2.1 {
+    #errlist-compat	131
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
     # Linux/Alpha 64-bit timeval functions.
     __select; select;
     adjtime; adjtimex; __adjtimex;
@@ -57,4 +69,14 @@ libc {
     # w*
     wordexp;
   }
+  GLIBC_2.3 {
+    #errlist-compat	132
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+}
+librt {
+  GLIBC_2.3 {
+    # AIO functions.
+    aio_cancel; aio_cancel64;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/errno.h b/sysdeps/unix/sysv/linux/alpha/bits/errno.h
new file mode 100644
index 0000000000..9cdc167bf7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/bits/errno.h
@@ -0,0 +1,52 @@
+/* Error constants.  Linux/Alpha specific version.
+   Copyright (C) 1996, 1997, 1998, 1999, 2002 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifdef _ERRNO_H
+
+# undef EDOM
+# undef EILSEQ
+# undef ERANGE
+# include <linux/errno.h>
+
+/* Linux has no ENOTSUP error code.  */
+# define ENOTSUP EOPNOTSUPP
+
+# ifndef ECANCELED
+#  define ECANCELED	131
+# endif
+
+# ifndef __ASSEMBLER__
+/* Function to get address of global `errno' variable.  */
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+
+#  if !defined _LIBC || defined _LIBC_REENTRANT
+/* When using threads, errno is a per-thread value.  */
+#   define errno (*__errno_location ())
+#  endif
+# endif /* !__ASSEMBLER__ */
+#endif /* _ERRNO_H */
+
+#if !defined _ERRNO_H && defined __need_Emath
+/* This is ugly but the kernel header is not clean enough.  We must
+   define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
+   defined.  */
+# define EDOM	33	/* Math argument out of domain of function.  */
+# define EILSEQ	116	/* Illegal byte sequence.  */
+# define ERANGE	34	/* Math result not representable.  */
+#endif /* !_ERRNO_H && __need_Emath */
diff --git a/sysdeps/unix/sysv/linux/alpha/pipe.S b/sysdeps/unix/sysv/linux/alpha/pipe.S
new file mode 100644
index 0000000000..1e7ec1c199
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/pipe.S
@@ -0,0 +1 @@
+#include <sysdeps/unix/alpha/pipe.S>
diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h
index 7307c2d6d9..724dabaf10 100644
--- a/sysdeps/unix/sysv/linux/bits/errno.h
+++ b/sysdeps/unix/sysv/linux/bits/errno.h
@@ -27,9 +27,11 @@
 /* Linux has no ENOTSUP error code.  */
 # define ENOTSUP EOPNOTSUPP
 
-/* Linux also has no ECANCELED error code.  Since it is not used here
+/* Linux also had no ECANCELED error code.  Since it is not used here
    we define it to an invalid value.  */
-# define ECANCELED	125
+# ifndef ECANCELED
+#  define ECANCELED	125
+# endif
 
 # ifndef __ASSEMBLER__
 /* Function to get address of global `errno' variable.  */
diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions
index 475fbe1721..e15c8225fb 100644
--- a/sysdeps/unix/sysv/linux/hppa/Versions
+++ b/sysdeps/unix/sysv/linux/hppa/Versions
@@ -1,6 +1,25 @@
 libc {
+  # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+  # When you get an error from errlist-compat.awk, you need to add a new
+  # version here.  Don't do this blindly, since this means changing the ABI
+  # for all GNU/Linux configurations.
+
+  GLIBC_2.1 {
+    #errlist-compat	253
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
   GLIBC_2.2 {
     # New rlimit interface
     getrlimit; setrlimit; getrlimit64; setrlimit64;
   }
-}
\ No newline at end of file
+  GLIBC_2.3 {
+    #errlist-compat	254
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+}
+librt {
+  GLIBC_2.3 {
+    # AIO functions.
+    aio_cancel; aio_cancel64;
+  }
+}
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/errno.h b/sysdeps/unix/sysv/linux/hppa/bits/errno.h
index 4d75ff1f61..003d71f622 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/errno.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/errno.h
@@ -1,5 +1,5 @@
 /* Error constants.  Linux/HPPA specific version.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,2000,2002 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
@@ -26,7 +26,9 @@
 
 /* Linux also has no ECANCELED error code.  Since it is not used here
    we define it to an invalid value.  */
-# define ECANCELED	125
+# ifndef ECANCELED
+#  define ECANCELED	ECANCELLED
+# endif
 
 # ifndef __ASSEMBLER__
 /* Function to get address of global `errno' variable.  */
@@ -44,6 +46,6 @@ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
    define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
    defined.  */
 # define EDOM	33	/* Math argument out of domain of function.  */
-# define EILSEQ	84	/* Illegal byte sequence.  */
+# define EILSEQ	47	/* Illegal byte sequence.  */
 # define ERANGE	34	/* Math result not representable.  */
 #endif /* !_ERRNO_H && __need_Emath */
diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions
index f71d9b5d88..1569885d56 100644
--- a/sysdeps/unix/sysv/linux/mips/Versions
+++ b/sysdeps/unix/sysv/linux/mips/Versions
@@ -1,5 +1,13 @@
 libc {
+  # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+  # When you get an error from errlist-compat.awk, you need to add a new
+  # version here.  Don't do this blindly, since this means changing the ABI
+  # for all GNU/Linux configurations.
+
   GLIBC_2.0 {
+    #errlist-compat	1134
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
     # Exception handling support functions from libgcc
     __register_frame; __register_frame_table; __deregister_frame;
     __frame_state_for; __register_frame_info_table;
@@ -13,8 +21,16 @@ libc {
     # s*
     sysmips;
   }
+  GLIBC_2.1 {
+    #errlist-compat	1134
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
   GLIBC_2.2 {
     # _*
     _test_and_set;
   }
+  GLIBC_2.3 {
+    #errlist-compat	1134
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions
new file mode 100644
index 0000000000..03d1d87176
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/Versions
@@ -0,0 +1,25 @@
+libc {
+  # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+  # When you get an error from errlist-compat.awk, you need to add a new
+  # version here.  Don't do this blindly, since this means changing the ABI
+  # for all GNU/Linux configurations.
+
+  GLIBC_2.0 {
+    #errlist-compat	127
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+  GLIBC_2.1 {
+    #errlist-compat	127
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+  GLIBC_2.3 {
+    #errlist-compat	128
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+}
+librt {
+  GLIBC_2.3 {
+    # AIO functions.
+    aio_cancel; aio_cancel64;
+  }
+}
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/errno.h b/sysdeps/unix/sysv/linux/sparc/bits/errno.h
new file mode 100644
index 0000000000..96b7372f19
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/bits/errno.h
@@ -0,0 +1,52 @@
+/* Error constants.  Linux/Sparc specific version.
+   Copyright (C) 1996, 1997, 1998, 1999, 2002 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifdef _ERRNO_H
+
+# undef EDOM
+# undef EILSEQ
+# undef ERANGE
+# include <linux/errno.h>
+
+/* Linux has no ENOTSUP error code.  */
+# define ENOTSUP EOPNOTSUPP
+
+# ifndef ECANCELED
+#  define ECANCELED	127
+# endif
+
+# ifndef __ASSEMBLER__
+/* Function to get address of global `errno' variable.  */
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+
+#  if !defined _LIBC || defined _LIBC_REENTRANT
+/* When using threads, errno is a per-thread value.  */
+#   define errno (*__errno_location ())
+#  endif
+# endif /* !__ASSEMBLER__ */
+#endif /* _ERRNO_H */
+
+#if !defined _ERRNO_H && defined __need_Emath
+/* This is ugly but the kernel header is not clean enough.  We must
+   define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
+   defined.  */
+# define EDOM	33	/* Math argument out of domain of function.  */
+# define EILSEQ	122	/* Illegal byte sequence.  */
+# define ERANGE	34	/* Math result not representable.  */
+#endif /* !_ERRNO_H && __need_Emath */