diff options
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_cond_timedwait.c | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/timer_create.c | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/nptl/sysdeps/pthread/pthread_cond_timedwait.c index 7f7d2086f2..1655c70c2a 100644 --- a/nptl/sysdeps/pthread/pthread_cond_timedwait.c +++ b/nptl/sysdeps/pthread/pthread_cond_timedwait.c @@ -100,8 +100,9 @@ __pthread_cond_timedwait (cond, mutex, abstime) { #ifdef __NR_clock_gettime INTERNAL_SYSCALL_DECL (err); - int val = INTERNAL_SYSCALL (clock_gettime, err, 2, - cond->__data.__clock, &rt); + int val; + val = INTERNAL_SYSCALL (clock_gettime, err, 2, + cond->__data.__clock, &rt); # ifndef __ASSUME_POSIX_TIMERS if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (val, err), 0)) { diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index 3e81475888..f7d88f20e6 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -9,7 +9,7 @@ The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public @@ -20,8 +20,9 @@ #include <setjmp.h> #include <stddef.h> #include <pthread-functions.h> +#include <pthreaddef.h> -extern void __pthread_cleanup_upto (jmp_buf env, char *targetframe); +extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto @@ -37,5 +38,5 @@ _longjmp_unwind (jmp_buf env, int val) unsigned char local_var; if (fptr != NULL) - fptr (env, &local_var); + fptr (env->__jmpbuf, &local_var); } diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h index 7934c0ed96..a51826ab84 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h @@ -162,7 +162,7 @@ extern int ___lll_mutex_timedlock (int *, const struct timespec *, int) static inline int __attribute__ ((always_inline)) -__lll_mutex_timedlock (int *futex, struct timespec *abstime) +__lll_mutex_timedlock (int *futex, const struct timespec *abstime) { int oldval; int newval; diff --git a/nptl/sysdeps/unix/sysv/linux/timer_create.c b/nptl/sysdeps/unix/sysv/linux/timer_create.c index ee026649a3..90e10b546d 100644 --- a/nptl/sysdeps/unix/sysv/linux/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/timer_create.c @@ -133,7 +133,8 @@ timer_create (clock_id, evp, timerid) { INTERNAL_SYSCALL_DECL (err); struct timespec ts; - int res = INTERNAL_SYSCALL (clock_getres, err, 1, &ts); + int res; + res = INTERNAL_SYSCALL (clock_getres, err, 1, &ts); __no_posix_timers = (INTERNAL_SYSCALL_ERROR_P (res, err) ? -1 : 1); } @@ -193,8 +194,9 @@ timer_create (clock_id, evp, timerid) /* Create the timer. */ INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (timer_create, err, 3, clock_id, &sev, - &newp->ktimerid); + int res; + res = INTERNAL_SYSCALL (timer_create, err, 3, clock_id, &sev, + &newp->ktimerid); if (! INTERNAL_SYSCALL_ERROR_P (res, err)) { *timerid = (timer_t) newp; |