From f006d3a007b7caffd4c810fa71623b39334a1580 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 11 Mar 2003 19:02:26 +0000 Subject: Update. * sysdeps/unix/sysv/linux/ia64/system.c: New file. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_CLONE_THREAD_FLAGS): Define for IA-64 and s390* with kernel >= 2.5.64. 2003-03-11 Jakub Jelinek * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Don't clobber R7. --- nptl/init.c | 7 +++++++ nptl/sysdeps/ia64/bits/atomic.h | 10 ++++++---- nptl/sysdeps/pthread/pthread_cond_timedwait.c | 10 ++++------ nptl/sysdeps/pthread/pthread_cond_wait.c | 4 +--- nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c | 1 + nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c | 1 + nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c | 1 + nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c | 1 + nptl/sysdeps/unix/sysv/linux/s390/sem_post.c | 1 + nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c | 1 + nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c | 1 + nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c | 1 + nptl/version.c | 3 ++- 13 files changed, 28 insertions(+), 14 deletions(-) (limited to 'nptl') diff --git a/nptl/init.c b/nptl/init.c index df8e67a..e4e3081 100644 --- a/nptl/init.c +++ b/nptl/init.c @@ -209,6 +209,13 @@ __pthread_initialize_minimal_internal (void) (void) __libc_sigaction (SIGCANCEL, &sa, NULL); + /* The parent process might have left the signal blocked. Just in + case, unblock it. We reuse the signal mask in the sigaction + structure. It is already cleared. */ + __sigaddset (&sa.sa_mask, SIGCANCEL); + (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &sa.sa_mask, + NULL, _NSIG / 8); + /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ diff --git a/nptl/sysdeps/ia64/bits/atomic.h b/nptl/sysdeps/ia64/bits/atomic.h index 4b1d24f..cfccc6a 100644 --- a/nptl/sysdeps/ia64/bits/atomic.h +++ b/nptl/sysdeps/ia64/bits/atomic.h @@ -78,15 +78,17 @@ typedef uintmax_t uatomic_max_t; do \ __oldval = __val; \ while ((__val \ - = __arch_compare_and_exchange_32_val_acq (__memp, __oldval, \ - __oldval + __value)) \ + = __arch_compare_and_exchange_32_val_acq (__memp, \ + __oldval + __value, \ + __oldval)) \ != __oldval); \ else if (sizeof (*mem) == 8) \ do \ __oldval = __val; \ while ((__val \ - = __arch_compare_and_exchange_64_val_acq (__memp, __oldval, \ - __oldval + __value)) \ + = __arch_compare_and_exchange_64_val_acq (__memp, \ + __oldval + __value, \ + __oldval)) \ != __oldval); \ else \ abort (); \ diff --git a/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/nptl/sysdeps/pthread/pthread_cond_timedwait.c index d6a4ae7..417f873 100644 --- a/nptl/sysdeps/pthread/pthread_cond_timedwait.c +++ b/nptl/sysdeps/pthread/pthread_cond_timedwait.c @@ -46,7 +46,7 @@ __pthread_cond_timedwait (cond, mutex, abstime) { struct _pthread_cleanup_buffer buffer; struct _condvar_cleanup_buffer cbuffer; - int result = 0, err; + int result = 0; /* Catch invalid parameters. */ if (abstime->tv_nsec >= 1000000000) @@ -56,7 +56,7 @@ __pthread_cond_timedwait (cond, mutex, abstime) lll_mutex_lock (cond->__data.__lock); /* Now we can release the mutex. */ - err = __pthread_mutex_unlock_internal (mutex); + int err = __pthread_mutex_unlock_internal (mutex); if (err) { lll_mutex_unlock (cond->__data.__lock); @@ -92,8 +92,6 @@ __pthread_cond_timedwait (cond, mutex, abstime) while (1) { - int err; - /* Get the current time. So far we support only one clock. */ struct timeval tv; (void) gettimeofday (&tv, NULL); @@ -162,9 +160,9 @@ __pthread_cond_timedwait (cond, mutex, abstime) __pthread_cleanup_pop (&buffer, 0); /* Get the mutex before returning. */ - __pthread_mutex_lock_internal (mutex); + err = __pthread_mutex_lock_internal (mutex); - return result; + return err ?: result; } versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait, diff --git a/nptl/sysdeps/pthread/pthread_cond_wait.c b/nptl/sysdeps/pthread/pthread_cond_wait.c index d96444f..399cee8 100644 --- a/nptl/sysdeps/pthread/pthread_cond_wait.c +++ b/nptl/sysdeps/pthread/pthread_cond_wait.c @@ -141,9 +141,7 @@ __pthread_cond_wait (cond, mutex) __pthread_cleanup_pop (&buffer, 0); /* Get the mutex before returning. */ - __pthread_mutex_lock_internal (mutex); - - return 0; + return __pthread_mutex_lock_internal (mutex); } versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c index 5a75962..32dba26 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c index 85b4e3c..b271217 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c index a07d346..25127c2 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c index 5409237..958159f 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c index 6bf577b..b36ebdb 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c index 669dc3c..d2ef2ce 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c index eb6fd04..3695ccd 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c index 2437de0..a56e1e0 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/nptl/version.c b/nptl/version.c index 0f12c6a..d0658ba 100644 --- a/nptl/version.c +++ b/nptl/version.c @@ -34,7 +34,8 @@ void __nptl_main (void) { INTERNAL_SYSCALL_DECL (err); - INTERNAL_SYSCALL (write, err, 3, STDOUT_FILENO, banner, sizeof banner - 1); + INTERNAL_SYSCALL (write, err, 3, STDOUT_FILENO, (const char *) banner, + sizeof banner - 1); _exit (0); } -- cgit v1.1