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>

6 files changed, 33 insertions, 72 deletions

diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
index 9442793..526c79b 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 65b9258..048e36a 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 88b4d4f..c9a7a9c 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 741677b..0000000
--- 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 b9b1291..952cb80 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 7261a51..8131038 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