about summary refs log tree commit diff
path: root/nptl/sysdeps/pthread
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-02-17 10:22:52 +0000
committerUlrich Drepper <drepper@redhat.com>2003-02-17 10:22:52 +0000
commit5430d926c54d552794e2ef626b37b7f8bc1ec68e (patch)
tree8f07e18afee8bdebefc1f9863888c52f8c992ebc /nptl/sysdeps/pthread
parent179ff175dff6afdb1f2a12f8c18fa48b29bbee6a (diff)
downloadglibc-5430d926c54d552794e2ef626b37b7f8bc1ec68e.tar.gz
glibc-5430d926c54d552794e2ef626b37b7f8bc1ec68e.tar.xz
glibc-5430d926c54d552794e2ef626b37b7f8bc1ec68e.zip
Update.
2003-02-17  Ulrich Drepper  <drepper@redhat.com>

	* Makefile (tests): Add tst-basic6.
	* tst-basic6.c: New file.

	* tst-basic1.c: Add test for process ID.

	* Makefile (tests): Add tst-cancel10.
	* tst-cancel10.c: New file.

	* Makefile (tests): Add tst-signal4.
	* tst-signal4.c: New file.

	* sysdeps/pthread/pthread_sigmask.c (pthread_sigmask): Use
	__sigismember instead of sigismember.  Add __builtin_expect.
Diffstat (limited to 'nptl/sysdeps/pthread')
-rw-r--r--nptl/sysdeps/pthread/pthread_sigmask.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/nptl/sysdeps/pthread/pthread_sigmask.c
index 3a3fa351aa..4114e0be2f 100644
--- a/nptl/sysdeps/pthread/pthread_sigmask.c
+++ b/nptl/sysdeps/pthread/pthread_sigmask.c
@@ -34,8 +34,7 @@ pthread_sigmask (how, newmask, oldmask)
   /* The only thing we have to make sure here is that SIGCANCEL is not
      blocked.  */
   if (newmask != NULL
-      && (how == SIG_SETMASK || how == SIG_BLOCK)
-      && sigismember (newmask, SIGCANCEL))
+      && __builtin_expect (__sigismember (newmask, SIGCANCEL), 0))
     {
       local_newmask = *newmask;
       sigdelset (&local_newmask, SIGCANCEL);