4 files changed, 38 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c
index a22a1d2ea8..a016b71ec7 100644
--- a/sysdeps/unix/sysv/linux/sigtimedwait.c
+++ b/sysdeps/unix/sysv/linux/sigtimedwait.c
@@ -32,6 +32,18 @@ static int
 do_sigtimedwait (const sigset_t *set, siginfo_t *info,
 		 const struct timespec *timeout)
 {
+#ifdef SIGCANCEL
+  sigset_t tmpset;
+  if (set != NULL && __sigismember (set, SIGCANCEL))
+    {
+      /* Create a temporary mask without the bit for SIGCANCEL set.  */
+      // We are not copying more than we have to.
+      memcpy (&tmpset, set, _NSIG / 8);
+      __sigdelset (&tmpset, SIGCANCEL);
+      set = &tmpset;
+    }
+#endif
+
     /* XXX The size argument hopefully will have to be changed to the
        real size of the user-level sigset_t.  */
   int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
diff --git a/sysdeps/unix/sysv/linux/sigwait.c b/sysdeps/unix/sysv/linux/sigwait.c
index 097d62f9ca..49371cfdfd 100644
--- a/sysdeps/unix/sysv/linux/sigwait.c
+++ b/sysdeps/unix/sysv/linux/sigwait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 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
@@ -36,6 +36,18 @@ do_sigwait (const sigset_t *set, int *sig)
 {
   int ret;
 
+#ifdef SIGCANCEL
+  sigset_t tmpset;
+  if (set != NULL && __sigismember (set, SIGCANCEL))
+    {
+      /* Create a temporary mask without the bit for SIGCANCEL set.  */
+      // We are not copying more than we have to.
+      memcpy (&tmpset, set, _NSIG / 8);
+      __sigdelset (&tmpset, SIGCANCEL);
+      set = &tmpset;
+    }
+#endif
+
   /* XXX The size argument hopefully will have to be changed to the
      real size of the user-level sigset_t.  */
 #ifdef INTERNAL_SYSCALL
diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c
index ade5ce9175..56cf0c96bb 100644
--- a/sysdeps/unix/sysv/linux/sigwaitinfo.c
+++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c
@@ -33,6 +33,18 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__
 static int
 do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
 {
+#ifdef SIGCANCEL
+  sigset_t tmpset;
+  if (set != NULL && __sigismember (set, SIGCANCEL))
+    {
+      /* Create a temporary mask without the bit for SIGCANCEL set.  */
+      // We are not copying more than we have to.
+      memcpy (&tmpset, set, _NSIG / 8);
+      __sigdelset (&tmpset, SIGCANCEL);
+      set = &tmpset;
+    }
+#endif
+
   /* XXX The size argument hopefully will have to be changed to the
      real size of the user-level sigset_t.  */
   int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c
index ac92f6eced..8df67173c1 100644
--- a/sysdeps/unix/sysv/linux/sleep.c
+++ b/sysdeps/unix/sysv/linux/sleep.c
@@ -34,7 +34,7 @@ __sleep (unsigned int seconds)
   unsigned int result;
 
   /* This is not necessary but some buggy programs depend on this.  */
-  if (seconds == 0)
+  if (__builtin_expect (seconds == 0, 0))
     {
 #ifdef CANCELLATION_P
       CANCELLATION_P (THREAD_SELF);