aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/init.c7
-rw-r--r--nptl/sysdeps/ia64/bits/atomic.h10
-rw-r--r--nptl/sysdeps/pthread/pthread_cond_timedwait.c10
-rw-r--r--nptl/sysdeps/pthread/pthread_cond_wait.c4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/sem_post.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c1
-rw-r--r--nptl/version.c3
13 files changed, 28 insertions, 14 deletions
diff --git a/nptl/init.c b/nptl/init.c
index df8e67a83e..e4e30815a6 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 4b1d24f8e7..cfccc6ad71 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 d6a4ae7cfe..417f873868 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 d96444f49b..399cee89ee 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 5a7596288b..32dba265a9 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c
index 85b4e3ce5c..b271217c41 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_trywait.c
index a07d3468a3..25127c21a1 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_wait.c
index 5409237513..958159f2d5 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_post.c
index 6bf577bc5f..b36ebdbceb 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c
index 669dc3ce12..d2ef2ceb30 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_trywait.c
index eb6fd04ce1..3695ccddfd 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_wait.c
index 2437de0e8a..a56e1e0a60 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 <sysdep.h>
#include <lowlevellock.h>
#include <internaltypes.h>
+#include <semaphore.h>
#include <shlib-compat.h>
diff --git a/nptl/version.c b/nptl/version.c
index 0f12c6aa18..d0658bac0c 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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:40:29 +0000