diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sigaction.c | 19 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigaction.c | 19 |
3 files changed, 43 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 289c35de1a..73577f2e75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-09-18 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/sigaction.c: If SIGCANCEL is defined + define sigaction and __sigaction as wrappers around + __libc_sigaction which rejects changing SIGCANCEL. + * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. + * sysdeps/unix/sysv/linux/i386/clone.S: Add support for SETTLS and SETTID/CLEARTID. diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/sigaction.c index 57634c1c98..94747211af 100644 --- a/sysdeps/unix/sysv/linux/i386/sigaction.c +++ b/sysdeps/unix/sysv/linux/i386/sigaction.c @@ -157,9 +157,28 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) #endif } +#ifndef SIGCANCEL weak_alias (__libc_sigaction, __sigaction) libc_hidden_weak (__sigaction) weak_alias (__libc_sigaction, sigaction) +#else +int +__sigaction (sig, act, oact) + int sig; + const struct sigaction *act; + struct sigaction *oact; +{ + if (sig == SIGCANCEL) + { + __set_errno (EINVAL); + return -1; + } + + return __libc_sigaction (sig, act, oact); +} +libc_hidden_weak (__sigaction) +weak_alias (__sigaction, sigaction) +#endif /* NOTE: Please think twice before making any changes to the bits of code below. GDB needs some intimate knowledge about it to diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c index c95e3d158c..d8f1d260a7 100644 --- a/sysdeps/unix/sysv/linux/sigaction.c +++ b/sysdeps/unix/sysv/linux/sigaction.c @@ -133,6 +133,25 @@ __libc_sigaction (sig, act, oact) #endif } +#ifndef SIGCANCEL weak_alias (__libc_sigaction, __sigaction) libc_hidden_weak (__sigaction) weak_alias (__libc_sigaction, sigaction) +#else +int +__sigaction (sig, act, oact) + int sig; + const struct sigaction *act; + struct sigaction *oact; +{ + if (sig == SIGCANCEL) + { + __set_errno (EINVAL); + return -1; + } + + return __libc_sigaction (sig, act, oact); +} +libc_hidden_weak (__sigaction) +weak_alias (__sigaction, sigaction) +#endif |