From 582b54aa23cef5c4dd0d110cfcb2d3adccc77c09 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 1 Apr 2003 06:20:33 +0000 Subject: [PATCH] Update. 2003-03-31 Ulrich Drepper * sysdeps/unix/sysv/linux/alpha/bits/signum.h (_NSIG): Define to 65. * sysdeps/unix/sysv/linux/hppa/bits/signum.h (_NSIG): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h (_NSIG): Likewise. * sysdeps/unix/sysv/linux/bits/signum.h (_NSIG): Likewise. (__SIGRTMAX): Adjust accordingly. * sysdeps/gnu/siglist.c: If OLD2_SIGLIST_SIZE is defined define second compatibility symbol set. * sysdeps/unix/sysv/linux/siglist.h (OLD2_SIGLIST_SIZE): Define. * intl/po2test.sed: Unify the transformations for msgid and msgstr and remove a useless s/// command. --- ChangeLog | 15 +++++++++-- sysdeps/gnu/siglist.c | 29 ++++++++++++++++----- sysdeps/unix/sysv/linux/alpha/bits/signum.h | 4 +-- sysdeps/unix/sysv/linux/bits/signum.h | 4 +-- sysdeps/unix/sysv/linux/hppa/bits/signum.h | 4 +-- sysdeps/unix/sysv/linux/siglist.h | 4 ++- sysdeps/unix/sysv/linux/sparc/bits/signum.h | 4 +-- 7 files changed, 47 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f42ccc6e8..4edc695076 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-03-31 Ulrich Drepper + + * sysdeps/unix/sysv/linux/alpha/bits/signum.h (_NSIG): Define to 65. + * sysdeps/unix/sysv/linux/hppa/bits/signum.h (_NSIG): Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/signum.h (_NSIG): Likewise. + * sysdeps/unix/sysv/linux/bits/signum.h (_NSIG): Likewise. + (__SIGRTMAX): Adjust accordingly. + * sysdeps/gnu/siglist.c: If OLD2_SIGLIST_SIZE is defined define + second compatibility symbol set. + * sysdeps/unix/sysv/linux/siglist.h (OLD2_SIGLIST_SIZE): Define. + 2003-03-31 Andreas Schwab * sysdeps/m68k/m68020/bits/atomic.h (atomic_increment_and_test): @@ -21,8 +32,8 @@ 2003-03-29 Paolo Bonzini - * intl/po2test.sed: Unify the transformations for msgid and msgstr - and remove a useless s/// command. + * intl/po2test.sed: Unify the transformations for msgid and msgstr + and remove a useless s/// command. 2003-03-27 David Mosberger diff --git a/sysdeps/gnu/siglist.c b/sysdeps/gnu/siglist.c index d47c9f08a7..cb1875f9eb 100644 --- a/sysdeps/gnu/siglist.c +++ b/sysdeps/gnu/siglist.c @@ -1,5 +1,5 @@ /* Define list of all signal numbers and their names. - Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2002, 2003 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 @@ -31,11 +31,6 @@ const char *const __new_sys_siglist[NSIG] = }; strong_alias (__new_sys_siglist, _sys_siglist_internal) -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -strong_alias (_sys_siglist_internal, __old_sys_siglist) -declare_symbol (__old_sys_siglist, object, OLD_SIGLIST_SIZE * __WORDSIZE / 8) -#endif - const char *const __new_sys_sigabbrev[NSIG] = { #define init_sig(sig, abbrev, desc) [sig] = abbrev, @@ -45,6 +40,9 @@ const char *const __new_sys_sigabbrev[NSIG] = strong_alias (__new_sys_sigabbrev, _sys_sigabbrev_internal) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) +strong_alias (_sys_siglist_internal, __old_sys_siglist) +declare_symbol (__old_sys_siglist, object, OLD_SIGLIST_SIZE * __WORDSIZE / 8) + strong_alias (_sys_sigabbrev_internal, __old_sys_sigabbrev) declare_symbol (__old_sys_sigabbrev, object, OLD_SIGLIST_SIZE * __WORDSIZE / 8) @@ -54,7 +52,26 @@ 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 +strong_alias (_sys_siglist_internal, __old2_sys_siglist) +declare_symbol (__old2_sys_siglist, object, OLD2_SIGLIST_SIZE * __WORDSIZE / 8) + +strong_alias (_sys_sigabbrev_internal, __old2_sys_sigabbrev) +declare_symbol (__old2_sys_sigabbrev, object, + OLD2_SIGLIST_SIZE * __WORDSIZE / 8) + +strong_alias (__old2_sys_siglist, _old2_sys_siglist) +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/unix/sysv/linux/alpha/bits/signum.h b/sysdeps/unix/sysv/linux/alpha/bits/signum.h index 44c96a2045..477c13175d 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/signum.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/signum.h @@ -1,5 +1,5 @@ /* Signal number definitions. Linux/Alpha version. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2003 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 @@ -69,7 +69,7 @@ #define SIGPWR SIGINFO #define SIGIOT SIGABRT -#define _NSIG 64 /* Biggest signal number + 1. */ +#define _NSIG 65 /* Biggest signal number + 1. */ #define SIGRTMIN (__libc_current_sigrtmin ()) #define SIGRTMAX (__libc_current_sigrtmax ()) diff --git a/sysdeps/unix/sysv/linux/bits/signum.h b/sysdeps/unix/sysv/linux/bits/signum.h index a2fe52d244..a18ac113a4 100644 --- a/sysdeps/unix/sysv/linux/bits/signum.h +++ b/sysdeps/unix/sysv/linux/bits/signum.h @@ -66,7 +66,7 @@ #define SIGSYS 31 /* Bad system call. */ #define SIGUNUSED 31 -#define _NSIG 64 /* Biggest signal number + 1 +#define _NSIG 65 /* Biggest signal number + 1 (including real-time signals). */ #define SIGRTMIN (__libc_current_sigrtmin ()) @@ -75,6 +75,6 @@ /* These are the hard limits of the kernel. These values should not be used directly at user level. */ #define __SIGRTMIN 32 -#define __SIGRTMAX _NSIG +#define __SIGRTMAX (_NSIG - 1) #endif /* included. */ diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum.h b/sysdeps/unix/sysv/linux/hppa/bits/signum.h index 14346bf065..bf46006c8d 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/signum.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/signum.h @@ -1,5 +1,5 @@ /* Signal number definitions. Linux/HPPA version. - Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,1999,2003 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 @@ -68,7 +68,7 @@ #define SIGXFSZ 34 /* File size limit exceeded (4.2 BSD). */ #define SIGSTKFLT 36 /* Stack fault. */ -#define _NSIG 64 /* Biggest signal number + 1 +#define _NSIG 65 /* Biggest signal number + 1 (including real-time signals). */ #define SIGRTMIN (__libc_current_sigrtmin ()) diff --git a/sysdeps/unix/sysv/linux/siglist.h b/sysdeps/unix/sysv/linux/siglist.h index 0e3ba53de2..cc2b49ed2f 100644 --- a/sysdeps/unix/sysv/linux/siglist.h +++ b/sysdeps/unix/sysv/linux/siglist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2002,2003 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 @@ -21,3 +21,5 @@ #include_next /* Get the canonical list. */ #define OLD_SIGLIST_SIZE 32 /* For GLIBC_2.0 binary compatibility. */ + +#define OLD2_SIGLIST_SIZE 64 /* For GLIBC_2.1 binary compatibility. */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/signum.h b/sysdeps/unix/sysv/linux/sparc/bits/signum.h index 48d39402df..6b58ec29d7 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/signum.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/signum.h @@ -1,5 +1,5 @@ /* Signal number definitions. Linux/SPARC version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2003 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 @@ -70,7 +70,7 @@ #define SIGUSR1 30 #define SIGUSR2 31 -#define _NSIG 64 /* Biggest signal number + 1 +#define _NSIG 65 /* Biggest signal number + 1 (including real-time signals). */ #define SIGRTMIN (__libc_current_sigrtmin ())