diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-19 00:18:13 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-19 00:18:13 +0000 |
| commit | 3115c839ed6794e4112ed74f768b7ab5542693b5 (patch) | |
| tree | 7b09f21065751535d27bd6e14ca56a34f651dda2 /nptl | |
| parent | 1b7007d267c8d84cb6a1a4ac71cff32a92c1fc01 (diff) | |
Updated to fedora-glibc-20041119T0003
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/sh/tls.h | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/timer_routines.c | 5 |
3 files changed, 16 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e183a02c77..4c4305da14 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,13 @@ +2004-11-18 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/sh/tls.h (DB_THREAD_SELF): Set the correct bias + parameter to REGISTER macro. + +2004-11-17 Roland McGrath <roland@redhat.com> + + * sysdeps/unix/sysv/linux/timer_routines.c (__start_helper_thread): + Make sure SIGCANCEL is blocked as well. + 2004-11-10 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/setxid.h: New file. diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index 88b13a35c8..db490ab7ee 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -118,7 +118,8 @@ typedef struct __self - 1;}) /* Magic for libthread_db to know how to do THREAD_SELF. */ -# define DB_THREAD_SELF REGISTER (32, 32, REG_GBR * 4, 0) +# define DB_THREAD_SELF \ + REGISTER (32, 32, REG_GBR * 4, -sizeof (struct pthread)) /* Read member of the thread descriptor directly. */ # define THREAD_GETMEM(descr, member) (descr->member) 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); |