* [PATCH v2 1/5] signal: Add signum-{generic,arch}.h
@ 2020-04-27 21:48 Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 2/5] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
` (4 more replies)
0 siblings, 5 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-27 21:48 UTC (permalink / raw)
To: libc-alpha
Changes from previous version:
- Fixed an ia64-linux-gnu build due wrong signum.h inclusion.
--
It refactor how signals are defined by each architecture. Instead of
include a generic header (bits/signum-generic.h) and undef non-default
values in an arch specific header (bits/signum.h) the new scheme uses a
common definition (bits/signum-generic.h) and each architectures add
its specific definitions on a new header (bits/signum-arch.h).
For Linux it requires copy some system default definitions to alpha,
hppa, and sparc. They are historical ones and newer ports uses
the generic Linux signum-arch.h.
For Hurd the BSD signum is removed and moved to a new header (it is
used currently only on Hurd).
Checked on a build against all affected ABIs.
---
bits/signum-arch.h | 59 ++++++++++++++++
bits/signum-generic.h | 29 ++------
bits/signum.h | 32 ---------
signal/Makefile | 2 +-
signal/signal.h | 2 +-
sysdeps/mach/hurd/bits/signum-arch.h | 65 +++++++++++++++++
sysdeps/unix/bsd/bits/signum.h | 35 ----------
.../unix/sysv/linux/alpha/bits/signum-arch.h | 67 ++++++++++++++++++
sysdeps/unix/sysv/linux/alpha/bits/signum.h | 40 -----------
sysdeps/unix/sysv/linux/bits/signum-arch.h | 64 +++++++++++++++++
sysdeps/unix/sysv/linux/bits/signum.h | 58 ---------------
.../hppa/bits/{signum.h => signum-arch.h} | 70 +++++++++----------
sysdeps/unix/sysv/linux/ia64/vfork.S | 2 +-
.../unix/sysv/linux/mips/bits/signum-arch.h | 65 +++++++++++++++++
sysdeps/unix/sysv/linux/mips/bits/signum.h | 68 ------------------
.../unix/sysv/linux/sparc/bits/signum-arch.h | 66 +++++++++++++++++
sysdeps/unix/sysv/linux/sparc/bits/signum.h | 39 -----------
17 files changed, 425 insertions(+), 338 deletions(-)
create mode 100644 bits/signum-arch.h
delete mode 100644 bits/signum.h
create mode 100644 sysdeps/mach/hurd/bits/signum-arch.h
delete mode 100644 sysdeps/unix/bsd/bits/signum.h
create mode 100644 sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
delete mode 100644 sysdeps/unix/sysv/linux/alpha/bits/signum.h
create mode 100644 sysdeps/unix/sysv/linux/bits/signum-arch.h
delete mode 100644 sysdeps/unix/sysv/linux/bits/signum.h
rename sysdeps/unix/sysv/linux/hppa/bits/{signum.h => signum-arch.h} (50%)
create mode 100644 sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/signum.h
create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/signum.h
diff --git a/bits/signum-arch.h b/bits/signum-arch.h
new file mode 100644
index 0000000000..df96e92c01
--- /dev/null
+++ b/bits/signum-arch.h
@@ -0,0 +1,59 @@
+/* Signal number constants. Specific architecture definitions.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_ARCH_H
+#define _BITS_SIGNUM_ARCH_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum-generic.h> directly; use <signal.h> instead."
+#endif
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 12 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 16 /* Urgent data is available at a socket. */
+#define SIGSTOP 17 /* Stop, unblockable. */
+#define SIGTSTP 18 /* Keyboard stop. */
+#define SIGCONT 19 /* Continue. */
+#define SIGCHLD 20 /* Child terminated or stopped. */
+#define SIGTTIN 21 /* Background read from control terminal. */
+#define SIGTTOU 22 /* Background write to control terminal. */
+#define SIGPOLL 23 /* Pollable event occurred (System V). */
+#define SIGXCPU 24 /* CPU time limit exceeded. */
+#define SIGVTALRM 26 /* Virtual timer expired. */
+#define SIGPROF 27 /* Profiling timer expired. */
+#define SIGXFSZ 25 /* File size limit exceeded. */
+#define SIGUSR1 30 /* User-defined signal 1. */
+#define SIGUSR2 31 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 28 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+/* By default no real-time signals are supported. */
+#define __SIGRTMIN 32
+#define __SIGRTMAX __SIGRTMIN
+
+#endif
diff --git a/bits/signum-generic.h b/bits/signum-generic.h
index 504e5fb8c8..9b0992b5d5 100644
--- a/bits/signum-generic.h
+++ b/bits/signum-generic.h
@@ -57,35 +57,13 @@
#define SIGQUIT 3 /* Quit. */
#define SIGTRAP 5 /* Trace/breakpoint trap. */
#define SIGKILL 9 /* Killed. */
-#define SIGBUS 10 /* Bus error. */
-#define SIGSYS 12 /* Bad system call. */
#define SIGPIPE 13 /* Broken pipe. */
#define SIGALRM 14 /* Alarm clock. */
-/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
-#define SIGURG 16 /* Urgent data is available at a socket. */
-#define SIGSTOP 17 /* Stop, unblockable. */
-#define SIGTSTP 18 /* Keyboard stop. */
-#define SIGCONT 19 /* Continue. */
-#define SIGCHLD 20 /* Child terminated or stopped. */
-#define SIGTTIN 21 /* Background read from control terminal. */
-#define SIGTTOU 22 /* Background write to control terminal. */
-#define SIGPOLL 23 /* Pollable event occurred (System V). */
-#define SIGXCPU 24 /* CPU time limit exceeded. */
-#define SIGXFSZ 25 /* File size limit exceeded. */
-#define SIGVTALRM 26 /* Virtual timer expired. */
-#define SIGPROF 27 /* Profiling timer expired. */
-#define SIGUSR1 30 /* User-defined signal 1. */
-#define SIGUSR2 31 /* User-defined signal 2. */
-
-/* Nonstandard signals found in all modern POSIX systems
- (including both BSD and Linux). */
-#define SIGWINCH 28 /* Window size change (4.3 BSD, Sun). */
-
/* Archaic names for compatibility. */
#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
-#define SIGCLD SIGCHLD /* Old System V name */
+#define SIGCLD SIGCHLD /* Old System V name */
/* Not all systems support real-time signals. bits/signum.h indicates
that they are supported by overriding __SIGRTMAX to a value greater
@@ -93,8 +71,9 @@
but some real-time signals may be used internally by glibc. Do not
use these constants in application code; use SIGRTMIN and SIGRTMAX
(defined in signal.h) instead. */
-#define __SIGRTMIN 32
-#define __SIGRTMAX __SIGRTMIN
+
+/* Include system specific bits. */
+#include <bits/signum-arch.h>
/* Biggest signal number + 1 (including real-time signals). */
#define _NSIG (__SIGRTMAX + 1)
diff --git a/bits/signum.h b/bits/signum.h
deleted file mode 100644
index 183e3c0545..0000000000
--- a/bits/signum.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Signal number constants. Generic version.
- Copyright (C) 2017-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* This operating system does not need to override any of the generic
- signal number assignments in bits/signum-generic.h, nor to add any
- additional signal constants. */
-
-#endif /* bits/signum.h. */
diff --git a/signal/Makefile b/signal/Makefile
index f3c19e2992..2ec3ddd74f 100644
--- a/signal/Makefile
+++ b/signal/Makefile
@@ -23,7 +23,7 @@ subdir := signal
include ../Makeconfig
headers := signal.h sys/signal.h \
- bits/signum.h bits/signum-generic.h \
+ bits/signum-generic.h bits/signum-arch.h \
bits/sigcontext.h bits/sigaction.h \
bits/sigevent-consts.h bits/siginfo-consts.h \
bits/sigstack.h bits/sigthread.h bits/ss_flags.h \
diff --git a/signal/signal.h b/signal/signal.h
index 40825e95ec..fa8de963f8 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -27,7 +27,7 @@
__BEGIN_DECLS
#include <bits/types.h>
-#include <bits/signum.h>
+#include <bits/signum-generic.h>
#include <bits/types/sig_atomic_t.h>
diff --git a/sysdeps/mach/hurd/bits/signum-arch.h b/sysdeps/mach/hurd/bits/signum-arch.h
new file mode 100644
index 0000000000..a267358227
--- /dev/null
+++ b/sysdeps/mach/hurd/bits/signum-arch.h
@@ -0,0 +1,65 @@
+/* Signal number constants. Specific architecture definitions.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_ARCH_H
+#define _BITS_SIGNUM_ARCH_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum-arch.h> directly; use <signal.h> instead."
+#endif
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 12 /* Bad system call. */
+
+/* Adjustments and additions to the signal number constants for
+ 4.2 or 4.3 BSD-derived Unix systems. */
+#define SIGEMT 7 /* Emulator trap (4.2 BSD). */
+#define SIGINFO 29 /* Information request (4.4 BSD). */
+#define SIGLOST 32 /* Resource lost (Sun); server died (GNU). */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 16 /* Urgent data is available at a socket. */
+#define SIGSTOP 17 /* Stop, unblockable. */
+#define SIGTSTP 18 /* Keyboard stop. */
+#define SIGCONT 19 /* Continue. */
+#define SIGCHLD 20 /* Child terminated or stopped. */
+#define SIGTTIN 21 /* Background read from control terminal. */
+#define SIGTTOU 22 /* Background write to control terminal. */
+#define SIGPOLL 23 /* Pollable event occurred (System V). */
+#define SIGXCPU 24 /* CPU time limit exceeded. */
+#define SIGVTALRM 26 /* Virtual timer expired. */
+#define SIGPROF 27 /* Profiling timer expired. */
+#define SIGXFSZ 25 /* File size limit exceeded. */
+#define SIGUSR1 30 /* User-defined signal 1. */
+#define SIGUSR2 31 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 28 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+/* No real-time signals are supported. */
+#define __SIGRTMIN 32
+#define __SIGRTMAX __SIGRTMIN
+
+#endif
diff --git a/sysdeps/unix/bsd/bits/signum.h b/sysdeps/unix/bsd/bits/signum.h
deleted file mode 100644
index a8d47af038..0000000000
--- a/sysdeps/unix/bsd/bits/signum.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Signal number definitions. BSD version.
- Copyright (C) 1991-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* Adjustments and additions to the signal number constants for
- 4.2 or 4.3 BSD-derived Unix systems. */
-
-#define SIGEMT 7 /* Emulator trap (4.2 BSD). */
-#define SIGINFO 29 /* Information request (4.4 BSD). */
-#define SIGLOST 32 /* Resource lost (Sun); server died (GNU). */
-
-#endif /* bits/signum.h. */
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
new file mode 100644
index 0000000000..a28f181916
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
@@ -0,0 +1,67 @@
+/* Signal number definitions. Linux/Alpha version.
+ Copyright (C) 1996-2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_ARHC_H
+#define _BITS_SIGNUM_ARCH_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum-arch.h> directly; use <signal.h> instead."
+#endif
+
+/* Adjustments and additions to the signal number constants for
+ Linux/Alpha. Signal values on this platform were chosen for OSF/1
+ binary compatibility, and are therefore almost identical to the
+ BSD-derived defaults. */
+
+#define SIGEMT 7 /* Emulator trap (4.2 BSD). */
+#define SIGINFO 29 /* Information request (BSD). */
+#define SIGPWR SIGINFO /* Power failure imminent (System V). */
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 12 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 16 /* Urgent data is available at a socket. */
+#define SIGSTOP 17 /* Stop, unblockable. */
+#define SIGTSTP 18 /* Keyboard stop. */
+#define SIGCONT 19 /* Continue. */
+#define SIGCHLD 20 /* Child terminated or stopped. */
+#define SIGTTIN 21 /* Background read from control terminal. */
+#define SIGTTOU 22 /* Background write to control terminal. */
+#define SIGPOLL 23 /* Pollable event occurred (System V). */
+#define SIGXCPU 24 /* CPU time limit exceeded. */
+#define SIGVTALRM 26 /* Virtual timer expired. */
+#define SIGPROF 27 /* Profiling timer expired. */
+#define SIGXFSZ 25 /* File size limit exceeded. */
+#define SIGUSR1 30 /* User-defined signal 1. */
+#define SIGUSR2 31 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 28
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+#define __SIGRTMIN 32
+#define __SIGRTMAX 64
+
+#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum.h b/sysdeps/unix/sysv/linux/alpha/bits/signum.h
deleted file mode 100644
index 63add0e3db..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/bits/signum.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Signal number definitions. Linux/Alpha version.
- Copyright (C) 1996-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* Adjustments and additions to the signal number constants for
- Linux/Alpha. Signal values on this platform were chosen for OSF/1
- binary compatibility, and are therefore almost identical to the
- BSD-derived defaults. */
-
-#define SIGEMT 7 /* Emulator trap (4.2 BSD). */
-#define SIGINFO 29 /* Information request (BSD). */
-#define SIGPWR SIGINFO /* Power failure imminent (System V). */
-
-#undef __SIGRTMAX
-#define __SIGRTMAX 64
-
-#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/bits/signum-arch.h b/sysdeps/unix/sysv/linux/bits/signum-arch.h
new file mode 100644
index 0000000000..0dfe3d954d
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/signum-arch.h
@@ -0,0 +1,64 @@
+/* Signal number definitions. Linux version.
+ Copyright (C) 1995-2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_ARHC_H
+#define _BITS_SIGNUM_ARCH_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum-arch.h> directly; use <signal.h> instead."
+#endif
+
+/* Adjustments and additions to the signal number constants for
+ most Linux systems. */
+
+#define SIGSTKFLT 16 /* Stack fault (obsolete). */
+#define SIGPWR 30 /* Power failure imminent. */
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 7 /* Bus error. */
+#define SIGSYS 31 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 23 /* Urgent data is available at a socket. */
+#define SIGSTOP 19 /* Stop, unblockable. */
+#define SIGTSTP 20 /* Keyboard stop. */
+#define SIGCONT 18 /* Continue. */
+#define SIGCHLD 17 /* Child terminated or stopped. */
+#define SIGTTIN 21 /* Background read from control terminal. */
+#define SIGTTOU 22 /* Background write to control terminal. */
+#define SIGPOLL 29 /* Pollable event occurred (System V). */
+#define SIGXFSZ 25 /* File size limit exceeded. */
+#define SIGXCPU 24 /* CPU time limit exceeded. */
+#define SIGVTALRM 26 /* Virtual timer expired. */
+#define SIGPROF 27 /* Profiling timer expired. */
+#define SIGUSR1 10 /* User-defined signal 1. */
+#define SIGUSR2 12 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 28 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+#define __SIGRTMIN 32
+#define __SIGRTMAX 64
+
+#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/bits/signum.h b/sysdeps/unix/sysv/linux/bits/signum.h
deleted file mode 100644
index 423fd8be70..0000000000
--- a/sysdeps/unix/sysv/linux/bits/signum.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Signal number definitions. Linux version.
- Copyright (C) 1995-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* Adjustments and additions to the signal number constants for
- most Linux systems. */
-
-#define SIGSTKFLT 16 /* Stack fault (obsolete). */
-#define SIGPWR 30 /* Power failure imminent. */
-
-#undef SIGBUS
-#define SIGBUS 7
-#undef SIGUSR1
-#define SIGUSR1 10
-#undef SIGUSR2
-#define SIGUSR2 12
-#undef SIGCHLD
-#define SIGCHLD 17
-#undef SIGCONT
-#define SIGCONT 18
-#undef SIGSTOP
-#define SIGSTOP 19
-#undef SIGTSTP
-#define SIGTSTP 20
-#undef SIGURG
-#define SIGURG 23
-#undef SIGPOLL
-#define SIGPOLL 29
-#undef SIGSYS
-#define SIGSYS 31
-
-#undef __SIGRTMAX
-#define __SIGRTMAX 64
-
-#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum.h b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
similarity index 50%
rename from sysdeps/unix/sysv/linux/hppa/bits/signum.h
rename to sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
index 2210304e37..20975b9c94 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/signum.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
@@ -16,15 +16,13 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
+#ifndef _BITS_SIGNUM_ARCH_H
+#define _BITS_SIGNUM_ARCH_H 1
#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
+#error "Never include <bits/signum-arch.h> directly; use <signal.h> instead."
#endif
-#include <bits/signum-generic.h>
-
/* Adjustments and additions to the signal number constants for
Linux/HPPA. These values were originally chosen for HP/UX
compatibility, but were renumbered as of kernel 3.17 and glibc 2.21
@@ -36,40 +34,36 @@
#define SIGSTKFLT 7 /* Stack fault (obsolete). */
#define SIGPWR 19 /* Power failure imminent. */
-#undef SIGXCPU
-#define SIGXCPU 12
-#undef SIGUSR1
-#define SIGUSR1 16
-#undef SIGUSR2
-#define SIGUSR2 17
-#undef SIGCHLD
-#define SIGCHLD 18
-#undef SIGVTALRM
-#define SIGVTALRM 20
-#undef SIGPROF
-#define SIGPROF 21
-#undef SIGPOLL
-#define SIGPOLL 22
-#undef SIGWINCH
-#define SIGWINCH 23
-#undef SIGSTOP
-#define SIGSTOP 24
-#undef SIGTSTP
-#define SIGTSTP 25
-#undef SIGCONT
-#define SIGCONT 26
-#undef SIGTTIN
-#define SIGTTIN 27
-#undef SIGTTOU
-#define SIGTTOU 28
-#undef SIGURG
-#define SIGURG 29
-#undef SIGXFSZ
-#define SIGXFSZ 30
-#undef SIGSYS
-#define SIGSYS 31
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 31 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 29 /* Urgent data is available at a socket. */
+#define SIGSTOP 24 /* Stop, unblockable. */
+#define SIGTSTP 25 /* Keyboard stop. */
+#define SIGCONT 26 /* Continue. */
+#define SIGCHLD 18 /* Child terminated or stopped. */
+#define SIGTTIN 27 /* Background read from control terminal. */
+#define SIGTTOU 28 /* Background write to control terminal. */
+#define SIGPOLL 22 /* Pollable event occurred (System V). */
+#define SIGXCPU 12 /* CPU time limit exceeded. */
+#define SIGVTALRM 20 /* Virtual timer expired. */
+#define SIGPROF 21 /* Profiling timer expired. */
+#define SIGXFSZ 30 /* File size limit exceeded. */
+#define SIGUSR1 16 /* User-defined signal 1. */
+#define SIGUSR2 17 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 23 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
-#undef __SIGRTMAX
+#define __SIGRTMIN 32
#define __SIGRTMAX 64
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/ia64/vfork.S b/sysdeps/unix/sysv/linux/ia64/vfork.S
index a8ceea8ea7..843bf7683c 100644
--- a/sysdeps/unix/sysv/linux/ia64/vfork.S
+++ b/sysdeps/unix/sysv/linux/ia64/vfork.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
#define _SIGNAL_H
-#include <bits/signum.h>
+#include <bits/signum-arch.h>
#include <tcb-offsets.h>
/* The following are defined in linux/sched.h, which unfortunately */
diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
new file mode 100644
index 0000000000..36b1d62e35
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
@@ -0,0 +1,65 @@
+/* Signal number definitions. Linux/MIPS version.
+ Copyright (C) 1995-2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_H
+#define _BITS_SIGNUM_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum.h> directly; use <signal.h> instead."
+#endif
+
+/* Adjustments and additions to the signal number constants for
+ Linux/MIPS. */
+
+#define SIGEMT 7 /* Emulator trap. */
+#define SIGPWR 19 /* Power failure imminent. */
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 12 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 21 /* Urgent data is available at a socket. */
+#define SIGSTOP 23 /* Stop, unblockable. */
+#define SIGTSTP 24 /* Keyboard stop. */
+#define SIGCONT 25 /* Continue. */
+#define SIGCHLD 18 /* Child terminated or stopped. */
+#define SIGTTIN 26 /* Background read from control terminal. */
+#define SIGTTOU 27 /* Background write to control terminal. */
+#define SIGPOLL 22 /* Pollable event occurred (System V). */
+#define SIGXCPU 30 /* CPU time limit exceeded. */
+#define SIGVTALRM 28 /* Virtual timer expired. */
+#define SIGPROF 29 /* Profiling timer expired. */
+#define SIGXFSZ 31 /* File size limit exceeded. */
+#define SIGUSR1 16 /* User-defined signal 1. */
+#define SIGUSR2 17 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 20 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+/* By default no real-time signals are supported. */
+#define __SIGRTMIN 32
+#define __SIGRTMAX 127
+
+#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum.h b/sysdeps/unix/sysv/linux/mips/bits/signum.h
deleted file mode 100644
index f5a5e7b4cd..0000000000
--- a/sysdeps/unix/sysv/linux/mips/bits/signum.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Signal number definitions. Linux/MIPS version.
- Copyright (C) 1995-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* Adjustments and additions to the signal number constants for
- Linux/MIPS. */
-
-#define SIGEMT 7 /* Emulator trap. */
-#define SIGPWR 19 /* Power failure imminent. */
-
-#undef SIGUSR1
-#define SIGUSR1 16
-#undef SIGUSR2
-#define SIGUSR2 17
-#undef SIGCHLD
-#define SIGCHLD 18
-#undef SIGWINCH
-#define SIGWINCH 20
-#undef SIGURG
-#define SIGURG 21
-#undef SIGPOLL
-#define SIGPOLL 22
-#undef SIGSTOP
-#define SIGSTOP 23
-#undef SIGTSTP
-#define SIGTSTP 24
-#undef SIGCONT
-#define SIGCONT 25
-#undef SIGTTIN
-#define SIGTTIN 26
-#undef SIGTTOU
-#define SIGTTOU 27
-#undef SIGVTALRM
-#define SIGVTALRM 28
-#undef SIGPROF
-#define SIGPROF 29
-#undef SIGXCPU
-#define SIGXCPU 30
-#undef SIGXFSZ
-#define SIGXFSZ 31
-
-#undef __SIGRTMAX
-#define __SIGRTMAX 127
-
-#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
new file mode 100644
index 0000000000..a8b643ce34
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
@@ -0,0 +1,66 @@
+/* Signal number definitions. Linux/SPARC version.
+ Copyright (C) 1996-2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_SIGNUM_ARHC_H
+#define _BITS_SIGNUM_ARCH_H 1
+
+#ifndef _SIGNAL_H
+#error "Never include <bits/signum-arch.h> directly; use <signal.h> instead."
+#endif
+
+/* Adjustments and additions to the signal number constants for
+ Linux/SPARC systems. Signal values on this platform were chosen
+ for SunOS binary compatibility. */
+
+#define SIGEMT 7 /* Emulator trap. */
+#define SIGLOST 29 /* Resource lost (Sun); server died (GNU). */
+#define SIGPWR SIGLOST /* Power failure imminent (SysV). */
+
+/* Historical signals specified by POSIX. */
+#define SIGBUS 10 /* Bus error. */
+#define SIGSYS 12 /* Bad system call. */
+
+/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
+#define SIGURG 16 /* Urgent data is available at a socket. */
+#define SIGSTOP 17 /* Stop, unblockable. */
+#define SIGTSTP 18 /* Keyboard stop. */
+#define SIGCONT 19 /* Continue. */
+#define SIGCHLD 20 /* Child terminated or stopped. */
+#define SIGTTIN 21 /* Background read from control terminal. */
+#define SIGTTOU 22 /* Background write to control terminal. */
+#define SIGPOLL 23 /* Pollable event occurred (System V). */
+#define SIGXCPU 24 /* CPU time limit exceeded. */
+#define SIGVTALRM 26 /* Virtual timer expired. */
+#define SIGPROF 27 /* Profiling timer expired. */
+#define SIGXFSZ 25 /* File size limit exceeded. */
+#define SIGUSR1 30 /* User-defined signal 1. */
+#define SIGUSR2 31 /* User-defined signal 2. */
+
+/* Nonstandard signals found in all modern POSIX systems
+ (including both BSD and Linux). */
+#define SIGWINCH 28 /* Window size change (4.3 BSD, Sun). */
+
+/* Archaic names for compatibility. */
+#define SIGIO SIGPOLL /* I/O now possible (4.2 BSD). */
+#define SIGIOT SIGABRT /* IOT instruction, abort() on a PDP-11. */
+#define SIGCLD SIGCHLD /* Old System V name */
+
+#define __SIGRTMIN 32
+#define __SIGRTMAX 64
+
+#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum.h b/sysdeps/unix/sysv/linux/sparc/bits/signum.h
deleted file mode 100644
index 40fb39a435..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/bits/signum.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Signal number definitions. Linux/SPARC version.
- Copyright (C) 1996-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _BITS_SIGNUM_H
-#define _BITS_SIGNUM_H 1
-
-#ifndef _SIGNAL_H
-#error "Never include <bits/signum.h> directly; use <signal.h> instead."
-#endif
-
-#include <bits/signum-generic.h>
-
-/* Adjustments and additions to the signal number constants for
- Linux/SPARC systems. Signal values on this platform were chosen
- for SunOS binary compatibility. */
-
-#define SIGEMT 7 /* Emulator trap. */
-#define SIGLOST 29 /* Resource lost (Sun); server died (GNU). */
-#define SIGPWR SIGLOST /* Power failure imminent (SysV). */
-
-#undef __SIGRTMAX
-#define __SIGRTMAX 64
-
-#endif /* <signal.h> included. */
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
@ 2020-04-27 21:48 ` Adhemerval Zanella
2020-04-28 14:50 ` Florian Weimer
2020-04-27 21:48 ` [PATCH 3/5] signal: Move sys_errlist " Adhemerval Zanella
` (3 subsequent siblings)
4 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-27 21:48 UTC (permalink / raw)
To: libc-alpha
The symbol was deprecated by strsignal and its usage imposes issues
such as copy relocations.
Its internal name is changed to __sys_siglist_internal to avoid static
linking usage. The compat code is also refactored, since both Linux
and Hurd usage the same strategy: export the same array with different
object sizes.
The libSegfault change avoids calling strsignal on the SIGFAULT signal
handler (the current usage is already sketchy, adding a call that
potentially issue locale internal function is even sketchier).
Checked on x86_64-linux-gnu and i686-linux-gnu. I also run a check-abi
on all affected platforms.
---
NEWS | 6 ++
debug/segfault.c | 18 ++---
include/signal.h | 2 +-
signal/signal.h | 6 --
stdio-common/psiginfo.c | 2 +-
stdio-common/psignal.c | 2 +-
stdio-common/siglist.c | 7 +-
string/strsignal.c | 2 +-
sysdeps/generic/siglist-compat.c | 1 +
sysdeps/generic/siglist-compat.h | 47 +++++++++++
sysdeps/gnu/siglist.c | 78 -------------------
.../mach/hurd/{siglist.h => siglist-compat.c} | 13 +++-
.../linux/{siglist.h => siglist-compat.c} | 17 ++--
13 files changed, 90 insertions(+), 111 deletions(-)
create mode 100644 sysdeps/generic/siglist-compat.c
create mode 100644 sysdeps/generic/siglist-compat.h
delete mode 100644 sysdeps/gnu/siglist.c
rename sysdeps/mach/hurd/{siglist.h => siglist-compat.c} (68%)
rename sysdeps/unix/sysv/linux/{siglist.h => siglist-compat.c} (62%)
diff --git a/NEWS b/NEWS
index 0e627b3405..814903253f 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,12 @@ Deprecated and removed features, and other changes affecting compatibility:
but always fails with ENOSYS. This reflects the removal of the system
call from all architectures, starting with Linux 5.5.
+* The deprecated sys_siglist, _sys_siglist, and sys_sigabbrev arrays are
+ non longer available to newly linked binaries, and their declarations
+ have removed from from <string.h>. They are exported solely as
+ compatibility symbols to support old binaries. All programs should use
+ strsignal instead.
+
Changes to build and runtime requirements:
[Add changes to build and runtime requirements here]
diff --git a/debug/segfault.c b/debug/segfault.c
index 14c64cd0bd..8b59783c9e 100644
--- a/debug/segfault.c
+++ b/debug/segfault.c
@@ -49,20 +49,16 @@
static const char *fname;
-/* We better should not use `strerror' since it can call far too many
- other functions which might fail. Do it here ourselves. */
+/* Print the signal number SIGNAL. Either strerror or strsignal might
+ call local internal functions and these in turn call far too many
+ other functions and might even allocate memory which might fail. */
static void
write_strsignal (int fd, int signal)
{
- if (signal < 0 || signal >= _NSIG || _sys_siglist[signal] == NULL)
- {
- char buf[30];
- char *ptr = _itoa_word (signal, &buf[sizeof (buf)], 10, 0);
- WRITE_STRING ("signal ");
- write (fd, buf, &buf[sizeof (buf)] - ptr);
- }
- else
- WRITE_STRING (_sys_siglist[signal]);
+ char buf[30];
+ char *ptr = _itoa_word (signal, &buf[sizeof (buf)], 10, 0);
+ WRITE_STRING ("signal ");
+ write (fd, buf, &buf[sizeof (buf)] - ptr);
}
diff --git a/include/signal.h b/include/signal.h
index 293258ad65..ce511cfe60 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -12,7 +12,7 @@ libc_hidden_proto (__sigpause)
libc_hidden_proto (raise)
libc_hidden_proto (__libc_current_sigrtmin)
libc_hidden_proto (__libc_current_sigrtmax)
-libc_hidden_proto (_sys_siglist)
+extern const char *const __sys_siglist_internal[_NSIG] attribute_hidden;
/* Now define the internal interfaces. */
extern __sighandler_t __bsd_signal (int __sig, __sighandler_t __handler);
diff --git a/signal/signal.h b/signal/signal.h
index fa8de963f8..3739550e5f 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -281,12 +281,6 @@ extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
#ifdef __USE_MISC
-/* Names of the signals. This variable exists only for compatibility.
- Use `strsignal' instead (see <string.h>). */
-extern const char *const _sys_siglist[_NSIG];
-extern const char *const sys_siglist[_NSIG];
-
-
/* Get machine-dependent `struct sigcontext' and signal subcodes. */
# include <bits/sigcontext.h>
diff --git a/stdio-common/psiginfo.c b/stdio-common/psiginfo.c
index 4d498d00aa..e7c3b6137e 100644
--- a/stdio-common/psiginfo.c
+++ b/stdio-common/psiginfo.c
@@ -80,7 +80,7 @@ psiginfo (const siginfo_t *pinfo, const char *s)
const char *desc;
if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
- && ((desc = _sys_siglist[pinfo->si_signo]) != NULL
+ && ((desc = __sys_siglist_internal[pinfo->si_signo]) != NULL
#ifdef SIGRTMIN
|| (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
#endif
diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index de45e52734..20459a3bb0 100644
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -34,7 +34,7 @@ psignal (int sig, const char *s)
else
colon = ": ";
- if (sig >= 0 && sig < NSIG && (desc = _sys_siglist[sig]) != NULL)
+ if (sig >= 0 && sig < NSIG && (desc = __sys_siglist_internal[sig]) != NULL)
(void) __fxprintf (NULL, "%s%s%s\n", s, colon, _(desc));
else
{
diff --git a/stdio-common/siglist.c b/stdio-common/siglist.c
index 04082594a0..34c32f9bc0 100644
--- a/stdio-common/siglist.c
+++ b/stdio-common/siglist.c
@@ -20,17 +20,18 @@
#include <signal.h>
#include <libintl.h>
-const char *const _sys_siglist[NSIG] =
+const char *const __sys_siglist_internal[NSIG] =
{
#define init_sig(sig, abbrev, desc) [sig] = desc,
#include <siglist.h>
#undef init_sig
};
-
-const char *const _sys_sigabbrev[NSIG] =
+const char *const __sys_sigabbrev_internal[NSIG] =
{
#define init_sig(sig, abbrev, desc) [sig] = abbrev,
#include <siglist.h>
#undef init_sig
};
+
+#include <siglist-compat.c>
diff --git a/string/strsignal.c b/string/strsignal.c
index 2843ffe39b..1551480026 100644
--- a/string/strsignal.c
+++ b/string/strsignal.c
@@ -51,7 +51,7 @@ strsignal (int signum)
(signum >= SIGRTMIN && signum <= SIGRTMAX) ||
#endif
signum < 0 || signum >= NSIG
- || (desc = _sys_siglist[signum]) == NULL)
+ || (desc = __sys_siglist_internal[signum]) == NULL)
{
char *buffer = getbuffer ();
int len;
diff --git a/sysdeps/generic/siglist-compat.c b/sysdeps/generic/siglist-compat.c
new file mode 100644
index 0000000000..6e25b021ab
--- /dev/null
+++ b/sysdeps/generic/siglist-compat.c
@@ -0,0 +1 @@
+/* Empty. */
diff --git a/sysdeps/generic/siglist-compat.h b/sysdeps/generic/siglist-compat.h
new file mode 100644
index 0000000000..b857efb9d7
--- /dev/null
+++ b/sysdeps/generic/siglist-compat.h
@@ -0,0 +1,47 @@
+/* Generic siglist compatibility macro definitions.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _SIGLIST_COMPAT_H
+#define _SIGLIST_COMPAT_H
+
+#include <shlib-compat.h>
+#include <limits.h>
+
+/* Define new compat symbols for _sys_siglist, sys_siglist, and sys_sigabbrev
+ for version VERSION with NUMBERSIG times number of bytes per long int size.
+ Both _sys_siglist and sys_siglist alias to __sys_siglist_internal while
+ sys_sigabbrev alias to _sys_sigabbrev_internal. Both target alias are
+ define in siglist.c. */
+#define DEFINE_COMPAT_SIGLIST(NUMBERSIG, VERSION) \
+ declare_symbol_alias (__ ## VERSION ## _sys_siglist, \
+ __sys_siglist_internal, \
+ object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \
+ declare_symbol_alias (__ ## VERSION ## sys_siglist, \
+ __sys_siglist_internal, \
+ object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \
+ declare_symbol_alias (__ ## VERSION ## _sys_sigabbrev, \
+ __sys_sigabbrev_internal, \
+ object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \
+ compat_symbol (libc, __## VERSION ## _sys_siglist, _sys_siglist, \
+ VERSION); \
+ compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \
+ VERSION); \
+ compat_symbol (libc, __## VERSION ## _sys_sigabbrev, sys_sigabbrev, \
+ VERSION); \
+
+#endif
diff --git a/sysdeps/gnu/siglist.c b/sysdeps/gnu/siglist.c
deleted file mode 100644
index c24f356f21..0000000000
--- a/sysdeps/gnu/siglist.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Define list of all signal numbers and their names.
- Copyright (C) 1997-2020 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <stddef.h>
-#include <signal.h>
-#include <libintl.h>
-#include <shlib-compat.h>
-#include <bits/wordsize.h>
-
-const char *const __new_sys_siglist[NSIG] =
-{
-#define init_sig(sig, abbrev, desc) [sig] = desc,
-#include <siglist.h>
-#undef init_sig
-};
-libc_hidden_ver (__new_sys_siglist, _sys_siglist)
-
-const char *const __new_sys_sigabbrev[NSIG] =
-{
-#define init_sig(sig, abbrev, desc) [sig] = abbrev,
-#include <siglist.h>
-#undef init_sig
-};
-
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-declare_symbol_alias (__old_sys_siglist, __new_sys_siglist, object,
- OLD_SIGLIST_SIZE * __WORDSIZE / 8)
-
-declare_symbol_alias (__old_sys_sigabbrev, __new_sys_sigabbrev, object,
- OLD_SIGLIST_SIZE * __WORDSIZE / 8)
-
-declare_symbol_alias (_old_sys_siglist, __new_sys_siglist, object,
- OLD_SIGLIST_SIZE * __WORDSIZE / 8)
-
-compat_symbol (libc, __old_sys_siglist, _sys_siglist, GLIBC_2_0);
-compat_symbol (libc, _old_sys_siglist, sys_siglist, GLIBC_2_0);
-compat_symbol (libc, __old_sys_sigabbrev, sys_sigabbrev, GLIBC_2_0);
-#endif
-
-#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3) && defined OLD2_SIGLIST_SIZE
-declare_symbol_alias (__old2_sys_siglist, __new_sys_siglist, object,
- OLD2_SIGLIST_SIZE * __WORDSIZE / 8)
-
-declare_symbol_alias (__old2_sys_sigabbrev, __new_sys_sigabbrev, object,
- OLD2_SIGLIST_SIZE * __WORDSIZE / 8)
-
-declare_symbol_alias (_old2_sys_siglist, __new_sys_siglist, object,
- OLD2_SIGLIST_SIZE * __WORDSIZE / 8)
-
-compat_symbol (libc, __old2_sys_siglist, _sys_siglist, GLIBC_2_1);
-compat_symbol (libc, _old2_sys_siglist, sys_siglist, GLIBC_2_1);
-compat_symbol (libc, __old2_sys_sigabbrev, sys_sigabbrev, GLIBC_2_1);
-
-strong_alias (__new_sys_siglist, _new_sys_siglist)
-versioned_symbol (libc, __new_sys_siglist, _sys_siglist, GLIBC_2_3_3);
-versioned_symbol (libc, _new_sys_siglist, sys_siglist, GLIBC_2_3_3);
-versioned_symbol (libc, __new_sys_sigabbrev, sys_sigabbrev, GLIBC_2_3_3);
-#else
-strong_alias (__new_sys_siglist, _new_sys_siglist)
-versioned_symbol (libc, __new_sys_siglist, _sys_siglist, GLIBC_2_1);
-versioned_symbol (libc, _new_sys_siglist, sys_siglist, GLIBC_2_1);
-versioned_symbol (libc, __new_sys_sigabbrev, sys_sigabbrev, GLIBC_2_1);
-#endif
diff --git a/sysdeps/mach/hurd/siglist.h b/sysdeps/mach/hurd/siglist-compat.c
similarity index 68%
rename from sysdeps/mach/hurd/siglist.h
rename to sysdeps/mach/hurd/siglist-compat.c
index 2eee091610..c93f12366b 100644
--- a/sysdeps/mach/hurd/siglist.h
+++ b/sysdeps/mach/hurd/siglist-compat.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1999-2020 Free Software Foundation, Inc.
+/* Compatibility signal numbers and their names symbols. Hurd version.
+ Copyright (C) 1997-2020 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
@@ -15,8 +16,12 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-/* This file is included multiple times. */
+#include <siglist-compat.h>
-#include_next <siglist.h> /* Get the canonical list. */
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+DEFINE_COMPAT_SIGLIST (33, GLIBC_2_0)
+#endif
-#define OLD_SIGLIST_SIZE 33 /* For GLIBC_2.0 binary compatibility. */
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_32)
+DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_1)
+#endif
diff --git a/sysdeps/unix/sysv/linux/siglist.h b/sysdeps/unix/sysv/linux/siglist-compat.c
similarity index 62%
rename from sysdeps/unix/sysv/linux/siglist.h
rename to sysdeps/unix/sysv/linux/siglist-compat.c
index 6ff2c613ad..c322326a99 100644
--- a/sysdeps/unix/sysv/linux/siglist.h
+++ b/sysdeps/unix/sysv/linux/siglist-compat.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
+/* Compatibility signal numbers and their names symbols. Linux version.
+ Copyright (C) 1997-2020 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
@@ -15,10 +16,16 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-/* This file is included multiple times. */
+#include <siglist-compat.h>
-#include_next <siglist.h> /* Get the canonical list. */
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+DEFINE_COMPAT_SIGLIST (32, GLIBC_2_0)
+#endif
-#define OLD_SIGLIST_SIZE 32 /* For GLIBC_2.0 binary compatibility. */
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3_3)
+DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1)
+#endif
-#define OLD2_SIGLIST_SIZE 64 /* For GLIBC_2.1 binary compatibility. */
+#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32)
+DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_3_3)
+#endif
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 2/5] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
@ 2020-04-27 21:48 ` Adhemerval Zanella
2020-04-28 14:53 ` Florian Weimer
2020-04-28 14:54 ` Joseph Myers
2020-04-27 21:48 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
` (2 subsequent siblings)
4 siblings, 2 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-27 21:48 UTC (permalink / raw)
To: libc-alpha
The symbol is deprecated by strsignal and its usage imposes some issues
such as copy relocations.
Its internal names is changed to _sys_errlist_internal to avoid static
linking usage. The compat code is also refactored by removing the over
enginered errlist-compat.c generation from manual entried. It
disantangle the code generation from manual and simplify both Linux and
Hurd compat code (no more scatter definition on both manual and linker
scripts).
Checked on x86_64-linux-gnu and i686-linux-gnu. I also run a check-abi
on all affected platforms.
---
NEWS | 6 +
stdio-common/errlist.c | 4 +-
string/_strerror.c | 4 +-
string/strerror_l.c | 6 +-
sysdeps/gnu/Makefile | 43 -
sysdeps/gnu/errlist-compat.awk | 133 --
sysdeps/gnu/errlist.awk | 110 --
sysdeps/gnu/errlist.c | 1495 -----------------
sysdeps/mach/hurd/errlist.c | 117 +-
sysdeps/unix/sysv/linux/Versions | 10 -
sysdeps/unix/sysv/linux/alpha/Versions | 12 -
.../unix/sysv/linux/alpha/errlist-compat.c | 43 +
sysdeps/unix/sysv/linux/errlist-compat.c | 39 +
sysdeps/unix/sysv/linux/errlist-compat.h | 43 +
sysdeps/unix/sysv/linux/errlist.c | 162 ++
sysdeps/unix/sysv/linux/hppa/Versions | 10 -
sysdeps/unix/sysv/linux/hppa/errlist-compat.c | 39 +
sysdeps/unix/sysv/linux/mips/Versions | 7 -
.../sys_errlist.h => mips/errlist-compat.c} | 21 +-
sysdeps/unix/sysv/linux/sparc/Versions | 10 -
.../unix/sysv/linux/sparc/errlist-compat.c | 43 +
21 files changed, 501 insertions(+), 1856 deletions(-)
delete mode 100644 sysdeps/gnu/errlist-compat.awk
delete mode 100644 sysdeps/gnu/errlist.awk
delete mode 100644 sysdeps/gnu/errlist.c
create mode 100644 sysdeps/unix/sysv/linux/alpha/errlist-compat.c
create mode 100644 sysdeps/unix/sysv/linux/errlist-compat.c
create mode 100644 sysdeps/unix/sysv/linux/errlist-compat.h
create mode 100644 sysdeps/unix/sysv/linux/errlist.c
create mode 100644 sysdeps/unix/sysv/linux/hppa/errlist-compat.c
rename sysdeps/unix/sysv/linux/{bits/sys_errlist.h => mips/errlist-compat.c} (61%)
create mode 100644 sysdeps/unix/sysv/linux/sparc/errlist-compat.c
diff --git a/NEWS b/NEWS
index 814903253f..58d256bcae 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,12 @@ Deprecated and removed features, and other changes affecting compatibility:
compatibility symbols to support old binaries. All programs should use
strsignal instead.
+* The deprecated sys_errlist, _sys_errlist, sys_nerr, and _sys_nerr arrays
+ are non longer available to newly linked binaries, and their declarations
+ have removed from from <errno.h>. They are exported solely as
+ compatibility symbols to support old binaries. All programs should use
+ strerror or strerror_r instead.
+
Changes to build and runtime requirements:
[Add changes to build and runtime requirements here]
diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c
index 91fa789be0..e0370032aa 100644
--- a/stdio-common/errlist.c
+++ b/stdio-common/errlist.c
@@ -18,7 +18,7 @@
#include <array_length.h>
#include <stddef.h>
-const char *const _sys_errlist[] =
+const char *const _sys_errlist_internal[] =
{
"Error 0", /* 0 */
"Argument out of function's domain", /* 1 = EDOM */
@@ -33,4 +33,4 @@ const char *const _sys_errlist[] =
"Too many open files", /* 10 = EMFILE */
};
-const int _sys_nerr = array_length (_sys_errlist);
+const int _sys_nerr_internal = array_length (_sys_errlist);
diff --git a/string/_strerror.c b/string/_strerror.c
index af6be56fdc..985fd4e3c6 100644
--- a/string/_strerror.c
+++ b/string/_strerror.c
@@ -36,8 +36,8 @@
char *
__strerror_r (int errnum, char *buf, size_t buflen)
{
- if (__builtin_expect (errnum < 0 || errnum >= _sys_nerr_internal
- || _sys_errlist_internal[errnum] == NULL, 0))
+ if (__glibc_unlikely (errnum < 0 || errnum >= _sys_nerr_internal
+ || _sys_errlist_internal[errnum] == NULL))
{
/* Buffer we use to print the number in. For a maximum size for
`int' of 8 bytes we never need more than 20 digits. */
diff --git a/string/strerror_l.c b/string/strerror_l.c
index c8c3d4a6ef..40e7d0e896 100644
--- a/string/strerror_l.c
+++ b/string/strerror_l.c
@@ -40,10 +40,8 @@ translate (const char *str, locale_t loc)
char *
strerror_l (int errnum, locale_t loc)
{
-
-
- if (__builtin_expect (errnum < 0 || errnum >= _sys_nerr_internal
- || _sys_errlist_internal[errnum] == NULL, 0))
+ if (__glibc_unlikely (errnum < 0 || errnum >= _sys_nerr_internal
+ || _sys_errlist_internal[errnum] == NULL))
{
free (last_value);
if (__asprintf (&last_value, "%s%d",
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 97fcb6fb90..9cf34c8ac6 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -15,49 +15,6 @@
# License along with the GNU C Library; if not, see
# <https://www.gnu.org/licenses/>.
-# Generate the list of strings for errno codes from the section of the
-# manual which documents the codes.
-
-$(..)sysdeps/gnu/errlist.c: $(..)sysdeps/gnu/errlist.awk \
- $(..)manual/errno.texi
- $(AWK) -f $^ > $@-tmp
-# Make it unwritable so noone will edit it by mistake.
- -chmod a-w $@-tmp
- mv -f $@-tmp $@
-
-ifeq ($(subdir),stdio-common)
-
-errlist-c = $(firstword $(wildcard $(addsuffix /errlist.c,$(sysdirs) .)))
-
-libof-errlist-compat = extramodules
-
-ifeq ($(build-shared),yes)
-$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
- $(common-objpfx)Versions.v.i $(before-compile)
-else
-$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
- $(before-compile)
-endif
- $(make-target-directory)
- $(AWK) -v maxerr=`\
- $(CC) -S $(CPPFLAGS) $(CFLAGS) -DEMIT_ERR_MAX $< -o - \
- | sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
- -f $(..)sysdeps/gnu/errlist-compat.awk \
- $(wildcard $(sysdirs:=/Versions)) > $@T
-# 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
-
-# This will force the generation above to happy if need be.
-$(foreach o,$(object-suffixes) $(object-suffixes:=.d),\
- $(objpfx)errlist$o): $(objpfx)errlist-compat.h
-endif
-
ifeq ($(subdir),login)
sysdep_routines += setutxent getutxent endutxent getutxid getutxline \
pututxline utmpxname updwtmpx getutmpx getutmp
diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
deleted file mode 100644
index 07334c63d8..0000000000
--- a/sysdeps/gnu/errlist-compat.awk
+++ /dev/null
@@ -1,133 +0,0 @@
-# awk script to generate errlist-compat.c
-# Copyright (C) 2002-2020 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
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, see
-# <https://www.gnu.org/licenses/>.
-
-#
-# This script takes the Versions file as input and looks for #errlist-compat
-# magic comments, which have the form:
-# #errlist-compat NNN
-# where NNN is the number of elements in the sys_errlist for that version set.
-# We need the awk variable `maxerr' defined to the current size of sys_errlist.
-#
-# If there is no magic comment matching the current size, we barf.
-# Otherwise we generate code (errlist-compat.c) to define all the
-# necessary compatibility symbols for older, smaller versions of sys_errlist.
-#
-
-# These two rules catch the Versions file contents.
-NF == 2 && $2 == "{" { last_version = $1; next }
-$1 == "#errlist-compat" {
- # Don't process any further Versions files
- ARGC = ARGIND + 1;
- cnt = $2 + 0;
- if (cnt < 80) {
- print "*** this line seems bogus:", $0 > "/dev/stderr";
- exit 1;
- }
- version[pos + 0] = cnt SUBSEP last_version;
- pos++;
- if (cnt < highest) {
- printf "*** %s #errlist-compat counts are not sorted\n", ARGV[ARGIND];
- exit 1;
- }
- if (cnt > highest)
- highest = cnt;
- highest_version = last_version;
- next;
-}
-
-END {
- if (! highest_version) {
- print "/* No sys_errlist/sys_nerr symbols defined on this platform. */";
- exit 0;
- }
-
- count = maxerr + 1;
-
- if (highest < count) {
- printf "*** errlist.c count %d vs Versions sys_errlist@%s count %d\n", \
- count, highest_version, highest > "/dev/stderr";
- exit 1;
- }
-
- lastv = "";
- for (n = 0; n < pos; ++n) {
- split(version[n], t, SUBSEP)
- v = t[2];
- gsub(/[^A-Z0-9_]/, "_", v);
- if (lastv != "")
- compat[lastv] = v;
- lastv = v;
- vcount[v] = t[1];
- }
-
- 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 - 1;
- }
-
- # same regardless of awk's ordering of the associative array.
- num_compat_elems = asorti(compat, compat_indices)
- for (i = 1; i <= num_compat_elems; i++) {
- old = compat_indices[i]
- new = compat[old];
- n = vcount[old];
- printf "#if SHLIB_COMPAT (libc, %s, %s)\n", old, new;
- printf "# include <bits/wordsize.h>\n";
- printf "extern const char *const __sys_errlist_%s[NERR];\n", old;
- printf "const int __sys_nerr_%s = %d;\n", old, n;
- printf "declare_symbol_alias (__sys_errlist_%s, _sys_errlist_internal,", \
- old;
- printf " object, __WORDSIZE/8*%d)\n", n;
- printf "compat_symbol (libc, __sys_errlist_%s, sys_errlist, %s);\n", \
- old, old;
- printf "compat_symbol (libc, __sys_nerr_%s, sys_nerr, %s);\n", old, old;
-
- printf "extern const char *const ___sys_errlist_%s[NERR];\n", old;
- printf "extern const int __sys_nerr_%s;\n", old;
- printf "declare_symbol_alias (___sys_errlist_%s, _sys_errlist_internal,", \
- old;
- printf " object, __WORDSIZE/8*%d)\n", n;
- printf "strong_alias (__sys_nerr_%s, ___sys_nerr_%s)\n", old, old;
- printf "compat_symbol (libc, ___sys_errlist_%s, _sys_errlist, %s);\n", \
- old, old;
- printf "compat_symbol (libc, ___sys_nerr_%s, _sys_nerr, %s);\n", old, old;
- printf "#endif\n\n";
- }
-
- printf "\
-extern const char *const __sys_errlist_internal[NERR];\n\
-extern const int __sys_nerr_internal;\n\
-strong_alias (_sys_errlist_internal, __sys_errlist_internal)\n\
-strong_alias (_sys_nerr_internal, __sys_nerr_internal)\n\
-extern const char *const sys_errlist[NERR];\n\
-versioned_symbol (libc, _sys_errlist_internal, sys_errlist, %s);\n\
-versioned_symbol (libc, __sys_errlist_internal, _sys_errlist, %s);\n\
-versioned_symbol (libc, _sys_nerr_internal, sys_nerr, %s);\n\
-versioned_symbol (libc, __sys_nerr_internal, _sys_nerr, %s);\n", \
- lastv, lastv, lastv, lastv;
-
- print "\n\
-link_warning (sys_errlist, \"\
-`sys_errlist' is deprecated; use `strerror' or `strerror_r' instead\")\n\
-link_warning (sys_nerr, \"\
-`sys_nerr' is deprecated; use `strerror' or `strerror_r' instead\")";
-}
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
deleted file mode 100644
index 09f80f5b44..0000000000
--- a/sysdeps/gnu/errlist.awk
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright (C) 1991-2020 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
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, see
-# <https://www.gnu.org/licenses/>.
-
-# errno.texi contains lines like:
-# @deftypevr Macro int ENOSYS
-# @errno{ENOSYS, 78, Function not implemented}
-# Descriptive paragraph...
-# @end deftypevr
-
-BEGIN {
-
- # Here we list the E* names that might be duplicate names for the
- # same integer value on some systems. This causes the code below
- # to generate ``#if defined (ALIAS) && ALIAS != ORIGINAL'' in the code,
- # so the output does not presume that these are in fact aliases.
- # We list here all the known potential cases on any system,
- # so that the C source we produce will do the right thing based
- # on the actual #define'd values it's compiled with.
- alias["EWOULDBLOCK"]= "EAGAIN";
- alias["EDEADLOCK"] = "EDEADLK";
- alias["ENOTSUP"] = "EOPNOTSUPP";
-
- print "/* This file is generated from errno.texi by errlist.awk. */"
- print "";
- print "#include <errno.h>";
- print "#include <libintl.h>";
- print "";
- print "#ifndef ERR_REMAP";
- print "# define ERR_REMAP(n) n";
- 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 ERR_MAX 0";
- print "# define ERRLIST_SIZE";
- print "#endif";
-
- print "const char *const _sys_errlist_internal[ERRLIST_SIZE] =";
- print " {";
- print " [0] = N_(\"Success\"),"
- }
-
-/^@errno\{/ \
- {
- etext = $3;
- for (i = 4; i <= NF; ++i)
- etext = etext " " $i;
- etext = substr(etext, 1, length(etext)-1)
- e = substr($1, 8, length($1)-8)
- errno = substr($2, 1, length($2)-1) + 0
- if (alias[e])
- printf "#if defined (%s) && %s != %s\n", e, e, alias[e];
- else
- printf "#ifdef %s\n", e;
- errnoh = 4;
- desc="";
- next;
- }
-errnoh == 4 && $1 == "@end" && $2 == "deftypevr" \
- {
- printf "/*%s */\n", desc;
- printf " [ERR_REMAP (%s)] = N_(\"%s\"),\n", e, etext;
- printf "# if %s > ERR_MAX\n", e;
- print "# undef ERR_MAX";
- printf "# define ERR_MAX %s\n", e;
- print "# endif";
- print "#endif";
- errnoh = 0;
- next;
- }
-errnoh == 4 \
- {
- # This magic tag in C comments gets them copied into libc.pot.
- desc = desc "\nTRANS" ($0 != "" ? " " : "") $0; next
- }
-END {
- print " };";
- print "";
- print "#define NERR \\";
- print " (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])";
- print "const int _sys_nerr_internal = NERR;"
- print "";
- print "#if IS_IN (libc) && !defined ERRLIST_NO_COMPAT";
- print "# include <errlist-compat.c>";
- print "#endif";
- print "";
- print "#ifdef EMIT_ERR_MAX";
- print "void dummy (void)"
- print "{ asm volatile (\" @@@ %0 @@@ \" : : \"i\" (ERR_REMAP (ERR_MAX))); }"
- print "#endif";
-}
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
deleted file mode 100644
index 77577bf3e1..0000000000
--- a/sysdeps/gnu/errlist.c
+++ /dev/null
@@ -1,1495 +0,0 @@
-/* This file is generated from errno.texi by errlist.awk. */
-
-#include <errno.h>
-#include <libintl.h>
-
-#ifndef ERR_REMAP
-# 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 ERR_MAX 0
-# define ERRLIST_SIZE
-#endif
-const char *const _sys_errlist_internal[ERRLIST_SIZE] =
- {
- [0] = N_("Success"),
-#ifdef EPERM
-/*
-TRANS Only the owner of the file (or other resource)
-TRANS or processes with special privileges can perform the operation. */
- [ERR_REMAP (EPERM)] = N_("Operation not permitted"),
-# if EPERM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPERM
-# endif
-#endif
-#ifdef ENOENT
-/*
-TRANS This is a ``file doesn't exist'' error
-TRANS for ordinary files that are referenced in contexts where they are
-TRANS expected to already exist. */
- [ERR_REMAP (ENOENT)] = N_("No such file or directory"),
-# if ENOENT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOENT
-# endif
-#endif
-#ifdef ESRCH
-/*
-TRANS No process matches the specified process ID. */
- [ERR_REMAP (ESRCH)] = N_("No such process"),
-# if ESRCH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESRCH
-# endif
-#endif
-#ifdef EINTR
-/*
-TRANS An asynchronous signal occurred and prevented
-TRANS completion of the call. When this happens, you should try the call
-TRANS again.
-TRANS
-TRANS You can choose to have functions resume after a signal that is handled,
-TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
-TRANS Primitives}. */
- [ERR_REMAP (EINTR)] = N_("Interrupted system call"),
-# if EINTR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EINTR
-# endif
-#endif
-#ifdef EIO
-/*
-TRANS Usually used for physical read or write errors. */
- [ERR_REMAP (EIO)] = N_("Input/output error"),
-# if EIO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EIO
-# endif
-#endif
-#ifdef ENXIO
-/*
-TRANS The system tried to use the device
-TRANS represented by a file you specified, and it couldn't find the device.
-TRANS This can mean that the device file was installed incorrectly, or that
-TRANS the physical device is missing or not correctly attached to the
-TRANS computer. */
- [ERR_REMAP (ENXIO)] = N_("No such device or address"),
-# if ENXIO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENXIO
-# endif
-#endif
-#ifdef E2BIG
-/*
-TRANS Used when the arguments passed to a new program
-TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
-TRANS File}) occupy too much memory space. This condition never arises on
-TRANS @gnuhurdsystems{}. */
- [ERR_REMAP (E2BIG)] = N_("Argument list too long"),
-# if E2BIG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX E2BIG
-# endif
-#endif
-#ifdef ENOEXEC
-/*
-TRANS Invalid executable file format. This condition is detected by the
-TRANS @code{exec} functions; see @ref{Executing a File}. */
- [ERR_REMAP (ENOEXEC)] = N_("Exec format error"),
-# if ENOEXEC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOEXEC
-# endif
-#endif
-#ifdef EBADF
-/*
-TRANS For example, I/O on a descriptor that has been
-TRANS closed or reading from a descriptor open only for writing (or vice
-TRANS versa). */
- [ERR_REMAP (EBADF)] = N_("Bad file descriptor"),
-# if EBADF > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADF
-# endif
-#endif
-#ifdef ECHILD
-/*
-TRANS This error happens on operations that are
-TRANS supposed to manipulate child processes, when there aren't any processes
-TRANS to manipulate. */
- [ERR_REMAP (ECHILD)] = N_("No child processes"),
-# if ECHILD > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECHILD
-# endif
-#endif
-#ifdef EDEADLK
-/*
-TRANS Allocating a system resource would have resulted in a
-TRANS deadlock situation. The system does not guarantee that it will notice
-TRANS all such situations. This error means you got lucky and the system
-TRANS noticed; it might just hang. @xref{File Locks}, for an example. */
- [ERR_REMAP (EDEADLK)] = N_("Resource deadlock avoided"),
-# if EDEADLK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDEADLK
-# endif
-#endif
-#ifdef ENOMEM
-/*
-TRANS The system cannot allocate more virtual memory
-TRANS because its capacity is full. */
- [ERR_REMAP (ENOMEM)] = N_("Cannot allocate memory"),
-# if ENOMEM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOMEM
-# endif
-#endif
-#ifdef EACCES
-/*
-TRANS The file permissions do not allow the attempted operation. */
- [ERR_REMAP (EACCES)] = N_("Permission denied"),
-# if EACCES > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EACCES
-# endif
-#endif
-#ifdef EFAULT
-/*
-TRANS An invalid pointer was detected.
-TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead. */
- [ERR_REMAP (EFAULT)] = N_("Bad address"),
-# if EFAULT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EFAULT
-# endif
-#endif
-#ifdef ENOTBLK
-/*
-TRANS A file that isn't a block special file was given in a situation that
-TRANS requires one. For example, trying to mount an ordinary file as a file
-TRANS system in Unix gives this error. */
- [ERR_REMAP (ENOTBLK)] = N_("Block device required"),
-# if ENOTBLK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTBLK
-# endif
-#endif
-#ifdef EBUSY
-/*
-TRANS A system resource that can't be shared is already in use.
-TRANS For example, if you try to delete a file that is the root of a currently
-TRANS mounted filesystem, you get this error. */
- [ERR_REMAP (EBUSY)] = N_("Device or resource busy"),
-# if EBUSY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBUSY
-# endif
-#endif
-#ifdef EEXIST
-/*
-TRANS An existing file was specified in a context where it only
-TRANS makes sense to specify a new file. */
- [ERR_REMAP (EEXIST)] = N_("File exists"),
-# if EEXIST > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EEXIST
-# endif
-#endif
-#ifdef EXDEV
-/*
-TRANS An attempt to make an improper link across file systems was detected.
-TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
-TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}). */
- [ERR_REMAP (EXDEV)] = N_("Invalid cross-device link"),
-# if EXDEV > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EXDEV
-# endif
-#endif
-#ifdef ENODEV
-/*
-TRANS The wrong type of device was given to a function that expects a
-TRANS particular sort of device. */
- [ERR_REMAP (ENODEV)] = N_("No such device"),
-# if ENODEV > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENODEV
-# endif
-#endif
-#ifdef ENOTDIR
-/*
-TRANS A file that isn't a directory was specified when a directory is required. */
- [ERR_REMAP (ENOTDIR)] = N_("Not a directory"),
-# if ENOTDIR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTDIR
-# endif
-#endif
-#ifdef EISDIR
-/*
-TRANS You cannot open a directory for writing,
-TRANS or create or remove hard links to it. */
- [ERR_REMAP (EISDIR)] = N_("Is a directory"),
-# if EISDIR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EISDIR
-# endif
-#endif
-#ifdef EINVAL
-/*
-TRANS This is used to indicate various kinds of problems
-TRANS with passing the wrong argument to a library function. */
- [ERR_REMAP (EINVAL)] = N_("Invalid argument"),
-# if EINVAL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EINVAL
-# endif
-#endif
-#ifdef EMFILE
-/*
-TRANS The current process has too many files open and can't open any more.
-TRANS Duplicate descriptors do count toward this limit.
-TRANS
-TRANS In BSD and GNU, the number of open files is controlled by a resource
-TRANS limit that can usually be increased. If you get this error, you might
-TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
-TRANS @pxref{Limits on Resources}. */
- [ERR_REMAP (EMFILE)] = N_("Too many open files"),
-# if EMFILE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EMFILE
-# endif
-#endif
-#ifdef ENFILE
-/*
-TRANS There are too many distinct file openings in the entire system. Note
-TRANS that any number of linked channels count as just one file opening; see
-TRANS @ref{Linked Channels}. This error never occurs on @gnuhurdsystems{}. */
- [ERR_REMAP (ENFILE)] = N_("Too many open files in system"),
-# if ENFILE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENFILE
-# endif
-#endif
-#ifdef ENOTTY
-/*
-TRANS Inappropriate I/O control operation, such as trying to set terminal
-TRANS modes on an ordinary file. */
- [ERR_REMAP (ENOTTY)] = N_("Inappropriate ioctl for device"),
-# if ENOTTY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTTY
-# endif
-#endif
-#ifdef ETXTBSY
-/*
-TRANS An attempt to execute a file that is currently open for writing, or
-TRANS write to a file that is currently being executed. Often using a
-TRANS debugger to run a program is considered having it open for writing and
-TRANS will cause this error. (The name stands for ``text file busy''.) This
-TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary. */
- [ERR_REMAP (ETXTBSY)] = N_("Text file busy"),
-# if ETXTBSY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ETXTBSY
-# endif
-#endif
-#ifdef EFBIG
-/*
-TRANS The size of a file would be larger than allowed by the system. */
- [ERR_REMAP (EFBIG)] = N_("File too large"),
-# if EFBIG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EFBIG
-# endif
-#endif
-#ifdef ENOSPC
-/*
-TRANS Write operation on a file failed because the
-TRANS disk is full. */
- [ERR_REMAP (ENOSPC)] = N_("No space left on device"),
-# if ENOSPC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOSPC
-# endif
-#endif
-#ifdef ESPIPE
-/*
-TRANS Invalid seek operation (such as on a pipe). */
- [ERR_REMAP (ESPIPE)] = N_("Illegal seek"),
-# if ESPIPE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESPIPE
-# endif
-#endif
-#ifdef EROFS
-/*
-TRANS An attempt was made to modify something on a read-only file system. */
- [ERR_REMAP (EROFS)] = N_("Read-only file system"),
-# if EROFS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EROFS
-# endif
-#endif
-#ifdef EMLINK
-/*
-TRANS The link count of a single file would become too large.
-TRANS @code{rename} can cause this error if the file being renamed already has
-TRANS as many links as it can take (@pxref{Renaming Files}). */
- [ERR_REMAP (EMLINK)] = N_("Too many links"),
-# if EMLINK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EMLINK
-# endif
-#endif
-#ifdef EPIPE
-/*
-TRANS There is no process reading from the other end of a pipe.
-TRANS Every library function that returns this error code also generates a
-TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
-TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
-TRANS unless it has handled or blocked @code{SIGPIPE}. */
- [ERR_REMAP (EPIPE)] = N_("Broken pipe"),
-# if EPIPE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPIPE
-# endif
-#endif
-#ifdef EDOM
-/*
-TRANS Used by mathematical functions when an argument value does
-TRANS not fall into the domain over which the function is defined. */
- [ERR_REMAP (EDOM)] = N_("Numerical argument out of domain"),
-# if EDOM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDOM
-# endif
-#endif
-#ifdef ERANGE
-/*
-TRANS Used by mathematical functions when the result value is
-TRANS not representable because of overflow or underflow. */
- [ERR_REMAP (ERANGE)] = N_("Numerical result out of range"),
-# if ERANGE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ERANGE
-# endif
-#endif
-#ifdef EAGAIN
-/*
-TRANS The call might work if you try again
-TRANS later. The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
-TRANS they are always the same in @theglibc{}.
-TRANS
-TRANS This error can happen in a few different situations:
-TRANS
-TRANS @itemize @bullet
-TRANS @item
-TRANS An operation that would block was attempted on an object that has
-TRANS non-blocking mode selected. Trying the same operation again will block
-TRANS until some external condition makes it possible to read, write, or
-TRANS connect (whatever the operation). You can use @code{select} to find out
-TRANS when the operation will be possible; @pxref{Waiting for I/O}.
-TRANS
-TRANS @strong{Portability Note:} In many older Unix systems, this condition
-TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
-TRANS different from @code{EAGAIN}. To make your program portable, you should
-TRANS check for both codes and treat them the same.
-TRANS
-TRANS @item
-TRANS A temporary resource shortage made an operation impossible. @code{fork}
-TRANS can return this error. It indicates that the shortage is expected to
-TRANS pass, so your program can try the call again later and it may succeed.
-TRANS It is probably a good idea to delay for a few seconds before trying it
-TRANS again, to allow time for other processes to release scarce resources.
-TRANS Such shortages are usually fairly serious and affect the whole system,
-TRANS so usually an interactive program should report the error to the user
-TRANS and return to its command loop.
-TRANS @end itemize */
- [ERR_REMAP (EAGAIN)] = N_("Resource temporarily unavailable"),
-# if EAGAIN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EAGAIN
-# endif
-#endif
-#if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-/*
-TRANS In @theglibc{}, this is another name for @code{EAGAIN} (above).
-TRANS The values are always the same, on every operating system.
-TRANS
-TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
-TRANS separate error code. */
- [ERR_REMAP (EWOULDBLOCK)] = N_("Operation would block"),
-# if EWOULDBLOCK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EWOULDBLOCK
-# endif
-#endif
-#ifdef EINPROGRESS
-/*
-TRANS An operation that cannot complete immediately was initiated on an object
-TRANS that has non-blocking mode selected. Some functions that must always
-TRANS block (such as @code{connect}; @pxref{Connecting}) never return
-TRANS @code{EAGAIN}. Instead, they return @code{EINPROGRESS} to indicate that
-TRANS the operation has begun and will take some time. Attempts to manipulate
-TRANS the object before the call completes return @code{EALREADY}. You can
-TRANS use the @code{select} function to find out when the pending operation
-TRANS has completed; @pxref{Waiting for I/O}. */
- [ERR_REMAP (EINPROGRESS)] = N_("Operation now in progress"),
-# if EINPROGRESS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EINPROGRESS
-# endif
-#endif
-#ifdef EALREADY
-/*
-TRANS An operation is already in progress on an object that has non-blocking
-TRANS mode selected. */
- [ERR_REMAP (EALREADY)] = N_("Operation already in progress"),
-# if EALREADY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EALREADY
-# endif
-#endif
-#ifdef ENOTSOCK
-/*
-TRANS A file that isn't a socket was specified when a socket is required. */
- [ERR_REMAP (ENOTSOCK)] = N_("Socket operation on non-socket"),
-# if ENOTSOCK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTSOCK
-# endif
-#endif
-#ifdef EMSGSIZE
-/*
-TRANS The size of a message sent on a socket was larger than the supported
-TRANS maximum size. */
- [ERR_REMAP (EMSGSIZE)] = N_("Message too long"),
-# if EMSGSIZE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EMSGSIZE
-# endif
-#endif
-#ifdef EPROTOTYPE
-/*
-TRANS The socket type does not support the requested communications protocol. */
- [ERR_REMAP (EPROTOTYPE)] = N_("Protocol wrong type for socket"),
-# if EPROTOTYPE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROTOTYPE
-# endif
-#endif
-#ifdef ENOPROTOOPT
-/*
-TRANS You specified a socket option that doesn't make sense for the
-TRANS particular protocol being used by the socket. @xref{Socket Options}. */
- [ERR_REMAP (ENOPROTOOPT)] = N_("Protocol not available"),
-# if ENOPROTOOPT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOPROTOOPT
-# endif
-#endif
-#ifdef EPROTONOSUPPORT
-/*
-TRANS The socket domain does not support the requested communications protocol
-TRANS (perhaps because the requested protocol is completely invalid).
-TRANS @xref{Creating a Socket}. */
- [ERR_REMAP (EPROTONOSUPPORT)] = N_("Protocol not supported"),
-# if EPROTONOSUPPORT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROTONOSUPPORT
-# endif
-#endif
-#ifdef ESOCKTNOSUPPORT
-/*
-TRANS The socket type is not supported. */
- [ERR_REMAP (ESOCKTNOSUPPORT)] = N_("Socket type not supported"),
-# if ESOCKTNOSUPPORT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESOCKTNOSUPPORT
-# endif
-#endif
-#ifdef EOPNOTSUPP
-/*
-TRANS The operation you requested is not supported. Some socket functions
-TRANS don't make sense for all types of sockets, and others may not be
-TRANS implemented for all communications protocols. On @gnuhurdsystems{}, this
-TRANS error can happen for many calls when the object does not support the
-TRANS particular operation; it is a generic indication that the server knows
-TRANS nothing to do for that call. */
- [ERR_REMAP (EOPNOTSUPP)] = N_("Operation not supported"),
-# if EOPNOTSUPP > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EOPNOTSUPP
-# endif
-#endif
-#ifdef EPFNOSUPPORT
-/*
-TRANS The socket communications protocol family you requested is not supported. */
- [ERR_REMAP (EPFNOSUPPORT)] = N_("Protocol family not supported"),
-# if EPFNOSUPPORT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPFNOSUPPORT
-# endif
-#endif
-#ifdef EAFNOSUPPORT
-/*
-TRANS The address family specified for a socket is not supported; it is
-TRANS inconsistent with the protocol being used on the socket. @xref{Sockets}. */
- [ERR_REMAP (EAFNOSUPPORT)] = N_("Address family not supported by protocol"),
-# if EAFNOSUPPORT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EAFNOSUPPORT
-# endif
-#endif
-#ifdef EADDRINUSE
-/*
-TRANS The requested socket address is already in use. @xref{Socket Addresses}. */
- [ERR_REMAP (EADDRINUSE)] = N_("Address already in use"),
-# if EADDRINUSE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EADDRINUSE
-# endif
-#endif
-#ifdef EADDRNOTAVAIL
-/*
-TRANS The requested socket address is not available; for example, you tried
-TRANS to give a socket a name that doesn't match the local host name.
-TRANS @xref{Socket Addresses}. */
- [ERR_REMAP (EADDRNOTAVAIL)] = N_("Cannot assign requested address"),
-# if EADDRNOTAVAIL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EADDRNOTAVAIL
-# endif
-#endif
-#ifdef ENETDOWN
-/*
-TRANS A socket operation failed because the network was down. */
- [ERR_REMAP (ENETDOWN)] = N_("Network is down"),
-# if ENETDOWN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENETDOWN
-# endif
-#endif
-#ifdef ENETUNREACH
-/*
-TRANS A socket operation failed because the subnet containing the remote host
-TRANS was unreachable. */
- [ERR_REMAP (ENETUNREACH)] = N_("Network is unreachable"),
-# if ENETUNREACH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENETUNREACH
-# endif
-#endif
-#ifdef ENETRESET
-/*
-TRANS A network connection was reset because the remote host crashed. */
- [ERR_REMAP (ENETRESET)] = N_("Network dropped connection on reset"),
-# if ENETRESET > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENETRESET
-# endif
-#endif
-#ifdef ECONNABORTED
-/*
-TRANS A network connection was aborted locally. */
- [ERR_REMAP (ECONNABORTED)] = N_("Software caused connection abort"),
-# if ECONNABORTED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECONNABORTED
-# endif
-#endif
-#ifdef ECONNRESET
-/*
-TRANS A network connection was closed for reasons outside the control of the
-TRANS local host, such as by the remote machine rebooting or an unrecoverable
-TRANS protocol violation. */
- [ERR_REMAP (ECONNRESET)] = N_("Connection reset by peer"),
-# if ECONNRESET > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECONNRESET
-# endif
-#endif
-#ifdef ENOBUFS
-/*
-TRANS The kernel's buffers for I/O operations are all in use. In GNU, this
-TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
-TRANS other from network operations. */
- [ERR_REMAP (ENOBUFS)] = N_("No buffer space available"),
-# if ENOBUFS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOBUFS
-# endif
-#endif
-#ifdef EISCONN
-/*
-TRANS You tried to connect a socket that is already connected.
-TRANS @xref{Connecting}. */
- [ERR_REMAP (EISCONN)] = N_("Transport endpoint is already connected"),
-# if EISCONN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EISCONN
-# endif
-#endif
-#ifdef ENOTCONN
-/*
-TRANS The socket is not connected to anything. You get this error when you
-TRANS try to transmit data over a socket, without first specifying a
-TRANS destination for the data. For a connectionless socket (for datagram
-TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead. */
- [ERR_REMAP (ENOTCONN)] = N_("Transport endpoint is not connected"),
-# if ENOTCONN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTCONN
-# endif
-#endif
-#ifdef EDESTADDRREQ
-/*
-TRANS No default destination address was set for the socket. You get this
-TRANS error when you try to transmit data over a connectionless socket,
-TRANS without first specifying a destination for the data with @code{connect}. */
- [ERR_REMAP (EDESTADDRREQ)] = N_("Destination address required"),
-# if EDESTADDRREQ > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDESTADDRREQ
-# endif
-#endif
-#ifdef ESHUTDOWN
-/*
-TRANS The socket has already been shut down. */
- [ERR_REMAP (ESHUTDOWN)] = N_("Cannot send after transport endpoint shutdown"),
-# if ESHUTDOWN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESHUTDOWN
-# endif
-#endif
-#ifdef ETOOMANYREFS
-/* */
- [ERR_REMAP (ETOOMANYREFS)] = N_("Too many references: cannot splice"),
-# if ETOOMANYREFS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ETOOMANYREFS
-# endif
-#endif
-#ifdef ETIMEDOUT
-/*
-TRANS A socket operation with a specified timeout received no response during
-TRANS the timeout period. */
- [ERR_REMAP (ETIMEDOUT)] = N_("Connection timed out"),
-# if ETIMEDOUT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ETIMEDOUT
-# endif
-#endif
-#ifdef ECONNREFUSED
-/*
-TRANS A remote host refused to allow the network connection (typically because
-TRANS it is not running the requested service). */
- [ERR_REMAP (ECONNREFUSED)] = N_("Connection refused"),
-# if ECONNREFUSED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECONNREFUSED
-# endif
-#endif
-#ifdef ELOOP
-/*
-TRANS Too many levels of symbolic links were encountered in looking up a file name.
-TRANS This often indicates a cycle of symbolic links. */
- [ERR_REMAP (ELOOP)] = N_("Too many levels of symbolic links"),
-# if ELOOP > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELOOP
-# endif
-#endif
-#ifdef ENAMETOOLONG
-/*
-TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
-TRANS Files}) or host name too long (in @code{gethostname} or
-TRANS @code{sethostname}; @pxref{Host Identification}). */
- [ERR_REMAP (ENAMETOOLONG)] = N_("File name too long"),
-# if ENAMETOOLONG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENAMETOOLONG
-# endif
-#endif
-#ifdef EHOSTDOWN
-/*
-TRANS The remote host for a requested network connection is down. */
- [ERR_REMAP (EHOSTDOWN)] = N_("Host is down"),
-# if EHOSTDOWN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EHOSTDOWN
-# endif
-#endif
-#ifdef EHOSTUNREACH
-/*
-TRANS The remote host for a requested network connection is not reachable. */
- [ERR_REMAP (EHOSTUNREACH)] = N_("No route to host"),
-# if EHOSTUNREACH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EHOSTUNREACH
-# endif
-#endif
-#ifdef ENOTEMPTY
-/*
-TRANS Directory not empty, where an empty directory was expected. Typically,
-TRANS this error occurs when you are trying to delete a directory. */
- [ERR_REMAP (ENOTEMPTY)] = N_("Directory not empty"),
-# if ENOTEMPTY > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTEMPTY
-# endif
-#endif
-#ifdef EPROCLIM
-/*
-TRANS This means that the per-user limit on new process would be exceeded by
-TRANS an attempted @code{fork}. @xref{Limits on Resources}, for details on
-TRANS the @code{RLIMIT_NPROC} limit. */
- [ERR_REMAP (EPROCLIM)] = N_("Too many processes"),
-# if EPROCLIM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROCLIM
-# endif
-#endif
-#ifdef EUSERS
-/*
-TRANS The file quota system is confused because there are too many users.
-TRANS @c This can probably happen in a GNU system when using NFS. */
- [ERR_REMAP (EUSERS)] = N_("Too many users"),
-# if EUSERS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EUSERS
-# endif
-#endif
-#ifdef EDQUOT
-/*
-TRANS The user's disk quota was exceeded. */
- [ERR_REMAP (EDQUOT)] = N_("Disk quota exceeded"),
-# if EDQUOT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDQUOT
-# endif
-#endif
-#ifdef ESTALE
-/*
-TRANS This indicates an internal confusion in the
-TRANS file system which is due to file system rearrangements on the server host
-TRANS for NFS file systems or corruption in other file systems.
-TRANS Repairing this condition usually requires unmounting, possibly repairing
-TRANS and remounting the file system. */
- [ERR_REMAP (ESTALE)] = N_("Stale file handle"),
-# if ESTALE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESTALE
-# endif
-#endif
-#ifdef EREMOTE
-/*
-TRANS An attempt was made to NFS-mount a remote file system with a file name that
-TRANS already specifies an NFS-mounted file.
-TRANS (This is an error on some operating systems, but we expect it to work
-TRANS properly on @gnuhurdsystems{}, making this error code impossible.) */
- [ERR_REMAP (EREMOTE)] = N_("Object is remote"),
-# if EREMOTE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EREMOTE
-# endif
-#endif
-#ifdef EBADRPC
-/* */
- [ERR_REMAP (EBADRPC)] = N_("RPC struct is bad"),
-# if EBADRPC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADRPC
-# endif
-#endif
-#ifdef ERPCMISMATCH
-/* */
- [ERR_REMAP (ERPCMISMATCH)] = N_("RPC version wrong"),
-# if ERPCMISMATCH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ERPCMISMATCH
-# endif
-#endif
-#ifdef EPROGUNAVAIL
-/* */
- [ERR_REMAP (EPROGUNAVAIL)] = N_("RPC program not available"),
-# if EPROGUNAVAIL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROGUNAVAIL
-# endif
-#endif
-#ifdef EPROGMISMATCH
-/* */
- [ERR_REMAP (EPROGMISMATCH)] = N_("RPC program version wrong"),
-# if EPROGMISMATCH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROGMISMATCH
-# endif
-#endif
-#ifdef EPROCUNAVAIL
-/* */
- [ERR_REMAP (EPROCUNAVAIL)] = N_("RPC bad procedure for program"),
-# if EPROCUNAVAIL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROCUNAVAIL
-# endif
-#endif
-#ifdef ENOLCK
-/*
-TRANS This is used by the file locking facilities; see
-TRANS @ref{File Locks}. This error is never generated by @gnuhurdsystems{}, but
-TRANS it can result from an operation to an NFS server running another
-TRANS operating system. */
- [ERR_REMAP (ENOLCK)] = N_("No locks available"),
-# if ENOLCK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOLCK
-# endif
-#endif
-#ifdef EFTYPE
-/*
-TRANS The file was the wrong type for the
-TRANS operation, or a data file had the wrong format.
-TRANS
-TRANS On some systems @code{chmod} returns this error if you try to set the
-TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}. */
- [ERR_REMAP (EFTYPE)] = N_("Inappropriate file type or format"),
-# if EFTYPE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EFTYPE
-# endif
-#endif
-#ifdef EAUTH
-/* */
- [ERR_REMAP (EAUTH)] = N_("Authentication error"),
-# if EAUTH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EAUTH
-# endif
-#endif
-#ifdef ENEEDAUTH
-/* */
- [ERR_REMAP (ENEEDAUTH)] = N_("Need authenticator"),
-# if ENEEDAUTH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENEEDAUTH
-# endif
-#endif
-#ifdef ENOSYS
-/*
-TRANS This indicates that the function called is
-TRANS not implemented at all, either in the C library itself or in the
-TRANS operating system. When you get this error, you can be sure that this
-TRANS particular function will always fail with @code{ENOSYS} unless you
-TRANS install a new version of the C library or the operating system. */
- [ERR_REMAP (ENOSYS)] = N_("Function not implemented"),
-# if ENOSYS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOSYS
-# endif
-#endif
-#if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
-/*
-TRANS A function returns this error when certain parameter
-TRANS values are valid, but the functionality they request is not available.
-TRANS This can mean that the function does not implement a particular command
-TRANS or option value or flag bit at all. For functions that operate on some
-TRANS object given in a parameter, such as a file descriptor or a port, it
-TRANS might instead mean that only @emph{that specific object} (file
-TRANS descriptor, port, etc.) is unable to support the other parameters given;
-TRANS different file descriptors might support different ranges of parameter
-TRANS values.
-TRANS
-TRANS If the entire function is not available at all in the implementation,
-TRANS it returns @code{ENOSYS} instead. */
- [ERR_REMAP (ENOTSUP)] = N_("Not supported"),
-# if ENOTSUP > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTSUP
-# endif
-#endif
-#ifdef EILSEQ
-/*
-TRANS While decoding a multibyte character the function came along an invalid
-TRANS or an incomplete sequence of bytes or the given wide character is invalid. */
- [ERR_REMAP (EILSEQ)] = N_("Invalid or incomplete multibyte or wide character"),
-# if EILSEQ > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EILSEQ
-# endif
-#endif
-#ifdef EBACKGROUND
-/*
-TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return
-TRANS this error for certain operations when the caller is not in the
-TRANS foreground process group of the terminal. Users do not usually see this
-TRANS error because functions such as @code{read} and @code{write} translate
-TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal. @xref{Job Control},
-TRANS for information on process groups and these signals. */
- [ERR_REMAP (EBACKGROUND)] = N_("Inappropriate operation for background process"),
-# if EBACKGROUND > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBACKGROUND
-# endif
-#endif
-#ifdef EDIED
-/*
-TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
-TRANS translated by a program and the translator program dies while starting
-TRANS up, before it has connected to the file. */
- [ERR_REMAP (EDIED)] = N_("Translator died"),
-# if EDIED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDIED
-# endif
-#endif
-#ifdef ED
-/*
-TRANS The experienced user will know what is wrong.
-TRANS @c This error code is a joke. Its perror text is part of the joke.
-TRANS @c Don't change it. */
- [ERR_REMAP (ED)] = N_("?"),
-# if ED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ED
-# endif
-#endif
-#ifdef EGREGIOUS
-/*
-TRANS You did @strong{what}? */
- [ERR_REMAP (EGREGIOUS)] = N_("You really blew it this time"),
-# if EGREGIOUS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EGREGIOUS
-# endif
-#endif
-#ifdef EIEIO
-/*
-TRANS Go home and have a glass of warm, dairy-fresh milk.
-TRANS @c Okay. Since you are dying to know, I'll tell you.
-TRANS @c This is a joke, obviously. There is a children's song which begins,
-TRANS @c "Old McDonald had a farm, e-i-e-i-o." Every time I see the (real)
-TRANS @c errno macro EIO, I think about that song. Probably most of my
-TRANS @c compatriots who program on Unix do, too. One of them must have stayed
-TRANS @c up a little too late one night and decided to add it to Hurd or Glibc.
-TRANS @c Whoever did it should be castigated, but it made me laugh.
-TRANS @c --jtobey@channel1.com
-TRANS @c
-TRANS @c "bought the farm" means "died". -jtobey
-TRANS @c
-TRANS @c Translators, please do not translate this litteraly, translate it into
-TRANS @c an idiomatic funny way of saying that the computer died. */
- [ERR_REMAP (EIEIO)] = N_("Computer bought the farm"),
-# if EIEIO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EIEIO
-# endif
-#endif
-#ifdef EGRATUITOUS
-/*
-TRANS This error code has no purpose. */
- [ERR_REMAP (EGRATUITOUS)] = N_("Gratuitous error"),
-# if EGRATUITOUS > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EGRATUITOUS
-# endif
-#endif
-#ifdef EBADMSG
-/* */
- [ERR_REMAP (EBADMSG)] = N_("Bad message"),
-# if EBADMSG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADMSG
-# endif
-#endif
-#ifdef EIDRM
-/* */
- [ERR_REMAP (EIDRM)] = N_("Identifier removed"),
-# if EIDRM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EIDRM
-# endif
-#endif
-#ifdef EMULTIHOP
-/* */
- [ERR_REMAP (EMULTIHOP)] = N_("Multihop attempted"),
-# if EMULTIHOP > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EMULTIHOP
-# endif
-#endif
-#ifdef ENODATA
-/* */
- [ERR_REMAP (ENODATA)] = N_("No data available"),
-# if ENODATA > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENODATA
-# endif
-#endif
-#ifdef ENOLINK
-/* */
- [ERR_REMAP (ENOLINK)] = N_("Link has been severed"),
-# if ENOLINK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOLINK
-# endif
-#endif
-#ifdef ENOMSG
-/* */
- [ERR_REMAP (ENOMSG)] = N_("No message of desired type"),
-# if ENOMSG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOMSG
-# endif
-#endif
-#ifdef ENOSR
-/* */
- [ERR_REMAP (ENOSR)] = N_("Out of streams resources"),
-# if ENOSR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOSR
-# endif
-#endif
-#ifdef ENOSTR
-/* */
- [ERR_REMAP (ENOSTR)] = N_("Device not a stream"),
-# if ENOSTR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOSTR
-# endif
-#endif
-#ifdef EOVERFLOW
-/* */
- [ERR_REMAP (EOVERFLOW)] = N_("Value too large for defined data type"),
-# if EOVERFLOW > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EOVERFLOW
-# endif
-#endif
-#ifdef EPROTO
-/* */
- [ERR_REMAP (EPROTO)] = N_("Protocol error"),
-# if EPROTO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EPROTO
-# endif
-#endif
-#ifdef ETIME
-/* */
- [ERR_REMAP (ETIME)] = N_("Timer expired"),
-# if ETIME > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ETIME
-# endif
-#endif
-#ifdef ECANCELED
-/*
-TRANS An asynchronous operation was canceled before it
-TRANS completed. @xref{Asynchronous I/O}. When you call @code{aio_cancel},
-TRANS the normal result is for the operations affected to complete with this
-TRANS error; @pxref{Cancel AIO Operations}. */
- [ERR_REMAP (ECANCELED)] = N_("Operation canceled"),
-# if ECANCELED > ERR_MAX
-# undef ERR_MAX
-# 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"),
-# if ERESTART > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ERESTART
-# endif
-#endif
-#ifdef ECHRNG
-/* */
- [ERR_REMAP (ECHRNG)] = N_("Channel number out of range"),
-# if ECHRNG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECHRNG
-# endif
-#endif
-#ifdef EL2NSYNC
-/* */
- [ERR_REMAP (EL2NSYNC)] = N_("Level 2 not synchronized"),
-# if EL2NSYNC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EL2NSYNC
-# endif
-#endif
-#ifdef EL3HLT
-/* */
- [ERR_REMAP (EL3HLT)] = N_("Level 3 halted"),
-# if EL3HLT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EL3HLT
-# endif
-#endif
-#ifdef EL3RST
-/* */
- [ERR_REMAP (EL3RST)] = N_("Level 3 reset"),
-# if EL3RST > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EL3RST
-# endif
-#endif
-#ifdef ELNRNG
-/* */
- [ERR_REMAP (ELNRNG)] = N_("Link number out of range"),
-# if ELNRNG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELNRNG
-# endif
-#endif
-#ifdef EUNATCH
-/* */
- [ERR_REMAP (EUNATCH)] = N_("Protocol driver not attached"),
-# if EUNATCH > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EUNATCH
-# endif
-#endif
-#ifdef ENOCSI
-/* */
- [ERR_REMAP (ENOCSI)] = N_("No CSI structure available"),
-# if ENOCSI > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOCSI
-# endif
-#endif
-#ifdef EL2HLT
-/* */
- [ERR_REMAP (EL2HLT)] = N_("Level 2 halted"),
-# if EL2HLT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EL2HLT
-# endif
-#endif
-#ifdef EBADE
-/* */
- [ERR_REMAP (EBADE)] = N_("Invalid exchange"),
-# if EBADE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADE
-# endif
-#endif
-#ifdef EBADR
-/* */
- [ERR_REMAP (EBADR)] = N_("Invalid request descriptor"),
-# if EBADR > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADR
-# endif
-#endif
-#ifdef EXFULL
-/* */
- [ERR_REMAP (EXFULL)] = N_("Exchange full"),
-# if EXFULL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EXFULL
-# endif
-#endif
-#ifdef ENOANO
-/* */
- [ERR_REMAP (ENOANO)] = N_("No anode"),
-# if ENOANO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOANO
-# endif
-#endif
-#ifdef EBADRQC
-/* */
- [ERR_REMAP (EBADRQC)] = N_("Invalid request code"),
-# if EBADRQC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADRQC
-# endif
-#endif
-#ifdef EBADSLT
-/* */
- [ERR_REMAP (EBADSLT)] = N_("Invalid slot"),
-# if EBADSLT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADSLT
-# endif
-#endif
-#if defined (EDEADLOCK) && EDEADLOCK != EDEADLK
-/* */
- [ERR_REMAP (EDEADLOCK)] = N_("File locking deadlock error"),
-# if EDEADLOCK > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDEADLOCK
-# endif
-#endif
-#ifdef EBFONT
-/* */
- [ERR_REMAP (EBFONT)] = N_("Bad font file format"),
-# if EBFONT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBFONT
-# endif
-#endif
-#ifdef ENONET
-/* */
- [ERR_REMAP (ENONET)] = N_("Machine is not on the network"),
-# if ENONET > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENONET
-# endif
-#endif
-#ifdef ENOPKG
-/* */
- [ERR_REMAP (ENOPKG)] = N_("Package not installed"),
-# if ENOPKG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOPKG
-# endif
-#endif
-#ifdef EADV
-/* */
- [ERR_REMAP (EADV)] = N_("Advertise error"),
-# if EADV > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EADV
-# endif
-#endif
-#ifdef ESRMNT
-/* */
- [ERR_REMAP (ESRMNT)] = N_("Srmount error"),
-# if ESRMNT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESRMNT
-# endif
-#endif
-#ifdef ECOMM
-/* */
- [ERR_REMAP (ECOMM)] = N_("Communication error on send"),
-# if ECOMM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ECOMM
-# endif
-#endif
-#ifdef EDOTDOT
-/* */
- [ERR_REMAP (EDOTDOT)] = N_("RFS specific error"),
-# if EDOTDOT > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EDOTDOT
-# endif
-#endif
-#ifdef ENOTUNIQ
-/* */
- [ERR_REMAP (ENOTUNIQ)] = N_("Name not unique on network"),
-# if ENOTUNIQ > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTUNIQ
-# endif
-#endif
-#ifdef EBADFD
-/* */
- [ERR_REMAP (EBADFD)] = N_("File descriptor in bad state"),
-# if EBADFD > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EBADFD
-# endif
-#endif
-#ifdef EREMCHG
-/* */
- [ERR_REMAP (EREMCHG)] = N_("Remote address changed"),
-# if EREMCHG > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EREMCHG
-# endif
-#endif
-#ifdef ELIBACC
-/* */
- [ERR_REMAP (ELIBACC)] = N_("Can not access a needed shared library"),
-# if ELIBACC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELIBACC
-# endif
-#endif
-#ifdef ELIBBAD
-/* */
- [ERR_REMAP (ELIBBAD)] = N_("Accessing a corrupted shared library"),
-# if ELIBBAD > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELIBBAD
-# endif
-#endif
-#ifdef ELIBSCN
-/* */
- [ERR_REMAP (ELIBSCN)] = N_(".lib section in a.out corrupted"),
-# if ELIBSCN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELIBSCN
-# endif
-#endif
-#ifdef ELIBMAX
-/* */
- [ERR_REMAP (ELIBMAX)] = N_("Attempting to link in too many shared libraries"),
-# if ELIBMAX > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELIBMAX
-# endif
-#endif
-#ifdef ELIBEXEC
-/* */
- [ERR_REMAP (ELIBEXEC)] = N_("Cannot exec a shared library directly"),
-# if ELIBEXEC > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ELIBEXEC
-# endif
-#endif
-#ifdef ESTRPIPE
-/* */
- [ERR_REMAP (ESTRPIPE)] = N_("Streams pipe error"),
-# if ESTRPIPE > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ESTRPIPE
-# endif
-#endif
-#ifdef EUCLEAN
-/* */
- [ERR_REMAP (EUCLEAN)] = N_("Structure needs cleaning"),
-# if EUCLEAN > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EUCLEAN
-# endif
-#endif
-#ifdef ENOTNAM
-/* */
- [ERR_REMAP (ENOTNAM)] = N_("Not a XENIX named type file"),
-# if ENOTNAM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOTNAM
-# endif
-#endif
-#ifdef ENAVAIL
-/* */
- [ERR_REMAP (ENAVAIL)] = N_("No XENIX semaphores available"),
-# if ENAVAIL > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENAVAIL
-# endif
-#endif
-#ifdef EISNAM
-/* */
- [ERR_REMAP (EISNAM)] = N_("Is a named type file"),
-# if EISNAM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EISNAM
-# endif
-#endif
-#ifdef EREMOTEIO
-/* */
- [ERR_REMAP (EREMOTEIO)] = N_("Remote I/O error"),
-# if EREMOTEIO > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EREMOTEIO
-# endif
-#endif
-#ifdef ENOMEDIUM
-/* */
- [ERR_REMAP (ENOMEDIUM)] = N_("No medium found"),
-# if ENOMEDIUM > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ENOMEDIUM
-# endif
-#endif
-#ifdef EMEDIUMTYPE
-/* */
- [ERR_REMAP (EMEDIUMTYPE)] = N_("Wrong medium type"),
-# if EMEDIUMTYPE > ERR_MAX
-# undef ERR_MAX
-# 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
-#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
-#ifdef EHWPOISON
-/* */
- [ERR_REMAP (EHWPOISON)] = N_("Memory page has hardware error"),
-# if EHWPOISON > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX EHWPOISON
-# endif
-#endif
- };
-
-#define NERR \
- (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])
-const int _sys_nerr_internal = NERR;
-
-#if IS_IN (libc) && !defined ERRLIST_NO_COMPAT
-# include <errlist-compat.c>
-#endif
-
-#ifdef EMIT_ERR_MAX
-void dummy (void)
-{ asm volatile (" @@@ %0 @@@ " : : "i" (ERR_REMAP (ERR_MAX))); }
-#endif
diff --git a/sysdeps/mach/hurd/errlist.c b/sysdeps/mach/hurd/errlist.c
index 451e8fa1eb..404b9711ba 100644
--- a/sysdeps/mach/hurd/errlist.c
+++ b/sysdeps/mach/hurd/errlist.c
@@ -18,11 +18,118 @@
/* sys_errlist cannot have Unix semantics on the Hurd, so it is easier just
to rename it. We also need to remap error codes to array indices by
taking their subcode. */
-#define _sys_errlist_internal _hurd_errlist
-#define _sys_nerr_internal _hurd_nerr
-#define ERRLIST_NO_COMPAT 1
+#include <errno.h>
+#include <libintl.h>
#include <mach/error.h>
-#define ERR_REMAP(n) (err_get_code (n))
+#include <array_length.h>
-#include <sysdeps/gnu/errlist.c>
+const char *const _hurd_errlist[] =
+ {
+ [0] = N_("Success"),
+ [err_get_code (ENOENT)] = N_("No such file or directory"),
+ [err_get_code (ESRCH)] = N_("No such process"),
+ [err_get_code (EINTR)] = N_("Interrupted system call"),
+ [err_get_code (EIO)] = N_("Input/output error"),
+ [err_get_code (ENXIO)] = N_("No such device or address"),
+ [err_get_code (E2BIG)] = N_("Argument list too long"),
+ [err_get_code (ENOEXEC)] = N_("Exec format error"),
+ [err_get_code (EBADF)] = N_("Bad file descriptor"),
+ [err_get_code (ECHILD)] = N_("No child processes"),
+ [err_get_code (EDEADLK)] = N_("Resource deadlock avoided"),
+ [err_get_code (ENOMEM)] = N_("Cannot allocate memory"),
+ [err_get_code (EACCES)] = N_("Permission denied"),
+ [err_get_code (EFAULT)] = N_("Bad address"),
+ [err_get_code (ENOTBLK)] = N_("Block device required"),
+ [err_get_code (EBUSY)] = N_("Device or resource busy"),
+ [err_get_code (EEXIST)] = N_("File exists"),
+ [err_get_code (EXDEV)] = N_("Invalid cross-device link"),
+ [err_get_code (ENODEV)] = N_("No such device"),
+ [err_get_code (ENOTDIR)] = N_("Not a directory"),
+ [err_get_code (EISDIR)] = N_("Is a directory"),
+ [err_get_code (EINVAL)] = N_("Invalid argument"),
+ [err_get_code (EMFILE)] = N_("Too many open files"),
+ [err_get_code (ENFILE)] = N_("Too many open files in system"),
+ [err_get_code (ENOTTY)] = N_("Inappropriate ioctl for device"),
+ [err_get_code (ETXTBSY)] = N_("Text file busy"),
+ [err_get_code (EFBIG)] = N_("File too large"),
+ [err_get_code (ENOSPC)] = N_("No space left on device"),
+ [err_get_code (ESPIPE)] = N_("Illegal seek"),
+ [err_get_code (EROFS)] = N_("Read-only file system"),
+ [err_get_code (EMLINK)] = N_("Too many links"),
+ [err_get_code (EPIPE)] = N_("Broken pipe"),
+ [err_get_code (EDOM)] = N_("Numerical argument out of domain"),
+ [err_get_code (ERANGE)] = N_("Numerical result out of range"),
+ [err_get_code (EAGAIN)] = N_("Resource temporarily unavailable"),
+ [err_get_code (EWOULDBLOCK)] = N_("Operation would block"),
+ [err_get_code (EINPROGRESS)] = N_("Operation now in progress"),
+ [err_get_code (EALREADY)] = N_("Operation already in progress"),
+ [err_get_code (ENOTSOCK)] = N_("Socket operation on non-socket"),
+ [err_get_code (EMSGSIZE)] = N_("Message too long"),
+ [err_get_code (EPROTOTYPE)] = N_("Protocol wrong type for socket"),
+ [err_get_code (ENOPROTOOPT)] = N_("Protocol not available"),
+ [err_get_code (EPROTONOSUPPORT)] = N_("Protocol not supported"),
+ [err_get_code (ESOCKTNOSUPPORT)] = N_("Socket type not supported"),
+ [err_get_code (EOPNOTSUPP)] = N_("Operation not supported"),
+ [err_get_code (EPFNOSUPPORT)] = N_("Protocol family not supported"),
+ [err_get_code (EAFNOSUPPORT)] = N_("Address family not supported by protocol"),
+ [err_get_code (EADDRINUSE)] = N_("Address already in use"),
+ [err_get_code (EADDRNOTAVAIL)] = N_("Cannot assign requested address"),
+ [err_get_code (ENETDOWN)] = N_("Network is down"),
+ [err_get_code (ENETUNREACH)] = N_("Network is unreachable"),
+ [err_get_code (ENETRESET)] = N_("Network dropped connection on reset"),
+ [err_get_code (ECONNABORTED)] = N_("Software caused connection abort"),
+ [err_get_code (ECONNRESET)] = N_("Connection reset by peer"),
+ [err_get_code (ENOBUFS)] = N_("No buffer space available"),
+ [err_get_code (EISCONN)] = N_("Transport endpoint is already connected"),
+ [err_get_code (ENOTCONN)] = N_("Transport endpoint is not connected"),
+ [err_get_code (EDESTADDRREQ)] = N_("Destination address required"),
+ [err_get_code (ESHUTDOWN)] = N_("Cannot send after transport endpoint shutdown"),
+ [err_get_code (ETOOMANYREFS)] = N_("Too many references: cannot splice"),
+ [err_get_code (ETIMEDOUT)] = N_("Connection timed out"),
+ [err_get_code (ECONNREFUSED)] = N_("Connection refused"),
+ [err_get_code (ELOOP)] = N_("Too many levels of symbolic links"),
+ [err_get_code (ENAMETOOLONG)] = N_("File name too long"),
+ [err_get_code (EHOSTDOWN)] = N_("Host is down"),
+ [err_get_code (EHOSTUNREACH)] = N_("No route to host"),
+ [err_get_code (ENOTEMPTY)] = N_("Directory not empty"),
+ [err_get_code (EPROCLIM)] = N_("Too many processes"),
+ [err_get_code (EUSERS)] = N_("Too many users"),
+ [err_get_code (EDQUOT)] = N_("Disk quota exceeded"),
+ [err_get_code (ESTALE)] = N_("Stale file handle"),
+ [err_get_code (EREMOTE)] = N_("Object is remote"),
+ [err_get_code (EBADRPC)] = N_("RPC struct is bad"),
+ [err_get_code (ERPCMISMATCH)] = N_("RPC version wrong"),
+ [err_get_code (EPROGUNAVAIL)] = N_("RPC program not available"),
+ [err_get_code (EPROGMISMATCH)] = N_("RPC program version wrong"),
+ [err_get_code (EPROCUNAVAIL)] = N_("RPC bad procedure for program"),
+ [err_get_code (ENOLCK)] = N_("No locks available"),
+ [err_get_code (EFTYPE)] = N_("Inappropriate file type or format"),
+ [err_get_code (EAUTH)] = N_("Authentication error"),
+ [err_get_code (ENEEDAUTH)] = N_("Need authenticator"),
+ [err_get_code (ENOSYS)] = N_("Function not implemented"),
+ [err_get_code (ENOTSUP)] = N_("Not supported"),
+ [err_get_code (EILSEQ)] = N_("Invalid or incomplete multibyte or wide character"),
+ [err_get_code (EBACKGROUND)] = N_("Inappropriate operation for background process"),
+ [err_get_code (EDIED)] = N_("Translator died"),
+ [err_get_code (ED)] = N_("?"),
+ [err_get_code (EGREGIOUS)] = N_("You really blew it this time"),
+ [err_get_code (EIEIO)] = N_("Computer bought the farm"),
+ [err_get_code (EGRATUITOUS)] = N_("Gratuitous error"),
+ [err_get_code (EBADMSG)] = N_("Bad message"),
+ [err_get_code (EIDRM)] = N_("Identifier removed"),
+ [err_get_code (EMULTIHOP)] = N_("Multihop attempted"),
+ [err_get_code (ENODATA)] = N_("No data available"),
+ [err_get_code (ENOLINK)] = N_("Link has been severed"),
+ [err_get_code (ENOMSG)] = N_("No message of desired type"),
+ [err_get_code (ENOSR)] = N_("Out of streams resources"),
+ [err_get_code (ENOSTR)] = N_("Device not a stream"),
+ [err_get_code (EOVERFLOW)] = N_("Value too large for defined data type"),
+ [err_get_code (EPROTO)] = N_("Protocol error"),
+ [err_get_code (ETIME)] = N_("Timer expired"),
+ [err_get_code (ECANCELED)] = N_("Operation canceled"),
+ [err_get_code (EOWNERDEAD)] = N_("Owner died"),
+ [err_get_code (ENOTRECOVERABLE)] = N_("State not recoverable"),
+ };
+
+const int _hurd_nerr = array_length (_hurd_errlist);
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 9a58dda9f2..c35f783e2a 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -1,9 +1,4 @@
libc {
- # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
- # When you get an error from errlist-compat.awk, you need to add a new
- # version here. Don't do this blindly, since this means changing the ABI
- # for all GNU/Linux configurations.
-
GLIBC_2.0 {
# functions used in inline functions or macros
__cmsg_nxthdr;
@@ -56,7 +51,6 @@ libc {
# u*
umount; uselib;
- #errlist-compat 123
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.1 {
@@ -84,7 +78,6 @@ libc {
# u*
umount2;
- #errlist-compat 125
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.2 {
@@ -102,7 +95,6 @@ libc {
# r*
readahead;
- #errlist-compat 126
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.3.2 {
@@ -120,7 +112,6 @@ libc {
unshare;
- #errlist-compat 132
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.5 {
@@ -142,7 +133,6 @@ libc {
fallocate;
}
GLIBC_2.12 {
- #errlist-compat 135
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
ntp_gettimex;
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index 3b7971c2a3..b90d5f2e5a 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -1,12 +1,5 @@
libc {
- # The comment lines with "#errlist-compat" are magic; see
- # sysdeps/gnu/errlist-compat.awk.
- # When you get an error from errlist-compat.awk, you need to add a new
- # version here. Don't do this blindly, since this means changing the ABI
- # for all GNU/Linux configurations.
-
GLIBC_2.0 {
- #errlist-compat 131
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
# Unfortunately in wider use.
@@ -33,7 +26,6 @@ libc {
pciconfig_read; pciconfig_write; sethae;
}
GLIBC_2.1 {
- #errlist-compat 131
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
# Linux/Alpha 64-bit timeval functions.
@@ -70,19 +62,15 @@ libc {
wordexp;
}
GLIBC_2.3 {
- #errlist-compat 132
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.4 {
- #errlist-compat 138
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.12 {
- #errlist-compat 139
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.16 {
- #errlist-compat 140
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.27 {
diff --git a/sysdeps/unix/sysv/linux/alpha/errlist-compat.c b/sysdeps/unix/sysv/linux/alpha/errlist-compat.c
new file mode 100644
index 0000000000..709807aa6b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/errlist-compat.c
@@ -0,0 +1,43 @@
+/* Linux sys_errlist compat symbol definitions. Alpha version.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errlist-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+DEFINE_COMPAT_ERRLIST (131, GLIBC_2_0)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
+DEFINE_COMPAT_ERRLIST (131, GLIBC_2_1)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_4)
+DEFINE_COMPAT_ERRLIST (132, GLIBC_2_3)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_4, GLIBC_2_12)
+DEFINE_COMPAT_ERRLIST (138, GLIBC_2_4)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_16)
+DEFINE_COMPAT_ERRLIST (139, GLIBC_2_12)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_16, GLIBC_2_32)
+DEFINE_COMPAT_ERRLIST (140, GLIBC_2_16)
+#endif
diff --git a/sysdeps/unix/sysv/linux/errlist-compat.c b/sysdeps/unix/sysv/linux/errlist-compat.c
new file mode 100644
index 0000000000..c4d79b70aa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/errlist-compat.c
@@ -0,0 +1,39 @@
+/* Linux sys_errlist compat symbol definitions. Generic version.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errlist-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+DEFINE_COMPAT_ERRLIST (123, GLIBC_2_0)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
+DEFINE_COMPAT_ERRLIST (125, GLIBC_2_1)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_4)
+DEFINE_COMPAT_ERRLIST (126, GLIBC_2_3)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_4, GLIBC_2_12)
+DEFINE_COMPAT_ERRLIST (132, GLIBC_2_4)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_32)
+DEFINE_COMPAT_ERRLIST (135, GLIBC_2_12)
+#endif
diff --git a/sysdeps/unix/sysv/linux/errlist-compat.h b/sysdeps/unix/sysv/linux/errlist-compat.h
new file mode 100644
index 0000000000..edd35fd4ed
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/errlist-compat.h
@@ -0,0 +1,43 @@
+/* Linux sys_errlist compatibility macro definitions.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#ifndef _ERRLIST_COMPAT_H
+#define _ERRLIST_COMPAT_H
+
+#include <shlib-compat.h>
+
+/* Define new compat symbols for symbols _sys_errlist, sys_errlist,
+ _sys_nerr, and sys_nerr for version VERSION with NUMBERERR times number of
+ bytes per long int size.
+ Both _sys_errlist and sys_errlist alias to _sys_errlist_internal symbol
+ (defined on errlist.c) while _sys_nerr and sys_nerr created new variable
+ with the expected size. */
+#define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION) \
+ const int __##VERSION##_sys_nerr = NUMBERERR; \
+ strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr); \
+ declare_symbol_alias (__ ## VERSION ## _sys_errlist, _sys_errlist_internal,\
+ object, NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \
+ declare_symbol_alias (__ ## VERSION ## __sys_errlist, \
+ _sys_errlist_internal, object, \
+ NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH)); \
+ compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION); \
+ compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); \
+ compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION); \
+ compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION);\
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/errlist.c b/sysdeps/unix/sysv/linux/errlist.c
new file mode 100644
index 0000000000..c417bf7aa7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/errlist.c
@@ -0,0 +1,162 @@
+/* Error message without the newline. Linux version.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <libintl.h>
+#include <limits.h>
+#include <array_length.h>
+
+const char *const _sys_errlist_internal[] =
+ {
+ [0] = N_("Success"),
+ [EPERM] = N_("Operation not permitted"),
+ [ENOENT] = N_("No such file or directory"),
+ [ESRCH] = N_("No such process"),
+ [EINTR] = N_("Interrupted system call"),
+ [EIO] = N_("Input/output error"),
+ [ENXIO] = N_("No such device or address"),
+ [E2BIG] = N_("Argument list too long"),
+ [ENOEXEC] = N_("Exec format error"),
+ [EBADF] = N_("Bad file descriptor"),
+ [ECHILD] = N_("No child processes"),
+ [EDEADLK] = N_("Resource deadlock avoided"),
+ [ENOMEM] = N_("Cannot allocate memory"),
+ [EACCES] = N_("Permission denied"),
+ [EFAULT] = N_("Bad address"),
+ [ENOTBLK] = N_("Block device required"),
+ [EBUSY] = N_("Device or resource busy"),
+ [EEXIST] = N_("File exists"),
+ [EXDEV] = N_("Invalid cross-device link"),
+ [ENODEV] = N_("No such device"),
+ [ENOTDIR] = N_("Not a directory"),
+ [EISDIR] = N_("Is a directory"),
+ [EINVAL] = N_("Invalid argument"),
+ [EMFILE] = N_("Too many open files"),
+ [ENFILE] = N_("Too many open files in system"),
+ [ENOTTY] = N_("Inappropriate ioctl for device"),
+ [ETXTBSY] = N_("Text file busy"),
+ [EFBIG] = N_("File too large"),
+ [ENOSPC] = N_("No space left on device"),
+ [ESPIPE] = N_("Illegal seek"),
+ [EROFS] = N_("Read-only file system"),
+ [EMLINK] = N_("Too many links"),
+ [EPIPE] = N_("Broken pipe"),
+ [EDOM] = N_("Numerical argument out of domain"),
+ [ERANGE] = N_("Numerical result out of range"),
+ [EAGAIN] = N_("Resource temporarily unavailable"),
+ [EINPROGRESS] = N_("Operation now in progress"),
+ [EALREADY] = N_("Operation already in progress"),
+ [ENOTSOCK] = N_("Socket operation on non-socket"),
+ [EMSGSIZE] = N_("Message too long"),
+ [EPROTOTYPE] = N_("Protocol wrong type for socket"),
+ [ENOPROTOOPT] = N_("Protocol not available"),
+ [EPROTONOSUPPORT] = N_("Protocol not supported"),
+ [ESOCKTNOSUPPORT] = N_("Socket type not supported"),
+ [EOPNOTSUPP] = N_("Operation not supported"),
+ [EPFNOSUPPORT] = N_("Protocol family not supported"),
+ [EAFNOSUPPORT] = N_("Address family not supported by protocol"),
+ [EADDRINUSE] = N_("Address already in use"),
+ [EADDRNOTAVAIL] = N_("Cannot assign requested address"),
+ [ENETDOWN] = N_("Network is down"),
+ [ENETUNREACH] = N_("Network is unreachable"),
+ [ENETRESET] = N_("Network dropped connection on reset"),
+ [ECONNABORTED] = N_("Software caused connection abort"),
+ [ECONNRESET] = N_("Connection reset by peer"),
+ [ENOBUFS] = N_("No buffer space available"),
+ [EISCONN] = N_("Transport endpoint is already connected"),
+ [ENOTCONN] = N_("Transport endpoint is not connected"),
+ [EDESTADDRREQ] = N_("Destination address required"),
+ [ESHUTDOWN] = N_("Cannot send after transport endpoint shutdown"),
+ [ETOOMANYREFS] = N_("Too many references: cannot splice"),
+ [ETIMEDOUT] = N_("Connection timed out"),
+ [ECONNREFUSED] = N_("Connection refused"),
+ [ELOOP] = N_("Too many levels of symbolic links"),
+ [ENAMETOOLONG] = N_("File name too long"),
+ [EHOSTDOWN] = N_("Host is down"),
+ [EHOSTUNREACH] = N_("No route to host"),
+ [ENOTEMPTY] = N_("Directory not empty"),
+ [EUSERS] = N_("Too many users"),
+ [EDQUOT] = N_("Disk quota exceeded"),
+ [ESTALE] = N_("Stale file handle"),
+ [EREMOTE] = N_("Object is remote"),
+ [ENOLCK] = N_("No locks available"),
+ [ENOSYS] = N_("Function not implemented"),
+ [EILSEQ] = N_("Invalid or incomplete multibyte or wide character"),
+ [EBADMSG] = N_("Bad message"),
+ [EIDRM] = N_("Identifier removed"),
+ [EMULTIHOP] = N_("Multihop attempted"),
+ [ENODATA] = N_("No data available"),
+ [ENOLINK] = N_("Link has been severed"),
+ [ENOMSG] = N_("No message of desired type"),
+ [ENOSR] = N_("Out of streams resources"),
+ [ENOSTR] = N_("Device not a stream"),
+ [EOVERFLOW] = N_("Value too large for defined data type"),
+ [EPROTO] = N_("Protocol error"),
+ [ETIME] = N_("Timer expired"),
+ [ECANCELED] = N_("Operation canceled"),
+ [EOWNERDEAD] = N_("Owner died"),
+ [ENOTRECOVERABLE] = N_("State not recoverable"),
+ [ERESTART] = N_("Interrupted system call should be restarted"),
+ [ECHRNG] = N_("Channel number out of range"),
+ [EL2NSYNC] = N_("Level 2 not synchronized"),
+ [EL3HLT] = N_("Level 3 halted"),
+ [EL3RST] = N_("Level 3 reset"),
+ [ELNRNG] = N_("Link number out of range"),
+ [EUNATCH] = N_("Protocol driver not attached"),
+ [ENOCSI] = N_("No CSI structure available"),
+ [EL2HLT] = N_("Level 2 halted"),
+ [EBADE] = N_("Invalid exchange"),
+ [EBADR] = N_("Invalid request descriptor"),
+ [EXFULL] = N_("Exchange full"),
+ [ENOANO] = N_("No anode"),
+ [EBADRQC] = N_("Invalid request code"),
+ [EBADSLT] = N_("Invalid slot"),
+ [EBFONT] = N_("Bad font file format"),
+ [ENONET] = N_("Machine is not on the network"),
+ [ENOPKG] = N_("Package not installed"),
+ [EADV] = N_("Advertise error"),
+ [ESRMNT] = N_("Srmount error"),
+ [ECOMM] = N_("Communication error on send"),
+ [EDOTDOT] = N_("RFS specific error"),
+ [ENOTUNIQ] = N_("Name not unique on network"),
+ [EBADFD] = N_("File descriptor in bad state"),
+ [EREMCHG] = N_("Remote address changed"),
+ [ELIBACC] = N_("Can not access a needed shared library"),
+ [ELIBBAD] = N_("Accessing a corrupted shared library"),
+ [ELIBSCN] = N_(".lib section in a.out corrupted"),
+ [ELIBMAX] = N_("Attempting to link in too many shared libraries"),
+ [ELIBEXEC] = N_("Cannot exec a shared library directly"),
+ [ESTRPIPE] = N_("Streams pipe error"),
+ [EUCLEAN] = N_("Structure needs cleaning"),
+ [ENOTNAM] = N_("Not a XENIX named type file"),
+ [ENAVAIL] = N_("No XENIX semaphores available"),
+ [EISNAM] = N_("Is a named type file"),
+ [EREMOTEIO] = N_("Remote I/O error"),
+ [ENOMEDIUM] = N_("No medium found"),
+ [EMEDIUMTYPE] = N_("Wrong medium type"),
+ [ENOKEY] = N_("Required key not available"),
+ [EKEYEXPIRED] = N_("Key has expired"),
+ [EKEYREVOKED] = N_("Key has been revoked"),
+ [EKEYREJECTED] = N_("Key was rejected by service"),
+ [ERFKILL] = N_("Operation not possible due to RF-kill"),
+ [EHWPOISON] = N_("Memory page has hardware error"),
+ };
+
+const int _sys_nerr_internal = array_length (_sys_errlist_internal);
+
+#include <errlist-compat.c>
diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions
index b5098b2171..9532d207fc 100644
--- a/sysdeps/unix/sysv/linux/hppa/Versions
+++ b/sysdeps/unix/sysv/linux/hppa/Versions
@@ -1,11 +1,5 @@
libc {
- # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
- # When you get an error from errlist-compat.awk, you need to add a new
- # version here. Don't do this blindly, since this means changing the ABI
- # for all GNU/Linux configurations.
-
GLIBC_2.1 {
- #errlist-compat 253
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.2 {
@@ -13,22 +7,18 @@ libc {
getrlimit; setrlimit; getrlimit64; setrlimit64;
}
GLIBC_2.3 {
- #errlist-compat 254
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.4 {
- #errlist-compat 256
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.11 {
fallocate64;
}
GLIBC_2.12 {
- #errlist-compat 257
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.17 {
- #errlist-compat 260
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
prlimit64;
}
diff --git a/sysdeps/unix/sysv/linux/hppa/errlist-compat.c b/sysdeps/unix/sysv/linux/hppa/errlist-compat.c
new file mode 100644
index 0000000000..65860d884c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/errlist-compat.c
@@ -0,0 +1,39 @@
+/* Linux sys_errlist compat symbol definitions. HPPA version.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errlist-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
+DEFINE_COMPAT_ERRLIST (253, GLIBC_2_1)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_4)
+DEFINE_COMPAT_ERRLIST (254, GLIBC_2_3)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_4, GLIBC_2_12)
+DEFINE_COMPAT_ERRLIST (256, GLIBC_2_4)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_17)
+DEFINE_COMPAT_ERRLIST (257, GLIBC_2_12)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_17, GLIBC_2_32)
+DEFINE_COMPAT_ERRLIST (260, GLIBC_2_17)
+#endif
diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions
index 453f276aad..0ec82dc480 100644
--- a/sysdeps/unix/sysv/linux/mips/Versions
+++ b/sysdeps/unix/sysv/linux/mips/Versions
@@ -5,13 +5,7 @@ ld {
}
}
libc {
- # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
- # When you get an error from errlist-compat.awk, you need to add a new
- # version here. Don't do this blindly, since this means changing the ABI
- # for all GNU/Linux configurations.
-
GLIBC_2.0 {
- #errlist-compat 123
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
# Exception handling support functions from libgcc
@@ -28,7 +22,6 @@ libc {
sysmips;
}
GLIBC_2.2 {
- #errlist-compat 1134
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
# _*
diff --git a/sysdeps/unix/sysv/linux/bits/sys_errlist.h b/sysdeps/unix/sysv/linux/mips/errlist-compat.c
similarity index 61%
rename from sysdeps/unix/sysv/linux/bits/sys_errlist.h
rename to sysdeps/unix/sysv/linux/mips/errlist-compat.c
index d6f5fa0a5e..b720db9244 100644
--- a/sysdeps/unix/sysv/linux/bits/sys_errlist.h
+++ b/sysdeps/unix/sysv/linux/mips/errlist-compat.c
@@ -1,5 +1,5 @@
-/* Declare sys_errlist and sys_nerr, or don't. Compatibility (do) version.
- Copyright (C) 2002-2020 Free Software Foundation, Inc.
+/* Linux sys_errlist compat symbol definitions. MIPS version.
+ Copyright (C) 2020 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
@@ -16,17 +16,12 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#ifndef _STDIO_H
-# error "Never include <bits/sys_errlist.h> directly; use <stdio.h> instead."
-#endif
-
-/* sys_errlist and sys_nerr are deprecated. Use strerror instead. */
+#include <errlist-compat.h>
-#ifdef __USE_MISC
-extern int sys_nerr;
-extern const char *const sys_errlist[];
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
+DEFINE_COMPAT_ERRLIST (123, GLIBC_2_0)
#endif
-#ifdef __USE_GNU
-extern int _sys_nerr;
-extern const char *const _sys_errlist[];
+
+#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_32)
+DEFINE_COMPAT_ERRLIST (1134, GLIBC_2_1)
#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions
index f056addee6..61e57fae99 100644
--- a/sysdeps/unix/sysv/linux/sparc/Versions
+++ b/sysdeps/unix/sysv/linux/sparc/Versions
@@ -1,30 +1,20 @@
libc {
- # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
- # When you get an error from errlist-compat.awk, you need to add a new
- # version here.
-
GLIBC_2.0 {
- #errlist-compat 127
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.1 {
- #errlist-compat 127
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.3 {
- #errlist-compat 128
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.4 {
- #errlist-compat 134
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.12 {
- #errlist-compat 135
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.16 {
- #errlist-compat 136
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
__getshmlba;
diff --git a/sysdeps/unix/sysv/linux/sparc/errlist-compat.c b/sysdeps/unix/sysv/linux/sparc/errlist-compat.c
new file mode 100644
index 0000000000..43fc364add
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/errlist-compat.c
@@ -0,0 +1,43 @@
+/* Linux sys_errlist compat symbol definitions. Sparc version.
+ Copyright (C) 2020 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errlist-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+DEFINE_COMPAT_ERRLIST (127, GLIBC_2_0)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
+DEFINE_COMPAT_ERRLIST (127, GLIBC_2_1)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_4)
+DEFINE_COMPAT_ERRLIST (128, GLIBC_2_3)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_4, GLIBC_2_12)
+DEFINE_COMPAT_ERRLIST (134, GLIBC_2_4)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_12, GLIBC_2_16)
+DEFINE_COMPAT_ERRLIST (135, GLIBC_2_12)
+#endif
+
+#if SHLIB_COMPAT (libc, GLIBC_2_16, GLIBC_2_32)
+DEFINE_COMPAT_ERRLIST (136, GLIBC_2_16)
+#endif
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 2/5] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 3/5] signal: Move sys_errlist " Adhemerval Zanella
@ 2020-04-27 21:48 ` Adhemerval Zanella
2020-04-28 7:33 ` Andreas Schwab
2020-04-27 21:48 ` [PATCH v2 5/5] linux: Fix __NSIG_WORDS and add __NSIG_BYTES Adhemerval Zanella
2020-04-28 7:30 ` [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Andreas Schwab
4 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-27 21:48 UTC (permalink / raw)
To: libc-alpha
Changes from previous version:
- Do not change sys_siglist size and thus the defined ABI.
--
MIPS support up to 96 real time signal, instead of current 95.
Checked with a mips*-linux-gnu build.
---
sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/mips/bits/signum-arch.h | 5 ++++-
sysdeps/unix/sysv/linux/siglist-compat.c | 2 +-
sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h | 1 +
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
index a28f181916..b95b2e360f 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
@@ -63,5 +63,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/bits/signum-arch.h b/sysdeps/unix/sysv/linux/bits/signum-arch.h
index 0dfe3d954d..c0e250b1da 100644
--- a/sysdeps/unix/sysv/linux/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/bits/signum-arch.h
@@ -60,5 +60,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
index 20975b9c94..f1b1567f1c 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
@@ -65,5 +65,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
index 36b1d62e35..d98987b98c 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
@@ -60,6 +60,9 @@
/* By default no real-time signals are supported. */
#define __SIGRTMIN 32
-#define __SIGRTMAX 127
+#define __SIGRTMAX 128
+
+/* MIPS used to export only 128 entries in sys_siglist. */
+#define __OLD_NSIG 128
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.c
index c322326a99..bc5c584ef3 100644
--- a/sysdeps/unix/sysv/linux/siglist-compat.c
+++ b/sysdeps/unix/sysv/linux/siglist-compat.c
@@ -27,5 +27,5 @@ DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1)
#endif
#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32)
-DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_3_3)
+DEFINE_COMPAT_SIGLIST (__OLD_NSIG, GLIBC_2_3_3)
#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
index a8b643ce34..7040e7683e 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
@@ -62,5 +62,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v2 5/5] linux: Fix __NSIG_WORDS and add __NSIG_BYTES
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
` (2 preceding siblings ...)
2020-04-27 21:48 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
@ 2020-04-27 21:48 ` Adhemerval Zanella
2020-04-28 7:30 ` [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Andreas Schwab
4 siblings, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-27 21:48 UTC (permalink / raw)
To: libc-alpha
Changes from previous version:
* Rebase against master.
--
The __NSIG_WORDS value is based on minimum number of words to hold
the maximum number of signal supported by the architecture. Maximum
number of signals non multiple of word is rounded up.
This patch also adds __NSIG_BYTES, which is the number of bytes
required to represent the support number of signals. It is used on
syscall which takes a sigset_t.
Checked on x86_64-linux-gnu and i686-linux-gnu.
---
include/signal.h | 2 ++
nptl/nptl-init.c | 2 +-
nptl/pthread_sigmask.c | 2 +-
sysdeps/unix/sysv/linux/aio_misc.h | 9 ++++++---
sysdeps/unix/sysv/linux/epoll_pwait.c | 2 +-
sysdeps/unix/sysv/linux/internal-signals.h | 10 +++++-----
sysdeps/unix/sysv/linux/ppoll.c | 7 ++++---
sysdeps/unix/sysv/linux/pselect.c | 2 +-
sysdeps/unix/sysv/linux/sigaction.c | 3 ++-
sysdeps/unix/sysv/linux/signalfd.c | 2 +-
sysdeps/unix/sysv/linux/sigpending.c | 2 +-
sysdeps/unix/sysv/linux/sigsetops.h | 18 +++++++++++++-----
sysdeps/unix/sysv/linux/sigsuspend.c | 2 +-
sysdeps/unix/sysv/linux/sigtimedwait.c | 3 ++-
sysdeps/unix/sysv/linux/x86/setjmpP.h | 5 ++---
15 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/include/signal.h b/include/signal.h
index ce511cfe60..f79fd5265c 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -2,6 +2,8 @@
# include <signal/signal.h>
# ifndef _ISOMAC
+# include <sigsetops.h>
+
libc_hidden_proto (sigemptyset)
libc_hidden_proto (sigfillset)
libc_hidden_proto (sigaddset)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 96b1444a01..ed450a09fd 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -281,7 +281,7 @@ __pthread_initialize_minimal_internal (void)
__sigaddset (&sa.sa_mask, SIGCANCEL);
__sigaddset (&sa.sa_mask, SIGSETXID);
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sa.sa_mask,
- NULL, _NSIG / 8);
+ NULL, __NSIG_BYTES);
/* Get the size of the static and alignment requirements for the TLS
block. */
diff --git a/nptl/pthread_sigmask.c b/nptl/pthread_sigmask.c
index d266d296c5..7b65ae1f27 100644
--- a/nptl/pthread_sigmask.c
+++ b/nptl/pthread_sigmask.c
@@ -39,7 +39,7 @@ __pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask)
/* We know that realtime signals are available if NPTL is used. */
int result = INTERNAL_SYSCALL_CALL (rt_sigprocmask, how, newmask,
- oldmask, _NSIG / 8);
+ oldmask, __NSIG_BYTES);
return (INTERNAL_SYSCALL_ERROR_P (result)
? INTERNAL_SYSCALL_ERRNO (result)
diff --git a/sysdeps/unix/sysv/linux/aio_misc.h b/sysdeps/unix/sysv/linux/aio_misc.h
index 30c3cd778e..e31ca8edbe 100644
--- a/sysdeps/unix/sysv/linux/aio_misc.h
+++ b/sysdeps/unix/sysv/linux/aio_misc.h
@@ -31,7 +31,8 @@ __aio_start_notify_thread (void)
{
sigset_t ss;
sigemptyset (&ss);
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &ss, NULL, _NSIG / 8);
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &ss, NULL,
+ __NSIG_BYTES);
}
extern inline int
@@ -52,12 +53,14 @@ __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *),
sigset_t ss;
sigset_t oss;
sigfillset (&ss);
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &ss, &oss, _NSIG / 8);
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &ss, &oss,
+ __NSIG_BYTES);
int ret = pthread_create (threadp, &attr, tf, arg);
/* Restore the signal mask. */
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &oss, NULL, _NSIG / 8);
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, &oss, NULL,
+ __NSIG_BYTES);
(void) pthread_attr_destroy (&attr);
return ret;
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c
index 66f04482c7..af6d0fd713 100644
--- a/sysdeps/unix/sysv/linux/epoll_pwait.c
+++ b/sysdeps/unix/sysv/linux/epoll_pwait.c
@@ -38,6 +38,6 @@ int epoll_pwait (int epfd, struct epoll_event *events,
const sigset_t *set)
{
return SYSCALL_CANCEL (epoll_pwait, epfd, events, maxevents,
- timeout, set, _NSIG / 8);
+ timeout, set, __NSIG_BYTES);
}
libc_hidden_def (epoll_pwait)
diff --git a/sysdeps/unix/sysv/linux/internal-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h
index 3fbd4807d1..35f2de04c5 100644
--- a/sysdeps/unix/sysv/linux/internal-signals.h
+++ b/sysdeps/unix/sysv/linux/internal-signals.h
@@ -68,7 +68,7 @@ static inline void
__libc_signal_block_all (sigset_t *set)
{
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, set,
- _NSIG / 8);
+ __NSIG_BYTES);
}
/* Block all application signals (excluding internal glibc ones). */
@@ -78,7 +78,7 @@ __libc_signal_block_app (sigset_t *set)
sigset_t allset = sigall_set;
__clear_internal_signals (&allset);
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &allset, set,
- _NSIG / 8);
+ __NSIG_BYTES);
}
/* Block only SIGTIMER and return the previous set on SET. */
@@ -86,7 +86,7 @@ static inline void
__libc_signal_block_sigtimer (sigset_t *set)
{
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigtimer_set, set,
- _NSIG / 8);
+ __NSIG_BYTES);
}
/* Unblock only SIGTIMER and return the previous set on SET. */
@@ -94,7 +94,7 @@ static inline void
__libc_signal_unblock_sigtimer (sigset_t *set)
{
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, set,
- _NSIG / 8);
+ __NSIG_BYTES);
}
/* Restore current process signal mask. */
@@ -102,7 +102,7 @@ static inline void
__libc_signal_restore_set (const sigset_t *set)
{
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL,
- _NSIG / 8);
+ __NSIG_BYTES);
}
/* Used to communicate with signal handler. */
diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c
index 4ffb23710e..0f15636cce 100644
--- a/sysdeps/unix/sysv/linux/ppoll.c
+++ b/sysdeps/unix/sysv/linux/ppoll.c
@@ -41,11 +41,12 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
# ifndef __NR_ppoll_time64
# define __NR_ppoll_time64 __NR_ppoll
# endif
- return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask, _NSIG / 8);
+ return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
+ __NSIG_BYTES);
#else
# ifdef __NR_ppoll_time64
int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
- _NSIG / 8);
+ __NSIG_BYTES);
if (ret >= 0 || errno != ENOSYS)
return ret;
# endif
@@ -62,7 +63,7 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
}
return SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
- _NSIG / 8);
+ __NSIG_BYTES);
#endif
}
diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c
index d7c6ff8fdb..304db03338 100644
--- a/sysdeps/unix/sysv/linux/pselect.c
+++ b/sysdeps/unix/sysv/linux/pselect.c
@@ -43,7 +43,7 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
} data;
data.ss = (__syscall_ulong_t) (uintptr_t) sigmask;
- data.ss_len = _NSIG / 8;
+ data.ss_len = __NSIG_BYTES;
return SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds,
timeout, &data);
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c
index 4e6d11a6ae..f27349d552 100644
--- a/sysdeps/unix/sysv/linux/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sigaction.c
@@ -57,7 +57,8 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
real size of the user-level sigset_t. */
result = INLINE_SYSCALL_CALL (rt_sigaction, sig,
act ? &kact : NULL,
- oact ? &koact : NULL, STUB (act, _NSIG / 8));
+ oact ? &koact : NULL, STUB (act,
+ __NSIG_BYTES));
if (oact && result >= 0)
{
diff --git a/sysdeps/unix/sysv/linux/signalfd.c b/sysdeps/unix/sysv/linux/signalfd.c
index 64d7bccba9..71d91fdde5 100644
--- a/sysdeps/unix/sysv/linux/signalfd.c
+++ b/sysdeps/unix/sysv/linux/signalfd.c
@@ -24,5 +24,5 @@
int
signalfd (int fd, const sigset_t *mask, int flags)
{
- return INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
+ return INLINE_SYSCALL (signalfd4, 4, fd, mask, __NSIG_BYTES, flags);
}
diff --git a/sysdeps/unix/sysv/linux/sigpending.c b/sysdeps/unix/sysv/linux/sigpending.c
index 458a3cf99e..8898fe8b34 100644
--- a/sysdeps/unix/sysv/linux/sigpending.c
+++ b/sysdeps/unix/sysv/linux/sigpending.c
@@ -24,5 +24,5 @@
int
sigpending (sigset_t *set)
{
- return INLINE_SYSCALL (rt_sigpending, 2, set, _NSIG / 8);
+ return INLINE_SYSCALL_CALL (rt_sigpending, set, __NSIG_BYTES);
}
diff --git a/sysdeps/unix/sysv/linux/sigsetops.h b/sysdeps/unix/sysv/linux/sigsetops.h
index db8f378cf0..3f29ead009 100644
--- a/sysdeps/unix/sysv/linux/sigsetops.h
+++ b/sysdeps/unix/sysv/linux/sigsetops.h
@@ -20,23 +20,31 @@
#define _SIGSETOPS_H 1
#include <signal.h>
+#include <limits.h>
+#include <libc-pointer-arith.h>
/* Return a mask that includes the bit for SIG only. */
-# define __sigmask(sig) \
- (((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int))))
+#define __sigmask(sig) \
+ (1UL << (((sig) - 1) % ULONG_WIDTH))
/* Return the word index for SIG. */
static inline unsigned long int
__sigword (int sig)
{
- return (sig - 1) / (8 * sizeof (unsigned long int));
+ return (sig - 1) / ULONG_WIDTH;
}
/* Linux sig* functions only handle up to __NSIG_WORDS words instead of
full _SIGSET_NWORDS sigset size. The signal numbers are 1-based, and
bit 0 of a signal mask is for signal 1. */
-
-# define __NSIG_WORDS (_NSIG / (8 * sizeof (unsigned long int )))
+#define __NSIG_WORDS (ALIGN_UP ((_NSIG - 1), ULONG_WIDTH) / ULONG_WIDTH)
+_Static_assert (__NSIG_WORDS <= _SIGSET_NWORDS,
+ "__NSIG_WORDS > _SIGSET_WORDS");
+
+/* This macro is used on syscall that takes a sigset_t to specify the expected
+ size in bytes. As for glibc, kernel sigset is implemented as an array of
+ unsigned long. */
+#define __NSIG_BYTES (__NSIG_WORDS * (ULONG_WIDTH / UCHAR_WIDTH))
static inline void
__sigemptyset (sigset_t *set)
diff --git a/sysdeps/unix/sysv/linux/sigsuspend.c b/sysdeps/unix/sysv/linux/sigsuspend.c
index dd5df5af25..b4bf2ec4bc 100644
--- a/sysdeps/unix/sysv/linux/sigsuspend.c
+++ b/sysdeps/unix/sysv/linux/sigsuspend.c
@@ -23,7 +23,7 @@
int
__sigsuspend (const sigset_t *set)
{
- return SYSCALL_CANCEL (rt_sigsuspend, set, _NSIG / 8);
+ return SYSCALL_CANCEL (rt_sigsuspend, set, __NSIG_BYTES);
}
libc_hidden_def (__sigsuspend)
weak_alias (__sigsuspend, sigsuspend)
diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c
index 6b3d8f705f..f2ef3aad45 100644
--- a/sysdeps/unix/sysv/linux/sigtimedwait.c
+++ b/sysdeps/unix/sysv/linux/sigtimedwait.c
@@ -26,7 +26,8 @@ __sigtimedwait (const sigset_t *set, siginfo_t *info,
{
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
- int result = SYSCALL_CANCEL (rt_sigtimedwait, set, info, timeout, _NSIG / 8);
+ int result = SYSCALL_CANCEL (rt_sigtimedwait, set, info, timeout,
+ __NSIG_BYTES);
/* The kernel generates a SI_TKILL code in si_code in case tkill is
used. tkill is transparently used in raise(). Since having
diff --git a/sysdeps/unix/sysv/linux/x86/setjmpP.h b/sysdeps/unix/sysv/linux/x86/setjmpP.h
index 1783b8eb78..a5de31bfd6 100644
--- a/sysdeps/unix/sysv/linux/x86/setjmpP.h
+++ b/sysdeps/unix/sysv/linux/x86/setjmpP.h
@@ -21,6 +21,7 @@
#include <bits/types/__sigset_t.h>
#include <libc-pointer-arith.h>
+#include <sigsetops.h>
/* <setjmp/setjmp.h> has
@@ -113,11 +114,9 @@ typedef union
#include <signal.h>
-#define _SIGPROCMASK_NSIG_WORDS (_NSIG / (8 * sizeof (unsigned long int)))
-
typedef struct
{
- unsigned long int __val[_SIGPROCMASK_NSIG_WORDS];
+ unsigned long int __val[__NSIG_WORDS];
} __sigprocmask_sigset_t;
extern jmp_buf ___buf;
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 1/5] signal: Add signum-{generic,arch}.h
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
` (3 preceding siblings ...)
2020-04-27 21:48 ` [PATCH v2 5/5] linux: Fix __NSIG_WORDS and add __NSIG_BYTES Adhemerval Zanella
@ 2020-04-28 7:30 ` Andreas Schwab
2020-04-28 13:43 ` Adhemerval Zanella
4 siblings, 1 reply; 32+ messages in thread
From: Andreas Schwab @ 2020-04-28 7:30 UTC (permalink / raw)
To: Adhemerval Zanella via Libc-alpha
On Apr 27 2020, Adhemerval Zanella via Libc-alpha wrote:
> +/* Historical signals specified by POSIX. */
> +#define SIGBUS 10 /* Bus error. */
> +#define SIGSYS 12 /* Bad system call. */
> +
> +/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
> +#define SIGURG 16 /* Urgent data is available at a socket. */
> +#define SIGSTOP 17 /* Stop, unblockable. */
> +#define SIGTSTP 18 /* Keyboard stop. */
> +#define SIGCONT 19 /* Continue. */
> +#define SIGCHLD 20 /* Child terminated or stopped. */
> +#define SIGTTIN 21 /* Background read from control terminal. */
> +#define SIGTTOU 22 /* Background write to control terminal. */
> +#define SIGPOLL 23 /* Pollable event occurred (System V). */
> +#define SIGXCPU 24 /* CPU time limit exceeded. */
> +#define SIGVTALRM 26 /* Virtual timer expired. */
> +#define SIGPROF 27 /* Profiling timer expired. */
> +#define SIGXFSZ 25 /* File size limit exceeded. */
> +#define SIGUSR1 30 /* User-defined signal 1. */
> +#define SIGUSR2 31 /* User-defined signal 2. */
Please be consistent with tab vs. space after #define (I'd prefer a
single space there).
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-04-27 21:48 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
@ 2020-04-28 7:33 ` Andreas Schwab
2020-04-28 13:42 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Andreas Schwab @ 2020-04-28 7:33 UTC (permalink / raw)
To: Adhemerval Zanella via Libc-alpha
On Apr 27 2020, Adhemerval Zanella via Libc-alpha wrote:
> +/* MIPS used to export only 128 entries in sys_siglist. */
> +#define __OLD_NSIG 128
Did you mean s/128/127/?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-04-28 7:33 ` Andreas Schwab
@ 2020-04-28 13:42 ` Adhemerval Zanella
0 siblings, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 13:42 UTC (permalink / raw)
To: Andreas Schwab, Adhemerval Zanella via Libc-alpha
On 28/04/2020 04:33, Andreas Schwab wrote:
> On Apr 27 2020, Adhemerval Zanella via Libc-alpha wrote:
>
>> +/* MIPS used to export only 128 entries in sys_siglist. */
>> +#define __OLD_NSIG 128
>
> Did you mean s/128/127/?
>
> Andreas.
>
The value for __OLD_NSIG is indeed correct because _NSIG is defined as
__SIGRTMAX plus one. Maybe making it more explicit in the comment:
/* MIPS used to define __SIGRTMAX as 127 and exported NSIG as 128. */
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 1/5] signal: Add signum-{generic,arch}.h
2020-04-28 7:30 ` [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Andreas Schwab
@ 2020-04-28 13:43 ` Adhemerval Zanella
0 siblings, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 13:43 UTC (permalink / raw)
To: Andreas Schwab, Adhemerval Zanella via Libc-alpha
On 28/04/2020 04:30, Andreas Schwab wrote:
> On Apr 27 2020, Adhemerval Zanella via Libc-alpha wrote:
>
>> +/* Historical signals specified by POSIX. */
>> +#define SIGBUS 10 /* Bus error. */
>> +#define SIGSYS 12 /* Bad system call. */
>> +
>> +/* New(er) POSIX signals (1003.1-2008, 1003.1-2013). */
>> +#define SIGURG 16 /* Urgent data is available at a socket. */
>> +#define SIGSTOP 17 /* Stop, unblockable. */
>> +#define SIGTSTP 18 /* Keyboard stop. */
>> +#define SIGCONT 19 /* Continue. */
>> +#define SIGCHLD 20 /* Child terminated or stopped. */
>> +#define SIGTTIN 21 /* Background read from control terminal. */
>> +#define SIGTTOU 22 /* Background write to control terminal. */
>> +#define SIGPOLL 23 /* Pollable event occurred (System V). */
>> +#define SIGXCPU 24 /* CPU time limit exceeded. */
>> +#define SIGVTALRM 26 /* Virtual timer expired. */
>> +#define SIGPROF 27 /* Profiling timer expired. */
>> +#define SIGXFSZ 25 /* File size limit exceeded. */
>> +#define SIGUSR1 30 /* User-defined signal 1. */
>> +#define SIGUSR2 31 /* User-defined signal 2. */
>
> Please be consistent with tab vs. space after #define (I'd prefer a
> single space there).
Ack, I will fix it.
>
> Andreas.
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-27 21:48 ` [PATCH 2/5] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
@ 2020-04-28 14:50 ` Florian Weimer
2020-04-28 15:00 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Florian Weimer @ 2020-04-28 14:50 UTC (permalink / raw)
To: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella via Libc-alpha:
> diff --git a/signal/signal.h b/signal/signal.h
> index fa8de963f8..3739550e5f 100644
> --- a/signal/signal.h
> +++ b/signal/signal.h
> @@ -281,12 +281,6 @@ extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
>
> #ifdef __USE_MISC
>
> -/* Names of the signals. This variable exists only for compatibility.
> - Use `strsignal' instead (see <string.h>). */
> -extern const char *const _sys_siglist[_NSIG];
> -extern const char *const sys_siglist[_NSIG];
This is yet another removal without a formal deprecation warning. Do
we really want to do this? mutt does not yet use strsignal, for
example.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-27 21:48 ` [PATCH 3/5] signal: Move sys_errlist " Adhemerval Zanella
@ 2020-04-28 14:53 ` Florian Weimer
2020-04-28 15:03 ` Adhemerval Zanella
2020-04-28 15:08 ` Joseph Myers
2020-04-28 14:54 ` Joseph Myers
1 sibling, 2 replies; 32+ messages in thread
From: Florian Weimer @ 2020-04-28 14:53 UTC (permalink / raw)
To: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella via Libc-alpha:
> +* The deprecated sys_errlist, _sys_errlist, sys_nerr, and _sys_nerr arrays
> + are non longer available to newly linked binaries, and their declarations
> + have removed from from <errno.h>. They are exported solely as
> + compatibility symbols to support old binaries. All programs should use
> + strerror or strerror_r instead.
Should this reference <stdio.h>, and not <errno.h>?
It's again a removal without a formal deprecation warning. Maybe this
one is more justified given that our error list is currently
incomplete on Linux, and we would have to add a new symbol version to
fix that.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-27 21:48 ` [PATCH 3/5] signal: Move sys_errlist " Adhemerval Zanella
2020-04-28 14:53 ` Florian Weimer
@ 2020-04-28 14:54 ` Joseph Myers
2020-04-28 19:44 ` Adhemerval Zanella
1 sibling, 1 reply; 32+ messages in thread
From: Joseph Myers @ 2020-04-28 14:54 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: libc-alpha
On Mon, 27 Apr 2020, Adhemerval Zanella via Libc-alpha wrote:
> The symbol is deprecated by strsignal and its usage imposes some issues
> such as copy relocations.
>
> Its internal names is changed to _sys_errlist_internal to avoid static
> linking usage. The compat code is also refactored by removing the over
> enginered errlist-compat.c generation from manual entried. It
> disantangle the code generation from manual and simplify both Linux and
> Hurd compat code (no more scatter definition on both manual and linker
> scripts).
If we remove this generation from the manual, then I think it needs to be
replaced with a test that fails if an error number is added to the errno
tables without being documented in the manual. (Ideally we'd similarly
check that errno.h and the errno table have the same set of values listed,
but consistency between the manual and the errno table is what the present
scripts should achieve and thus what should be maintained when removing
the scripts.)
I'd guess that this change means the "val" argument to the @errno macro in
the manual can be removed. In any case, the comment on that macro
definition needs updating.
Also, at least scripts/update-copyrights and scripts/build-many-glibcs.py
have lists of generated files that need updating for this one no longer
being generated.
> +* The deprecated sys_errlist, _sys_errlist, sys_nerr, and _sys_nerr arrays
> + are non longer available to newly linked binaries, and their declarations
sys_nerr and _sys_nerr aren't arrays.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-28 14:50 ` Florian Weimer
@ 2020-04-28 15:00 ` Adhemerval Zanella
2020-04-28 15:11 ` Florian Weimer
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 15:00 UTC (permalink / raw)
To: Florian Weimer, Adhemerval Zanella via Libc-alpha
On 28/04/2020 11:50, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
>
>> diff --git a/signal/signal.h b/signal/signal.h
>> index fa8de963f8..3739550e5f 100644
>> --- a/signal/signal.h
>> +++ b/signal/signal.h
>> @@ -281,12 +281,6 @@ extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
>>
>> #ifdef __USE_MISC
>>
>> -/* Names of the signals. This variable exists only for compatibility.
>> - Use `strsignal' instead (see <string.h>). */
>> -extern const char *const _sys_siglist[_NSIG];
>> -extern const char *const sys_siglist[_NSIG];
>
> This is yet another removal without a formal deprecation warning. Do
> we really want to do this? mutt does not yet use strsignal, for
> example.
>
At least for mutt, on the latest 1.13.5 version it will use sys_siglist
iff for !HAVE_STRERROR and its configure does check for strerror (on
Linux HAVE_STRERROR will be set to 1).
In any case, I still think we should move sig_siglist to compat symbols.
Although its usage is mitigated by current trend to use PIE, copy
relocation are still problematic. And it to fix mips NSIG definition
would require to add a net 2.32 compat version for the symbol, which
I really would like to avoid.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-28 14:53 ` Florian Weimer
@ 2020-04-28 15:03 ` Adhemerval Zanella
2020-04-28 15:08 ` Joseph Myers
1 sibling, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 15:03 UTC (permalink / raw)
To: Florian Weimer, Adhemerval Zanella via Libc-alpha
On 28/04/2020 11:53, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
>
>> +* The deprecated sys_errlist, _sys_errlist, sys_nerr, and _sys_nerr arrays
>> + are non longer available to newly linked binaries, and their declarations
>> + have removed from from <errno.h>. They are exported solely as
>> + compatibility symbols to support old binaries. All programs should use
>> + strerror or strerror_r instead.
>
> Should this reference <stdio.h>, and not <errno.h>?
>
> It's again a removal without a formal deprecation warning. Maybe this
> one is more justified given that our error list is currently
> incomplete on Linux, and we would have to add a new symbol version to
> fix that.
>
Right, it was configure by the man-pages indication. Indeed it shoudl
be stdio.h.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-28 14:53 ` Florian Weimer
2020-04-28 15:03 ` Adhemerval Zanella
@ 2020-04-28 15:08 ` Joseph Myers
2020-04-29 11:58 ` Florian Weimer
1 sibling, 1 reply; 32+ messages in thread
From: Joseph Myers @ 2020-04-28 15:08 UTC (permalink / raw)
To: Florian Weimer; +Cc: Adhemerval Zanella via Libc-alpha
On Tue, 28 Apr 2020, Florian Weimer wrote:
> It's again a removal without a formal deprecation warning. Maybe this
> one is more justified given that our error list is currently
> incomplete on Linux, and we would have to add a new symbol version to
> fix that.
What's missing from the error list at present? I thought the last errno
value added in the Linux kernel was EHWPOISON, which we have.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-28 15:00 ` Adhemerval Zanella
@ 2020-04-28 15:11 ` Florian Weimer
2020-04-28 15:31 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Florian Weimer @ 2020-04-28 15:11 UTC (permalink / raw)
To: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella via Libc-alpha:
> On 28/04/2020 11:50, Florian Weimer wrote:
>> * Adhemerval Zanella via Libc-alpha:
>>
>>> diff --git a/signal/signal.h b/signal/signal.h
>>> index fa8de963f8..3739550e5f 100644
>>> --- a/signal/signal.h
>>> +++ b/signal/signal.h
>>> @@ -281,12 +281,6 @@ extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
>>>
>>> #ifdef __USE_MISC
>>>
>>> -/* Names of the signals. This variable exists only for compatibility.
>>> - Use `strsignal' instead (see <string.h>). */
>>> -extern const char *const _sys_siglist[_NSIG];
>>> -extern const char *const sys_siglist[_NSIG];
>>
>> This is yet another removal without a formal deprecation warning. Do
>> we really want to do this? mutt does not yet use strsignal, for
>> example.
>>
>
> At least for mutt, on the latest 1.13.5 version it will use sys_siglist
> iff for !HAVE_STRERROR and its configure does check for strerror (on
> Linux HAVE_STRERROR will be set to 1).
sys_siglist and HAVE_STRERROR?
I see this in the mutt 1.13.2 sources:
signal.c-73-/* Attempt to catch "ordinary" signals and shut down gracefully. */
signal.c-74-static void exit_handler (int sig)
signal.c-75-{
signal.c-76- curs_set (1);
signal.c-77- endwin (); /* just to be safe */
signal.c-78-
signal.c-79- exit_print_string ("Caught signal ");
signal.c-80-#if SYS_SIGLIST_DECLARED
signal.c:81: exit_print_string (sys_siglist[sig]);
signal.c-82-#else
signal.c-83-#if (__sun__ && __svr4__)
signal.c:84: exit_print_string (_sys_siglist[sig]);
signal.c-85-#else
signal.c-86-#if (__alpha && __osf__)
signal.c:87: exit_print_string (__sys_siglist[sig]);
signal.c-88-#else
signal.c-89- exit_print_int (sig);
signal.c-90-#endif
signal.c-91-#endif
signal.c-92-#endif
signal.c-93- exit_print_string ("... Exiting.\n");
signal.c-94- exit (0);
signal.c-95-}
The code in neomutt is different, but uses the same libc facilities.
> In any case, I still think we should move sig_siglist to compat symbols.
> Although its usage is mitigated by current trend to use PIE, copy
> relocation are still problematic. And it to fix mips NSIG definition
> would require to add a net 2.32 compat version for the symbol, which
> I really would like to avoid.
Hmm.
Other thoughts on this? The header clearly said to use strsignal.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-28 15:11 ` Florian Weimer
@ 2020-04-28 15:31 ` Adhemerval Zanella
2020-04-29 10:10 ` Florian Weimer
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 15:31 UTC (permalink / raw)
To: Florian Weimer, Adhemerval Zanella via Libc-alpha
On 28/04/2020 12:11, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
>
>> On 28/04/2020 11:50, Florian Weimer wrote:
>>> * Adhemerval Zanella via Libc-alpha:
>>>
>>>> diff --git a/signal/signal.h b/signal/signal.h
>>>> index fa8de963f8..3739550e5f 100644
>>>> --- a/signal/signal.h
>>>> +++ b/signal/signal.h
>>>> @@ -281,12 +281,6 @@ extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
>>>>
>>>> #ifdef __USE_MISC
>>>>
>>>> -/* Names of the signals. This variable exists only for compatibility.
>>>> - Use `strsignal' instead (see <string.h>). */
>>>> -extern const char *const _sys_siglist[_NSIG];
>>>> -extern const char *const sys_siglist[_NSIG];
>>>
>>> This is yet another removal without a formal deprecation warning. Do
>>> we really want to do this? mutt does not yet use strsignal, for
>>> example.
>>>
>>
>> At least for mutt, on the latest 1.13.5 version it will use sys_siglist
>> iff for !HAVE_STRERROR and its configure does check for strerror (on
>> Linux HAVE_STRERROR will be set to 1).
>
> sys_siglist and HAVE_STRERROR?
My mistake, I confused with sys_errlist.
>
> I see this in the mutt 1.13.2 sources:
>
> signal.c-73-/* Attempt to catch "ordinary" signals and shut down gracefully. */
> signal.c-74-static void exit_handler (int sig)
> signal.c-75-{
> signal.c-76- curs_set (1);
> signal.c-77- endwin (); /* just to be safe */
> signal.c-78-
> signal.c-79- exit_print_string ("Caught signal ");
> signal.c-80-#if SYS_SIGLIST_DECLARED
> signal.c:81: exit_print_string (sys_siglist[sig]);
> signal.c-82-#else
> signal.c-83-#if (__sun__ && __svr4__)
> signal.c:84: exit_print_string (_sys_siglist[sig]);
> signal.c-85-#else
> signal.c-86-#if (__alpha && __osf__)
> signal.c:87: exit_print_string (__sys_siglist[sig]);
> signal.c-88-#else
> signal.c-89- exit_print_int (sig);
> signal.c-90-#endif
> signal.c-91-#endif
> signal.c-92-#endif
> signal.c-93- exit_print_string ("... Exiting.\n");
> signal.c-94- exit (0);
> signal.c-95-}
And on Linux it will be evaluated to:
static void exit_handler (int sig)
{
curs_set (1);
endwin ();
exit_print_string ("Caught signal ");
# 89 "../signal.c"
exit_print_int (sig);
exit_print_string ("... Exiting.\n");
exit (0);
}
Since SYS_SIGLIST_DECLARED is not defined. Not sure why exactly the
config is not setting it, since config.log does have
ac_cv_have_decl_sys_siglist=yes.
And even its usage is not fully portable (solaris11 defines as
_sys_siglist, AIX 73 does not provide it). So I am not sure if we
should continue provide for newly binaries.
>
> The code in neomutt is different, but uses the same libc facilities.
>
>> In any case, I still think we should move sig_siglist to compat symbols.
>> Although its usage is mitigated by current trend to use PIE, copy
>> relocation are still problematic. And it to fix mips NSIG definition
>> would require to add a net 2.32 compat version for the symbol, which
>> I really would like to avoid.
>
> Hmm.
>
> Other thoughts on this? The header clearly said to use strsignal.
>
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-28 14:54 ` Joseph Myers
@ 2020-04-28 19:44 ` Adhemerval Zanella
2020-04-28 20:26 ` Joseph Myers
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-28 19:44 UTC (permalink / raw)
To: Joseph Myers; +Cc: libc-alpha
On 28/04/2020 11:54, Joseph Myers wrote:
> On Mon, 27 Apr 2020, Adhemerval Zanella via Libc-alpha wrote:
>
>> The symbol is deprecated by strsignal and its usage imposes some issues
>> such as copy relocations.
>>
>> Its internal names is changed to _sys_errlist_internal to avoid static
>> linking usage. The compat code is also refactored by removing the over
>> enginered errlist-compat.c generation from manual entried. It
>> disantangle the code generation from manual and simplify both Linux and
>> Hurd compat code (no more scatter definition on both manual and linker
>> scripts).
>
> If we remove this generation from the manual, then I think it needs to be
> replaced with a test that fails if an error number is added to the errno
> tables without being documented in the manual. (Ideally we'd similarly
> check that errno.h and the errno table have the same set of values listed,
> but consistency between the manual and the errno table is what the present
> scripts should achieve and thus what should be maintained when removing
> the scripts.)
Alright, I think we should feasible to match the error number defined in
the manual the and the ones provided by internal table. However I think the
second goal as an extension (and a different patch) of current scheme, since
afaiu the errlist.awk does not enforce the consistency between the included
kernel errno definitions and the defined table.
>
> I'd guess that this change means the "val" argument to the @errno macro in
> the manual can be removed. In any case, the comment on that macro
> definition needs updating.
>
> Also, at least scripts/update-copyrights and scripts/build-many-glibcs.py
> have lists of generated files that need updating for this one no longer
> being generated.
>
>> +* The deprecated sys_errlist, _sys_errlist, sys_nerr, and _sys_nerr arrays
>> + are non longer available to newly linked binaries, and their declarations
>
> sys_nerr and _sys_nerr aren't arrays.
>
Ack.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-28 19:44 ` Adhemerval Zanella
@ 2020-04-28 20:26 ` Joseph Myers
0 siblings, 0 replies; 32+ messages in thread
From: Joseph Myers @ 2020-04-28 20:26 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: libc-alpha
On Tue, 28 Apr 2020, Adhemerval Zanella via Libc-alpha wrote:
> > If we remove this generation from the manual, then I think it needs to be
> > replaced with a test that fails if an error number is added to the errno
> > tables without being documented in the manual. (Ideally we'd similarly
> > check that errno.h and the errno table have the same set of values listed,
> > but consistency between the manual and the errno table is what the present
> > scripts should achieve and thus what should be maintained when removing
> > the scripts.)
>
> Alright, I think we should feasible to match the error number defined in
> the manual the and the ones provided by internal table. However I think the
> second goal as an extension (and a different patch) of current scheme, since
> afaiu the errlist.awk does not enforce the consistency between the included
> kernel errno definitions and the defined table.
Indeed, checking consistency with the kernel errno definitions is a
separate matter (and would need a kernel version check to allow new errno
numbers added in new kernel headers that glibc doesn't yet know about, as
in tst-mman-consts.py).
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-28 15:31 ` Adhemerval Zanella
@ 2020-04-29 10:10 ` Florian Weimer
2020-04-29 11:40 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Florian Weimer @ 2020-04-29 10:10 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella:
>> I see this in the mutt 1.13.2 sources:
>>
>> signal.c-73-/* Attempt to catch "ordinary" signals and shut down gracefully. */
>> signal.c-74-static void exit_handler (int sig)
>> signal.c-75-{
>> signal.c-76- curs_set (1);
>> signal.c-77- endwin (); /* just to be safe */
>> signal.c-78-
>> signal.c-79- exit_print_string ("Caught signal ");
>> signal.c-80-#if SYS_SIGLIST_DECLARED
>> signal.c:81: exit_print_string (sys_siglist[sig]);
>> signal.c-82-#else
>> signal.c-83-#if (__sun__ && __svr4__)
>> signal.c:84: exit_print_string (_sys_siglist[sig]);
>> signal.c-85-#else
>> signal.c-86-#if (__alpha && __osf__)
>> signal.c:87: exit_print_string (__sys_siglist[sig]);
>> signal.c-88-#else
>> signal.c-89- exit_print_int (sig);
>> signal.c-90-#endif
>> signal.c-91-#endif
>> signal.c-92-#endif
>> signal.c-93- exit_print_string ("... Exiting.\n");
>> signal.c-94- exit (0);
>> signal.c-95-}
>
> And on Linux it will be evaluated to:
>
> static void exit_handler (int sig)
> {
> curs_set (1);
> endwin ();
>
> exit_print_string ("Caught signal ");
> # 89 "../signal.c"
> exit_print_int (sig);
>
>
>
> exit_print_string ("... Exiting.\n");
> exit (0);
> }
>
> Since SYS_SIGLIST_DECLARED is not defined. Not sure why exactly the
> config is not setting it, since config.log does have
> ac_cv_have_decl_sys_siglist=yes.
Huh, this is surprising. Maybe this got fixed in neomutt?
> And even its usage is not fully portable (solaris11 defines as
> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
> should continue provide for newly binaries.
Another difference is that the variables are async-signal-safe.
strerror and strsignal might not be if the argument is out of range
(something that can be checked with the count variable in the other
case). At least our strsignal is already thread-safe.
I'm going to propose errno_constant and signal_constant functions to
cover the async-signal-safe case. Let's see if they gain positive
feedback from the larger libc community.
I will review your patch some time later this week.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-29 10:10 ` Florian Weimer
@ 2020-04-29 11:40 ` Adhemerval Zanella
2020-04-29 11:57 ` Florian Weimer
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-29 11:40 UTC (permalink / raw)
To: Florian Weimer; +Cc: Adhemerval Zanella via Libc-alpha
On 29/04/2020 07:10, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>>> I see this in the mutt 1.13.2 sources:
>>>
>>> signal.c-73-/* Attempt to catch "ordinary" signals and shut down gracefully. */
>>> signal.c-74-static void exit_handler (int sig)
>>> signal.c-75-{
>>> signal.c-76- curs_set (1);
>>> signal.c-77- endwin (); /* just to be safe */
>>> signal.c-78-
>>> signal.c-79- exit_print_string ("Caught signal ");
>>> signal.c-80-#if SYS_SIGLIST_DECLARED
>>> signal.c:81: exit_print_string (sys_siglist[sig]);
>>> signal.c-82-#else
>>> signal.c-83-#if (__sun__ && __svr4__)
>>> signal.c:84: exit_print_string (_sys_siglist[sig]);
>>> signal.c-85-#else
>>> signal.c-86-#if (__alpha && __osf__)
>>> signal.c:87: exit_print_string (__sys_siglist[sig]);
>>> signal.c-88-#else
>>> signal.c-89- exit_print_int (sig);
>>> signal.c-90-#endif
>>> signal.c-91-#endif
>>> signal.c-92-#endif
>>> signal.c-93- exit_print_string ("... Exiting.\n");
>>> signal.c-94- exit (0);
>>> signal.c-95-}
>>
>> And on Linux it will be evaluated to:
>>
>> static void exit_handler (int sig)
>> {
>> curs_set (1);
>> endwin ();
>>
>> exit_print_string ("Caught signal ");
>> # 89 "../signal.c"
>> exit_print_int (sig);
>>
>>
>>
>> exit_print_string ("... Exiting.\n");
>> exit (0);
>> }
>>
>> Since SYS_SIGLIST_DECLARED is not defined. Not sure why exactly the
>> config is not setting it, since config.log does have
>> ac_cv_have_decl_sys_siglist=yes.
>
> Huh, this is surprising. Maybe this got fixed in neomutt?
No idea, I just downloaded the latest mutt code and try to build to
check its usage of the arrays.
>
>> And even its usage is not fully portable (solaris11 defines as
>> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
>> should continue provide for newly binaries.
>
> Another difference is that the variables are async-signal-safe.
> strerror and strsignal might not be if the argument is out of range
> (something that can be checked with the count variable in the other
> case). At least our strsignal is already thread-safe.
>
We have strerror_r at least as an extension.
> I'm going to propose errno_constant and signal_constant functions to
> cover the async-signal-safe case. Let's see if they gain positive
> feedback from the larger libc community.
Instead I think it would be better just simplify glibc strerror
and strsignal assumptions to *not* return locale dependent messages
and add a strsignal_l for the case.
So strerror/strsignal will just directly access the underlying error
with the expected bound error checks and thus be asignal-safe.
>
> I will review your patch some time later this week.
>
Thanks.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-29 11:40 ` Adhemerval Zanella
@ 2020-04-29 11:57 ` Florian Weimer
2020-04-29 12:33 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Florian Weimer @ 2020-04-29 11:57 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella:
>>> And even its usage is not fully portable (solaris11 defines as
>>> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
>>> should continue provide for newly binaries.
>>
>> Another difference is that the variables are async-signal-safe.
>> strerror and strsignal might not be if the argument is out of range
>> (something that can be checked with the count variable in the other
>> case). At least our strsignal is already thread-safe.
>>
>
> We have strerror_r at least as an extension.
It's not an extension, but GNU has a different prototype. This makes
this interface really hard to use unfortunately. Hence my desire for
a thread-safe strerror (which everyone assumes anyway).
>
>> I'm going to propose errno_constant and signal_constant functions to
>> cover the async-signal-safe case. Let's see if they gain positive
>> feedback from the larger libc community.
>
> Instead I think it would be better just simplify glibc strerror
> and strsignal assumptions to *not* return locale dependent messages
> and add a strsignal_l for the case.
>
> So strerror/strsignal will just directly access the underlying error
> with the expected bound error checks and thus be asignal-safe.
There's still the formatting of unknown errors and signals. I'm not
sure if we want to regress there. (Userspace can sometimes see
invalid errors from kernel subsystems.)
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/5] signal: Move sys_errlist to a compat symbol
2020-04-28 15:08 ` Joseph Myers
@ 2020-04-29 11:58 ` Florian Weimer
0 siblings, 0 replies; 32+ messages in thread
From: Florian Weimer @ 2020-04-29 11:58 UTC (permalink / raw)
To: Joseph Myers; +Cc: Adhemerval Zanella via Libc-alpha
* Joseph Myers:
> On Tue, 28 Apr 2020, Florian Weimer wrote:
>
>> It's again a removal without a formal deprecation warning. Maybe this
>> one is more justified given that our error list is currently
>> incomplete on Linux, and we would have to add a new symbol version to
>> fix that.
>
> What's missing from the error list at present? I thought the last errno
> value added in the Linux kernel was EHWPOISON, which we have.
Hmm. I must have confused that with the internal 4xx kernel errors
leaking into userspace for some subsystems. Those are kernel bugs,
but they result in strerror taking the sprintf path.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-29 11:57 ` Florian Weimer
@ 2020-04-29 12:33 ` Adhemerval Zanella
2020-04-29 13:09 ` Florian Weimer
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-29 12:33 UTC (permalink / raw)
To: Florian Weimer; +Cc: Adhemerval Zanella via Libc-alpha
On 29/04/2020 08:57, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>>>> And even its usage is not fully portable (solaris11 defines as
>>>> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
>>>> should continue provide for newly binaries.
>>>
>>> Another difference is that the variables are async-signal-safe.
>>> strerror and strsignal might not be if the argument is out of range
>>> (something that can be checked with the count variable in the other
>>> case). At least our strsignal is already thread-safe.
>>>
>>
>> We have strerror_r at least as an extension.
>
> It's not an extension, but GNU has a different prototype. This makes
> this interface really hard to use unfortunately. Hence my desire for
> a thread-safe strerror (which everyone assumes anyway).
Indeed, but I think this is a different issue. We have:
strerror MT-unsafe AS-Unsafe
strerror_r (XSI) MT-safe AS-unsafe
strerror_r (GNU) MT-safe AS-unsafe
strerror_l MT-safe AS-unsafe
And I think we should do:
strerror MT-unsafe AS-safe
strerror_r (XSI) MT-safe AS-safe
strerror_r (GNU) MT-safe AS-safe
strerror_l MT-safe AS-unsafe
By making strerror_r (which is used by both strerror and __xpg_strerror_r)
no translate the error messages.
As for strsignal, it would be trickier because it uses the allocated
buffer with __libc_once which might trigger malloc. Maybe an option
might to just follow the strerror and also provide a thread safe
variant. From:
strsignal MT-safe AS-unsafe
To:
strsignal MT-unsafe AS-safe
strsignal_r MT-safe AS-safe
strsignal_l MT-safe AS-unsafe
By also making strsignal not translate the error messages and not
fallback to allocate the internal buffer.
>
>>
>>> I'm going to propose errno_constant and signal_constant functions to
>>> cover the async-signal-safe case. Let's see if they gain positive
>>> feedback from the larger libc community.
>>
>> Instead I think it would be better just simplify glibc strerror
>> and strsignal assumptions to *not* return locale dependent messages
>> and add a strsignal_l for the case.
>>
>> So strerror/strsignal will just directly access the underlying error
>> with the expected bound error checks and thus be asignal-safe.
>
> There's still the formatting of unknown errors and signals. I'm not
> sure if we want to regress there. (Userspace can sometimes see
> invalid errors from kernel subsystems.)
>
It would be still formatted, but the default error message won't be
translated (as for other messages). I am not sure this characterize
a hard regression if the idea is to provide async-signal-safeness.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-29 12:33 ` Adhemerval Zanella
@ 2020-04-29 13:09 ` Florian Weimer
2020-04-29 13:52 ` Adhemerval Zanella
0 siblings, 1 reply; 32+ messages in thread
From: Florian Weimer @ 2020-04-29 13:09 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: Adhemerval Zanella via Libc-alpha
* Adhemerval Zanella:
> On 29/04/2020 08:57, Florian Weimer wrote:
>> * Adhemerval Zanella:
>>
>>>>> And even its usage is not fully portable (solaris11 defines as
>>>>> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
>>>>> should continue provide for newly binaries.
>>>>
>>>> Another difference is that the variables are async-signal-safe.
>>>> strerror and strsignal might not be if the argument is out of range
>>>> (something that can be checked with the count variable in the other
>>>> case). At least our strsignal is already thread-safe.
>>>>
>>>
>>> We have strerror_r at least as an extension.
>>
>> It's not an extension, but GNU has a different prototype. This makes
>> this interface really hard to use unfortunately. Hence my desire for
>> a thread-safe strerror (which everyone assumes anyway).
>
> Indeed, but I think this is a different issue. We have:
>
> strerror MT-unsafe AS-Unsafe
> strerror_r (XSI) MT-safe AS-unsafe
> strerror_r (GNU) MT-safe AS-unsafe
> strerror_l MT-safe AS-unsafe
>
> And I think we should do:
>
> strerror MT-unsafe AS-safe
> strerror_r (XSI) MT-safe AS-safe
> strerror_r (GNU) MT-safe AS-safe
> strerror_l MT-safe AS-unsafe
>
> By making strerror_r (which is used by both strerror and __xpg_strerror_r)
> no translate the error messages.
I think that's even more confusing than before because of the
different results between strerror, strerror_r, and strerror_l under
the same effective locale.
I have a proposal that will allow us to make strerror thread-safe:
<http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2444.htm>
Then we can just forget about strerror_r.
> As for strsignal, it would be trickier because it uses the allocated
> buffer with __libc_once which might trigger malloc. Maybe an option
> might to just follow the strerror and also provide a thread safe
> variant. From:
>
> strsignal MT-safe AS-unsafe
>
> To:
>
> strsignal MT-unsafe AS-safe
> strsignal_r MT-safe AS-safe
> strsignal_l MT-safe AS-unsafe
>
> By also making strsignal not translate the error messages and not
> fallback to allocate the internal buffer.
Likewise, I don't think a non-thread-safe strsignal function is
useful.
The errno_constant and signal_constant functions would just provide
the names of the E* and SIG* constants, which seems more useful to me
than the different strings that implementations use even in the
English locale.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/5] signal: Move sys_siglist to a compat symbol
2020-04-29 13:09 ` Florian Weimer
@ 2020-04-29 13:52 ` Adhemerval Zanella
0 siblings, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-04-29 13:52 UTC (permalink / raw)
To: Florian Weimer; +Cc: Adhemerval Zanella via Libc-alpha
On 29/04/2020 10:09, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>> On 29/04/2020 08:57, Florian Weimer wrote:
>>> * Adhemerval Zanella:
>>>
>>>>>> And even its usage is not fully portable (solaris11 defines as
>>>>>> _sys_siglist, AIX 73 does not provide it). So I am not sure if we
>>>>>> should continue provide for newly binaries.
>>>>>
>>>>> Another difference is that the variables are async-signal-safe.
>>>>> strerror and strsignal might not be if the argument is out of range
>>>>> (something that can be checked with the count variable in the other
>>>>> case). At least our strsignal is already thread-safe.
>>>>>
>>>>
>>>> We have strerror_r at least as an extension.
>>>
>>> It's not an extension, but GNU has a different prototype. This makes
>>> this interface really hard to use unfortunately. Hence my desire for
>>> a thread-safe strerror (which everyone assumes anyway).
>>
>> Indeed, but I think this is a different issue. We have:
>>
>> strerror MT-unsafe AS-Unsafe
>> strerror_r (XSI) MT-safe AS-unsafe
>> strerror_r (GNU) MT-safe AS-unsafe
>> strerror_l MT-safe AS-unsafe
>>
>> And I think we should do:
>>
>> strerror MT-unsafe AS-safe
>> strerror_r (XSI) MT-safe AS-safe
>> strerror_r (GNU) MT-safe AS-safe
>> strerror_l MT-safe AS-unsafe
>>
>> By making strerror_r (which is used by both strerror and __xpg_strerror_r)
>> no translate the error messages.
>
> I think that's even more confusing than before because of the
> different results between strerror, strerror_r, and strerror_l under
> the same effective locale.
>
> I have a proposal that will allow us to make strerror thread-safe:
>
> <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2444.htm>
>
> Then we can just forget about strerror_r.
I recall reading you suggestion of per-thread state for the library
implementation. However I think what we are discussing here is another
issue, where translating the error messages is not directly related to
be standard allowing per-thread objects.
Bionic, for instance, seems to implement a async-safe-signal strerror
by 1. no translating the error message for both strerror and strerror_r
and 2. use a special format string snprintf-like routine. And it also
seems to not care to implement translation routines for strerror_l.
And without resorting in translated messages it even easier to make it
async-safe since we could make the invalid error use a per-thread bounded
buffer instead of relying on malloc.
>
>> As for strsignal, it would be trickier because it uses the allocated
>> buffer with __libc_once which might trigger malloc. Maybe an option
>> might to just follow the strerror and also provide a thread safe
>> variant. From:
>>
>> strsignal MT-safe AS-unsafe
>>
>> To:
>>
>> strsignal MT-unsafe AS-safe
>> strsignal_r MT-safe AS-safe
>> strsignal_l MT-safe AS-unsafe
>>
>> By also making strsignal not translate the error messages and not
>> fallback to allocate the internal buffer.
>
> Likewise, I don't think a non-thread-safe strsignal function is
> useful.
Alright, I agree the strsignal_r indeed does not add much. However
I do think that providing strsignal_l allows to provide a simple
async-signal-safe strsignal.
>
> The errno_constant and signal_constant functions would just provide
> the names of the E* and SIG* constants, which seems more useful to me
> than the different strings that implementations use even in the
> English locale.
>
But if the idea is just to provide bounded access to internal
sys_{err,abrev,sig}list I don't think it is worth to add another set
of function if we can simplify the current ones.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-12 17:50 ` Adhemerval Zanella
@ 2020-05-12 17:51 ` Carlos O'Donell
0 siblings, 0 replies; 32+ messages in thread
From: Carlos O'Donell @ 2020-05-12 17:51 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha
On 5/12/20 1:50 PM, Adhemerval Zanella wrote:
>
>
> On 12/05/2020 14:41, Carlos O'Donell wrote:
>> On 5/7/20 10:23 AM, Adhemerval Zanella via Libc-alpha wrote:
>>> MIPS support up to 96 real time signal, instead of current 95.
>>>
>>> Checked with a mips*-linux-gnu build.
>>
>> I'm reviewing.
>>
>> In the meantime testing on 64-bit and 32-bit x86 was clean.
>>
>> bmg run is clean (minus aarch64 fail fixed today with check-localplt fix)
>>
>> Tested-by: Carlos O'Donell <carlos@redhat.com>
>
> Thanks, but as Maciej W. Rozycki has pointed out this patch is
> not suitable. I have withdrew it.
Thanks. Marked dropped.
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-12 17:41 ` Carlos O'Donell
@ 2020-05-12 17:50 ` Adhemerval Zanella
2020-05-12 17:51 ` Carlos O'Donell
0 siblings, 1 reply; 32+ messages in thread
From: Adhemerval Zanella @ 2020-05-12 17:50 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 12/05/2020 14:41, Carlos O'Donell wrote:
> On 5/7/20 10:23 AM, Adhemerval Zanella via Libc-alpha wrote:
>> MIPS support up to 96 real time signal, instead of current 95.
>>
>> Checked with a mips*-linux-gnu build.
>
> I'm reviewing.
>
> In the meantime testing on 64-bit and 32-bit x86 was clean.
>
> bmg run is clean (minus aarch64 fail fixed today with check-localplt fix)
>
> Tested-by: Carlos O'Donell <carlos@redhat.com>
Thanks, but as Maciej W. Rozycki has pointed out this patch is
not suitable. I have withdrew it.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-07 14:23 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
2020-05-12 17:00 ` Maciej W. Rozycki
@ 2020-05-12 17:41 ` Carlos O'Donell
2020-05-12 17:50 ` Adhemerval Zanella
1 sibling, 1 reply; 32+ messages in thread
From: Carlos O'Donell @ 2020-05-12 17:41 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha
On 5/7/20 10:23 AM, Adhemerval Zanella via Libc-alpha wrote:
> MIPS support up to 96 real time signal, instead of current 95.
>
> Checked with a mips*-linux-gnu build.
I'm reviewing.
In the meantime testing on 64-bit and 32-bit x86 was clean.
bmg run is clean (minus aarch64 fail fixed today with check-localplt fix)
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h | 1 +
> sysdeps/unix/sysv/linux/bits/signum-arch.h | 1 +
> sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h | 1 +
> sysdeps/unix/sysv/linux/mips/bits/signum-arch.h | 5 ++++-
> sysdeps/unix/sysv/linux/siglist-compat.c | 2 +-
> sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h | 1 +
> 6 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
> index e3aef44e78..bde71f481c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
> @@ -63,5 +63,6 @@
>
> #define __SIGRTMIN 32
> #define __SIGRTMAX 64
> +#define __OLD_NSIG NSIG
>
> #endif /* <signal.h> included. */
> diff --git a/sysdeps/unix/sysv/linux/bits/signum-arch.h b/sysdeps/unix/sysv/linux/bits/signum-arch.h
> index e21dc332ca..83047bffc6 100644
> --- a/sysdeps/unix/sysv/linux/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/bits/signum-arch.h
> @@ -60,5 +60,6 @@
>
> #define __SIGRTMIN 32
> #define __SIGRTMAX 64
> +#define __OLD_NSIG NSIG
>
> #endif /* <signal.h> included. */
> diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
> index 364e57ec4a..88f14e675a 100644
> --- a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
> @@ -65,5 +65,6 @@
>
> #define __SIGRTMIN 32
> #define __SIGRTMAX 64
> +#define __OLD_NSIG NSIG
>
> #endif /* <signal.h> included. */
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> index c500d38322..5eeed367e8 100644
> --- a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> @@ -60,6 +60,9 @@
>
> /* By default no real-time signals are supported. */
> #define __SIGRTMIN 32
> -#define __SIGRTMAX 127
> +#define __SIGRTMAX 128
> +
> +/* MIPS used to define __SIGRTMAX as 127 and exported NSIG as 128. */
> +#define __OLD_NSIG 128
>
> #endif /* <signal.h> included. */
> diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.c
> index c322326a99..bc5c584ef3 100644
> --- a/sysdeps/unix/sysv/linux/siglist-compat.c
> +++ b/sysdeps/unix/sysv/linux/siglist-compat.c
> @@ -27,5 +27,5 @@ DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1)
> #endif
>
> #if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32)
> -DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_3_3)
> +DEFINE_COMPAT_SIGLIST (__OLD_NSIG, GLIBC_2_3_3)
> #endif
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
> index a19b5100cb..2f4f26d617 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
> @@ -62,5 +62,6 @@
>
> #define __SIGRTMIN 32
> #define __SIGRTMAX 64
> +#define __OLD_NSIG NSIG
>
> #endif /* <signal.h> included. */
>
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-12 17:00 ` Maciej W. Rozycki
@ 2020-05-12 17:18 ` Adhemerval Zanella
0 siblings, 0 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-05-12 17:18 UTC (permalink / raw)
To: Maciej W. Rozycki; +Cc: libc-alpha
On 12/05/2020 14:00, Maciej W. Rozycki wrote:
> On Thu, 7 May 2020, Adhemerval Zanella via Libc-alpha wrote:
>
>> MIPS support up to 96 real time signal, instead of current 95.
> [...]
>> diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
>> index c500d38322..5eeed367e8 100644
>> --- a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
>> +++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
>> @@ -60,6 +60,9 @@
>>
>> /* By default no real-time signals are supported. */
>> #define __SIGRTMIN 32
>> -#define __SIGRTMAX 127
>> +#define __SIGRTMAX 128
>> +
>> +/* MIPS used to define __SIGRTMAX as 127 and exported NSIG as 128. */
>> +#define __OLD_NSIG 128
>
> I don't think 128 can reliably work as a signal number as bit 7 in the
> exit status denotes a core dump has been made and only bits 6:0 there hold
> the signal number, which is why the upper limit of the range has been set
> to 127. See also the WTERMSIG and WCOREDUMP macros.
>
> Besides the range of 32..127 actually spans 96 individual signal numbers.
>
> Maciej
>
Indeed this change won't work on mips and this change indeed is not
required. I withdrew this patch, thanks for checking on this.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-07 14:23 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
@ 2020-05-12 17:00 ` Maciej W. Rozycki
2020-05-12 17:18 ` Adhemerval Zanella
2020-05-12 17:41 ` Carlos O'Donell
1 sibling, 1 reply; 32+ messages in thread
From: Maciej W. Rozycki @ 2020-05-12 17:00 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: libc-alpha
On Thu, 7 May 2020, Adhemerval Zanella via Libc-alpha wrote:
> MIPS support up to 96 real time signal, instead of current 95.
[...]
> diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> index c500d38322..5eeed367e8 100644
> --- a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> +++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
> @@ -60,6 +60,9 @@
>
> /* By default no real-time signals are supported. */
> #define __SIGRTMIN 32
> -#define __SIGRTMAX 127
> +#define __SIGRTMAX 128
> +
> +/* MIPS used to define __SIGRTMAX as 127 and exported NSIG as 128. */
> +#define __OLD_NSIG 128
I don't think 128 can reliably work as a signal number as bit 7 in the
exit status denotes a core dump has been made and only bits 6:0 there hold
the signal number, which is why the upper limit of the range has been set
to 127. See also the WTERMSIG and WCOREDUMP macros.
Besides the range of 32..127 actually spans 96 individual signal numbers.
Maciej
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v2 4/5] mips: Fix SIGRTMAX definition
2020-05-07 14:23 Adhemerval Zanella
@ 2020-05-07 14:23 ` Adhemerval Zanella
2020-05-12 17:00 ` Maciej W. Rozycki
2020-05-12 17:41 ` Carlos O'Donell
0 siblings, 2 replies; 32+ messages in thread
From: Adhemerval Zanella @ 2020-05-07 14:23 UTC (permalink / raw)
To: libc-alpha
MIPS support up to 96 real time signal, instead of current 95.
Checked with a mips*-linux-gnu build.
---
sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h | 1 +
sysdeps/unix/sysv/linux/mips/bits/signum-arch.h | 5 ++++-
sysdeps/unix/sysv/linux/siglist-compat.c | 2 +-
sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h | 1 +
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
index e3aef44e78..bde71f481c 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/signum-arch.h
@@ -63,5 +63,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/bits/signum-arch.h b/sysdeps/unix/sysv/linux/bits/signum-arch.h
index e21dc332ca..83047bffc6 100644
--- a/sysdeps/unix/sysv/linux/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/bits/signum-arch.h
@@ -60,5 +60,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
index 364e57ec4a..88f14e675a 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/signum-arch.h
@@ -65,5 +65,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
index c500d38322..5eeed367e8 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/signum-arch.h
@@ -60,6 +60,9 @@
/* By default no real-time signals are supported. */
#define __SIGRTMIN 32
-#define __SIGRTMAX 127
+#define __SIGRTMAX 128
+
+/* MIPS used to define __SIGRTMAX as 127 and exported NSIG as 128. */
+#define __OLD_NSIG 128
#endif /* <signal.h> included. */
diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.c
index c322326a99..bc5c584ef3 100644
--- a/sysdeps/unix/sysv/linux/siglist-compat.c
+++ b/sysdeps/unix/sysv/linux/siglist-compat.c
@@ -27,5 +27,5 @@ DEFINE_COMPAT_SIGLIST (64, GLIBC_2_1)
#endif
#if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_32)
-DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_3_3)
+DEFINE_COMPAT_SIGLIST (__OLD_NSIG, GLIBC_2_3_3)
#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
index a19b5100cb..2f4f26d617 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/signum-arch.h
@@ -62,5 +62,6 @@
#define __SIGRTMIN 32
#define __SIGRTMAX 64
+#define __OLD_NSIG NSIG
#endif /* <signal.h> included. */
--
2.25.1
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2020-05-12 17:52 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-27 21:48 [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 2/5] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
2020-04-28 14:50 ` Florian Weimer
2020-04-28 15:00 ` Adhemerval Zanella
2020-04-28 15:11 ` Florian Weimer
2020-04-28 15:31 ` Adhemerval Zanella
2020-04-29 10:10 ` Florian Weimer
2020-04-29 11:40 ` Adhemerval Zanella
2020-04-29 11:57 ` Florian Weimer
2020-04-29 12:33 ` Adhemerval Zanella
2020-04-29 13:09 ` Florian Weimer
2020-04-29 13:52 ` Adhemerval Zanella
2020-04-27 21:48 ` [PATCH 3/5] signal: Move sys_errlist " Adhemerval Zanella
2020-04-28 14:53 ` Florian Weimer
2020-04-28 15:03 ` Adhemerval Zanella
2020-04-28 15:08 ` Joseph Myers
2020-04-29 11:58 ` Florian Weimer
2020-04-28 14:54 ` Joseph Myers
2020-04-28 19:44 ` Adhemerval Zanella
2020-04-28 20:26 ` Joseph Myers
2020-04-27 21:48 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
2020-04-28 7:33 ` Andreas Schwab
2020-04-28 13:42 ` Adhemerval Zanella
2020-04-27 21:48 ` [PATCH v2 5/5] linux: Fix __NSIG_WORDS and add __NSIG_BYTES Adhemerval Zanella
2020-04-28 7:30 ` [PATCH v2 1/5] signal: Add signum-{generic,arch}.h Andreas Schwab
2020-04-28 13:43 ` Adhemerval Zanella
2020-05-07 14:23 Adhemerval Zanella
2020-05-07 14:23 ` [PATCH v2 4/5] mips: Fix SIGRTMAX definition Adhemerval Zanella
2020-05-12 17:00 ` Maciej W. Rozycki
2020-05-12 17:18 ` Adhemerval Zanella
2020-05-12 17:41 ` Carlos O'Donell
2020-05-12 17:50 ` Adhemerval Zanella
2020-05-12 17:51 ` Carlos O'Donell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).