[src/netbsd-3]: src/lib/libpthread Pull up revision 1.41 (requested by christ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7f0b09b3dad
branches:  netbsd-3
changeset: 576866:c7f0b09b3dad
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Aug 12 06:38:14 2005 +0000

description:
Pull up revision 1.41 (requested by christos in ticket #642):
Revert part of previous; we need to merge acts.sa_mask into our pthread mask.
Thanks martin...

diffstat:

 lib/libpthread/pthread_sig.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 83929df02b6f -r c7f0b09b3dad lib/libpthread/pthread_sig.c
--- a/lib/libpthread/pthread_sig.c      Fri Aug 12 06:36:27 2005 +0000
+++ b/lib/libpthread/pthread_sig.c      Fri Aug 12 06:38:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_sig.c,v 1.39.2.1 2005/08/12 06:36:27 snj Exp $ */
+/*     $NetBSD: pthread_sig.c,v 1.39.2.2 2005/08/12 06:38:14 snj Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_sig.c,v 1.39.2.1 2005/08/12 06:36:27 snj Exp $");
+__RCSID("$NetBSD: pthread_sig.c,v 1.39.2.2 2005/08/12 06:38:14 snj Exp $");
 
 /* We're interposing a specific version of the signal interface. */
 #define        __LIBC12_SOURCE__
@@ -771,6 +771,7 @@
        SDPRINTF(("(pthread__kill_self %p) sig %d\n", self, si->si_signo));
 
        oldmask = self->pt_sigmask;
+        __sigplusset(&act.sa_mask, &self->pt_sigmask);
        if ((act.sa_flags & SA_NODEFER) == 0)
                __sigaddset14(&self->pt_sigmask, si->si_signo);
 
@@ -889,6 +890,7 @@
         * Prevent anyone else from considering this thread for handling
         * more instances of this signal.
         */
+        __sigplusset(&act.sa_mask, &target->pt_sigmask);
        if ((act.sa_flags & SA_NODEFER) == 0)
                __sigaddset14(&target->pt_sigmask, si->si_signo);