diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:09:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:09:35 +0000 |
| commit | 0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86 (patch) | |
| tree | f86a1435f78ca214fb24daf9ba7a85f3dfd1ff54 /linuxthreads | |
| parent | 6fb78a87583a6d2f65a0fb4a77c950ddc037876c (diff) | |
Updated to fedora-glibc-20041006T0900
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 1 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 805cdd419d..c704685250 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +2004-10-05 Dwayne Grant McConnell <dgm69@us.ibm.com> + + * pthread.c: Mask restart signal during cancel signal handler. + +2004-10-05 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h (_POSIX_CPUTIME, + _POSIX_THREAD_CPUTIME): Define to 0. + 2004-10-04 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Set _POSIX_CPUTIME diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 6c98d73255..24f0eb02b0 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -560,6 +560,7 @@ static void pthread_initialize(void) sa.sa_flags = 0; __libc_sigaction(__pthread_sig_restart, &sa, NULL); sa.sa_handler = pthread_handle_sigcancel; + sigaddset(&sa.sa_mask, __pthread_sig_restart); // sa.sa_flags = 0; __libc_sigaction(__pthread_sig_cancel, &sa, NULL); if (__pthread_sig_debug > 0) { diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h index b45d121f64..d4be569168 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h @@ -106,10 +106,10 @@ #define _POSIX_SHARED_MEMORY_OBJECTS 200112L /* CPU-time clocks supported. */ -#define _POSIX_CPUTIME 200112L +#define _POSIX_CPUTIME 0 /* We support the clock also in threads. */ -#define _POSIX_THREAD_CPUTIME 200112L +#define _POSIX_THREAD_CPUTIME 0 /* GNU libc provides regular expression handling. */ #define _POSIX_REGEXP 1 |