summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Arcidiacono <filippo.arcidiacono@st.com>2012-07-12 09:24:39 +0200
committerCarmelo Amoroso <carmelo.amoroso@st.com>2012-08-29 13:11:14 +0200
commitcb43f2afba0633400387fa7c55dda3396517f58a (patch)
tree55e88b978a2060c3037f517e54bd2ca78812f374
parent555ae2e88cd16a83f854634b6c3f35715b11d3d4 (diff)
librt: re-add SIGCANCEL to the list of blocked signal in helper thread
Indeed if the libpthread is before the libc in the library look up the SIGCANCEL is removed from the list of the blocked signal by sigfillset func, this can produce the handler not properly called. This commit revert what Denys modified in commit 162cfaea20d807f0ae329efe39292a9b22593b41. Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com> Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
index 2f33e9981..2d16837d0 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
@@ -175,7 +175,7 @@ __start_helper_thread (void)
sigset_t ss;
sigset_t oss;
sigfillset (&ss);
- /*__sigaddset (&ss, SIGCANCEL); - already done by sigfillset */
+ __sigaddset (&ss, SIGCANCEL);
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);