From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 20 Mar 2018 02:10:57 +0000 (+0100)
Subject: Fix errno values
X-Git-Tag: glibc-2.28~441
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ceb54b9b4ff5ef7d518a6e6e415a6897fb77eb67;p=thirdparty%2Fglibc.git

Fix errno values

	* manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): Remove errno
	values from Linux-specific section now that it is in the GNU section.
	* sysdeps/gnu/errlist.c: Regenerate.
---

diff --git a/ChangeLog b/ChangeLog
index 08488fe2b2d..3399e567b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-20  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): Remove errno
+	values from Linux-specific section now that it is in the GNU section.
+	* sysdeps/gnu/errlist.c: Regenerate.
+
 2018-03-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/Makefile (libm-narrow-fns): Add sub.
diff --git a/manual/errno.texi b/manual/errno.texi
index 8917cccb1ec..b195b635f10 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -1111,16 +1111,6 @@ They are not yet documented.}
 @errno{EKEYREJECTED, ???/???, Key was rejected by service}
 @end deftypevr
 
-@deftypevr Macro int EOWNERDEAD
-@standards{Linux, errno.h}
-@errno{EOWNERDEAD, ???/???, Owner died}
-@end deftypevr
-
-@deftypevr Macro int ENOTRECOVERABLE
-@standards{Linux, errno.h}
-@errno{ENOTRECOVERABLE, ???/???, State not recoverable}
-@end deftypevr
-
 @deftypevr Macro int ERFKILL
 @standards{Linux, errno.h}
 @errno{ERFKILL, ???/???, Operation not possible due to RF-kill}
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 4a1c093ed0e..31ebfa9491d 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -1090,6 +1090,22 @@ TRANS error; @pxref{Cancel AIO Operations}. */
 # define ERR_MAX ECANCELED
 # endif
 #endif
+#ifdef EOWNERDEAD
+/* */
+    [ERR_REMAP (EOWNERDEAD)] = N_("Owner died"),
+# if EOWNERDEAD > ERR_MAX
+# undef ERR_MAX
+# define ERR_MAX EOWNERDEAD
+# endif
+#endif
+#ifdef ENOTRECOVERABLE
+/* */
+    [ERR_REMAP (ENOTRECOVERABLE)] = N_("State not recoverable"),
+# if ENOTRECOVERABLE > ERR_MAX
+# undef ERR_MAX
+# define ERR_MAX ENOTRECOVERABLE
+# endif
+#endif
 #ifdef ERESTART
 /* */
     [ERR_REMAP (ERESTART)] = N_("Interrupted system call should be restarted"),
@@ -1434,22 +1450,6 @@ TRANS error; @pxref{Cancel AIO Operations}. */
 # define ERR_MAX EKEYREJECTED
 # endif
 #endif
-#ifdef EOWNERDEAD
-/* */
-    [ERR_REMAP (EOWNERDEAD)] = N_("Owner died"),
-# if EOWNERDEAD > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EOWNERDEAD
-# endif
-#endif
-#ifdef ENOTRECOVERABLE
-/* */
-    [ERR_REMAP (ENOTRECOVERABLE)] = N_("State not recoverable"),
-# if ENOTRECOVERABLE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTRECOVERABLE
-# endif
-#endif
 #ifdef ERFKILL
 /* */
     [ERR_REMAP (ERFKILL)] = N_("Operation not possible due to RF-kill"),