diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-04-06 18:53:32 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-04-19 19:05:19 +0200 |
| commit | ff3d51ec58e433ca725a1039f8558d64d2d80466 (patch) | |
| tree | 45616f6419ca88c31f500655423fe36a4908cf03 | |
| parent | 50f81fd74b78d407477b9b39c2034c87471b6cef (diff) | |
| download | glibc-ff3d51ec58e433ca725a1039f8558d64d2d80466.tar.gz glibc-ff3d51ec58e433ca725a1039f8558d64d2d80466.tar.xz glibc-ff3d51ec58e433ca725a1039f8558d64d2d80466.zip | |
Fix computation of inflated errlist size
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist-compat.awk | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Versions | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index db02f02308..4be48d8889 100644 --- 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 4f70e927c5..864733bb40 100644 --- 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 7f2f1b9ffe..f9647be1bc 100644 --- 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; |