diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/siglist-compat-def.h (renamed from sysdeps/generic/siglist-compat.h) | 27 | ||||
| -rw-r--r-- | sysdeps/generic/siglist-compat.c | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/siglist-compat.h (renamed from sysdeps/mach/hurd/siglist-compat.c) | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/siglist-compat.h (renamed from sysdeps/unix/sysv/linux/siglist-compat.c) | 7 |
4 files changed, 25 insertions, 17 deletions
diff --git a/sysdeps/generic/siglist-compat.h b/sysdeps/generic/siglist-compat-def.h index 05a0d63855..f5a1840dc3 100644 --- a/sysdeps/generic/siglist-compat.h +++ b/sysdeps/generic/siglist-compat-def.h @@ -28,20 +28,23 @@ sys_sigabbrev alias to __sys_sigabbrev. Both target alias are define in siglist.c. */ #define DEFINE_COMPAT_SIGLIST(NUMBERSIG, VERSION) \ - declare_symbol_alias (__ ## VERSION ## _sys_siglist, \ - __sys_siglist, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## sys_siglist, \ - __sys_siglist, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ - declare_symbol_alias (__ ## VERSION ## _sys_sigabbrev, \ - __sys_sigabbrev, \ - object, NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)); \ + declare_object_symbol_alias (__ ## VERSION ## _sys_siglist, \ + __sys_siglist, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## sys_siglist, \ + __sys_siglist, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ + declare_object_symbol_alias (__ ## VERSION ## _sys_sigabbrev, \ + __sys_sigabbrev, \ + NUMBERSIG * (ULONG_WIDTH / UCHAR_WIDTH)) \ + ASM_LINE_SEP \ compat_symbol (libc, __## VERSION ## _sys_siglist, _sys_siglist, \ - VERSION); \ + VERSION) ASM_LINE_SEP \ compat_symbol (libc, __## VERSION ## sys_siglist, sys_siglist, \ - VERSION); \ + VERSION) ASM_LINE_SEP \ compat_symbol (libc, __## VERSION ## _sys_sigabbrev, sys_sigabbrev, \ - VERSION); \ + VERSION) #endif diff --git a/sysdeps/generic/siglist-compat.c b/sysdeps/generic/siglist-compat.c deleted file mode 100644 index 6e25b021ab..0000000000 --- a/sysdeps/generic/siglist-compat.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty. */ diff --git a/sysdeps/mach/hurd/siglist-compat.c b/sysdeps/mach/hurd/siglist-compat.h index 5334b0885b..17bb0401aa 100644 --- a/sysdeps/mach/hurd/siglist-compat.c +++ b/sysdeps/mach/hurd/siglist-compat.h @@ -16,12 +16,15 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <siglist-compat.h> +#include <siglist-compat-def.h> +/* To get _NSIG definition. */ +#define _SIGNAL_H +#include <bits/signum-generic.h> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) DEFINE_COMPAT_SIGLIST (33, GLIBC_2_0) #endif #if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_32) -DEFINE_COMPAT_SIGLIST (NSIG, GLIBC_2_1) +DEFINE_COMPAT_SIGLIST (_NSIG, GLIBC_2_1) #endif diff --git a/sysdeps/unix/sysv/linux/siglist-compat.c b/sysdeps/unix/sysv/linux/siglist-compat.h index cbc77289c0..2a9801276d 100644 --- a/sysdeps/unix/sysv/linux/siglist-compat.c +++ b/sysdeps/unix/sysv/linux/siglist-compat.h @@ -16,7 +16,10 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <siglist-compat.h> +#include <siglist-compat-def.h> +/* To get _NSIG definition. */ +#define _SIGNAL_H +#include <bits/signum-generic.h> #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) DEFINE_COMPAT_SIGLIST (32, GLIBC_2_0) @@ -27,5 +30,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 (_NSIG, GLIBC_2_3_3) #endif |