about summary refs log tree commit diff
path: root/nptl/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-11-19 00:18:13 +0000
committerJakub Jelinek <jakub@redhat.com>2004-11-19 00:18:13 +0000
commit3115c839ed6794e4112ed74f768b7ab5542693b5 (patch)
tree7b09f21065751535d27bd6e14ca56a34f651dda2 /nptl/sysdeps/unix/sysv
parent1b7007d267c8d84cb6a1a4ac71cff32a92c1fc01 (diff)
downloadglibc-3115c839ed6794e4112ed74f768b7ab5542693b5.tar.gz
glibc-3115c839ed6794e4112ed74f768b7ab5542693b5.tar.xz
glibc-3115c839ed6794e4112ed74f768b7ab5542693b5.zip
Updated to fedora-glibc-20041119T0003
Diffstat (limited to 'nptl/sysdeps/unix/sysv')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_routines.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
index ae5f1f7b54..23c800f98e 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
@@ -122,10 +122,13 @@ __start_helper_thread (void)
   (void) pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
 
   /* Block all signals in the helper thread.  To do this thoroughly we
-     temporarily have to block all signals here.  */
+     temporarily have to block all signals here.  The helper can lose
+     wakeups if SIGCANCEL is not blocked throughout, but sigfillset omits
+     it.  So, we add it back explicitly here.  */
   sigset_t ss;
   sigset_t oss;
   sigfillset (&ss);
+  __sigaddset (&ss, SIGCANCEL);
   INTERNAL_SYSCALL_DECL (err);
   INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);