Fix computation of inflated errlist size

diff --git a/ChangeLog b/ChangeLog
index db02f02308dc9e5dc75c2cb9c8154b7012e703eb..4be48d8889d3dc3705360289956a4c031ffe5191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * sysdeps/gnu/errlist-compat.awk (END): Correct computation of
+       ERR_MAX value.
+       * sysdeps/unix/sysv/linux/Versions (GLIBC_2.12): Adjust
+       errlist-compat value.
+
 2012-04-18  David S. Miller  <davem@davemloft.net>
 
        * sysdeps/generic/memcopy.h (reg_char): Delete.

diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
index 4f70e927c524d48e0174e12e33d2082797e631f0..864733bb40b9836c9c18d5d10dfee8b4152ca519 100644 (file)
--- a/sysdeps/gnu/errlist-compat.awk
+++ b/sysdeps/gnu/errlist-compat.awk
@@ -1,5 +1,5 @@
 # awk script to generate errlist-compat.c
-# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -81,7 +81,7 @@ END {
   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;
+    printf "#define ERR_MAX %d\n\n", highest - 1;
   }
 
   # same regardless of awk's ordering of the associative array.

diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 7f2f1b9ffe807491c89d9807456a3a96b8344400..f9647be1bcb897a685b935d41688cffe597ef3b4 100644 (file)
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -142,7 +142,7 @@ libc {
     fallocate;
   }
   GLIBC_2.12 {
-    #errlist-compat    134
+    #errlist-compat    135
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 
     ntp_gettimex;