diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Versions.def | 1 | ||||
| -rw-r--r-- | manual/errno.texi | 6 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Versions | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/errno.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/errno.h | 6 |
7 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3b40ecbfe1..2939a2a3a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-11-14 Ulrich Drepper <drepper@redhat.com> + [BZ #10939] + * Versions.def: Define GLIBC_2.12 for libc. + * manual/errno.texi: Add ERFKILL entry. + * sysdeps/unix/sysv/linux/Versions: Add new errlist compat entries + for 2.12. + * sysdeps/unix/sysv/linux/bits/errno.h: Define ERFKILL is not done. + * sysdeps/unix/sysv/linux/sparc/bits/errno.h: Likewise. + * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Update F_SETOWN_EX and F_GETOWN_EX definitions according to corrected kernel definitions. * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. diff --git a/Versions.def b/Versions.def index a8a9cd275e..70de1c14fc 100644 --- a/Versions.def +++ b/Versions.def @@ -28,6 +28,7 @@ libc { GLIBC_2.9 GLIBC_2.10 GLIBC_2.11 + GLIBC_2.12 %ifdef USE_IN_LIBIO HURD_CTHREADS_0.3 %endif diff --git a/manual/errno.texi b/manual/errno.texi index fcba26750e..03a868e457 100644 --- a/manual/errno.texi +++ b/manual/errno.texi @@ -1265,6 +1265,12 @@ They are not yet documented.} @comment errno ???/??? @end deftypevr +@comment errno.h +@comment Linux: Operation not possible due to RF-kill +@deftypevr Macro int ERFKILL +@comment errno ???/??? +@end deftypevr + @node Error Messages, , Error Codes, Error Reporting @section Error Messages diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 56da01756d..28a295fc67 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -1456,6 +1456,14 @@ TRANS error; @pxref{Cancel AIO Operations}. */ # define ERR_MAX ENOTRECOVERABLE # endif #endif +#ifdef ERFKILL +/* */ + [ERR_REMAP (ERFKILL)] = N_("Operation not possible due to RF-kill"), +# if ERFKILL > ERR_MAX +# undef ERR_MAX +# define ERR_MAX ERFKILL +# endif +#endif }; #define NERR \ diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 2b5f2fb03c..4c9129bed3 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -141,6 +141,10 @@ libc { GLIBC_2.10 { fallocate; } + GLIBC_2.12 { + #errlist-compat 134 + _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; + } GLIBC_PRIVATE { # functions used in other libraries __syscall_rt_sigqueueinfo; diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h index 4de8cbba57..1f3d7af7e1 100644 --- a/sysdeps/unix/sysv/linux/bits/errno.h +++ b/sysdeps/unix/sysv/linux/bits/errno.h @@ -1,5 +1,5 @@ /* Error constants. Linux specific version. - Copyright (C) 1996, 1997, 1998, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1996-1999, 2005, 2009 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 @@ -38,6 +38,10 @@ # define ENOTRECOVERABLE 131 # endif +# ifndef ERFKILL +# define ERFKILL 132 +# endif + # ifndef __ASSEMBLER__ /* Function to get address of global `errno' variable. */ extern int *__errno_location (void) __THROW __attribute__ ((__const__)); diff --git a/sysdeps/unix/sysv/linux/sparc/bits/errno.h b/sysdeps/unix/sysv/linux/sparc/bits/errno.h index 02e200c088..2b9265a1dc 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/errno.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/errno.h @@ -1,5 +1,5 @@ /* Error constants. Linux/Sparc specific version. - Copyright (C) 1996,1997,1998,1999,2002,2005 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2002,2005,2009 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 @@ -37,6 +37,10 @@ # define ENOTRECOVERABLE 133 # endif +# ifndef ERFKILL +# define ERFKILL 134 +# endif + # ifndef __ASSEMBLER__ /* Function to get address of global `errno' variable. */ extern int *__errno_location (void) __THROW __attribute__ ((__const__)); |