Back out errlist changes for now too.cvs/fedora-glibc-2_3_3-73

7 files changed, 6 insertions, 91 deletions

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 6b24cdaa55..6e9da80df2 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1258,6 +1258,7 @@ rm -f *.filelist*
 %changelog
 * Thu Oct 21 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-73
 - remove setaltroot and key{_add,_request,ctl} also from Versions
+- back out _sys_errlist changes
 
 * Thu Oct 21 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-72
 - back out setaltroot and key{_add,_request,ctl} addition
diff --git a/manual/errno.texi b/manual/errno.texi
index 7872452df3..c799d268f8 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -1229,30 +1229,6 @@ They are not yet documented.}
 @comment errno ???/???
 @end deftypevr
 
-@comment errno.h
-@comment Linux???: Required key not available
-@deftypevr Macro int ENOKEY
-@comment errno ???/???
-@end deftypevr
-
-@comment errno.h
-@comment Linux???: Key has expired
-@deftypevr Macro int EKEYEXPIRED
-@comment errno ???/???
-@end deftypevr
-
-@comment errno.h
-@comment Linux???: Key has been revoked
-@deftypevr Macro int EKEYREVOKED
-@comment errno ???/???
-@end deftypevr
-
-@comment errno.h
-@comment Linux???: Key was rejected by service
-@deftypevr Macro int EKEYREJECTED
-@comment errno ???/???
-@end deftypevr
-
 @node Error Messages,  , Error Codes, Error Reporting
 @section Error Messages
 
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 0fc33213ae..dee0c67bcf 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -49,14 +49,10 @@ endif
 # Make it unwritable so noone will edit it by mistake.
 	-chmod a-w $@T
 	mv -f $@T $@
-$(objpfx)errlist-compat.h: $(objpfx)errlist-compat.c
-	sed -n '1p;/ERR_MAX/p' $< > $@T
-	-chmod a-w $@T
-	mv -f $@T $@
-generated += errlist-compat.c errlist-compat.h
+generated += errlist-compat.c
 
 # This will force the generation above to happy if need be.
-$(foreach o,.d $(object-suffixes),$(objpfx)errlist$o):$(objpfx)errlist-compat.h
+$(foreach o,.d $(object-suffixes),$(objpfx)errlist$o):$(objpfx)errlist-compat.c
 endif
 
 ifeq ($(subdir),login)
diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
index db827f3f70..cb5798034d 100644
--- a/sysdeps/gnu/errlist-compat.awk
+++ b/sysdeps/gnu/errlist-compat.awk
@@ -59,7 +59,7 @@ END {
 
   count = maxerr + 1;
 
-  if (highest < count) {
+  if (highest != count) {
     printf "*** errlist.c count %d vs Versions sys_errlist@%s count %d\n", \
       count, highest_version, highest > "/dev/stderr";
     exit 1;
@@ -79,12 +79,6 @@ END {
   print "/* This file was generated by errlist-compat.awk; DO NOT EDIT!  */\n";
   print "#include <shlib-compat.h>\n";
 
-  if (highest > count) {
-    printf "*** errlist.c count %d inflated to %s count %d (old errno.h?)\n", \
-      count, highest_version, highest > "/dev/stderr";
-    printf "#define ERR_MAX %d\n\n", highest;
-  }
-
   for (old in compat) {
     new = compat[old];
     n = vcount[old];
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index 3f074ed482..f8f7ba5335 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -47,16 +47,7 @@ BEGIN {
     print "#endif";
     print "";
 
-    print "#if !defined EMIT_ERR_MAX && !defined ERRLIST_NO_COMPAT";
-    print "# include <errlist-compat.h>";
-    print "#endif";
-    print "#ifdef ERR_MAX";
-    print "# define ERRLIST_SIZE ERR_MAX + 1";
-    print "#else"
-    print "# define ERRLIST_SIZE";
-    print "#endif";
-
-    print "const char *const _sys_errlist_internal[ERRLIST_SIZE] =";
+    print "const char *const _sys_errlist_internal[] =";
     print "  {";
     print "    [0] = N_(\"Success\"),"
   }
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 3098fc34c5..8131038047 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -7,15 +7,7 @@
 # define ERR_REMAP(n) n
 #endif
 
-#if !defined EMIT_ERR_MAX && !defined ERRLIST_NO_COMPAT
-# include <errlist-compat.h>
-#endif
-#ifdef ERR_MAX
-# define ERRLIST_SIZE ERR_MAX + 1
-#else
-# define ERRLIST_SIZE
-#endif
-const char *const _sys_errlist_internal[ERRLIST_SIZE] =
+const char *const _sys_errlist_internal[] =
   {
     [0] = N_("Success"),
 #ifdef EPERM
@@ -1408,38 +1400,6 @@ TRANS error; @pxref{Cancel AIO Operations}. */
 # define ERR_MAX EMEDIUMTYPE
 # endif
 #endif
-#ifdef ENOKEY
-/* */
-    [ERR_REMAP (ENOKEY)] = N_("Required key not available"),
-# if ENOKEY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOKEY
-# endif
-#endif
-#ifdef EKEYEXPIRED
-/* */
-    [ERR_REMAP (EKEYEXPIRED)] = N_("Key has expired"),
-# if EKEYEXPIRED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EKEYEXPIRED
-# endif
-#endif
-#ifdef EKEYREVOKED
-/* */
-    [ERR_REMAP (EKEYREVOKED)] = N_("Key has been revoked"),
-# if EKEYREVOKED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EKEYREVOKED
-# endif
-#endif
-#ifdef EKEYREJECTED
-/* */
-    [ERR_REMAP (EKEYREJECTED)] = N_("Key was rejected by service"),
-# if EKEYREJECTED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EKEYREJECTED
-# endif
-#endif
   };
 
 const int _sys_nerr_internal
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index aeb4f1768d..980724e519 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -114,9 +114,6 @@ libc {
   }
   GLIBC_2.3.4 {
     sched_getaffinity; sched_setaffinity;
-
-    #errlist-compat	129
-    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
   GLIBC_PRIVATE {
     # functions used in other libraries