diff options
Diffstat (limited to 'libpthread/nptl/sysdeps')
15 files changed, 38 insertions, 41 deletions
diff --git a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h index 5cef8b1cf..b9528f363 100644 --- a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h @@ -28,4 +28,5 @@ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) /* We use the normal lobngjmp for unwinding. */ +extern __typeof(longjmp) __libc_longjmp attribute_noreturn; #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c b/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c index da859cc9f..a6b1cf403 100644 --- a/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c +++ b/libpthread/nptl/sysdeps/i386/pthread_spin_lock.c @@ -29,8 +29,7 @@ int -pthread_spin_lock (lock) - pthread_spinlock_t *lock; +pthread_spin_lock (pthread_spinlock_t *lock) { __asm__ ("\n" "1:\t" LOCK_PREFIX "decl %0\n\t" diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c index db9dc4dcd..1f4136e70 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c @@ -38,10 +38,10 @@ struct _condvar_cleanup_buffer }; int -__pthread_cond_timedwait (cond, mutex, abstime) - pthread_cond_t *cond; - pthread_mutex_t *mutex; - const struct timespec *abstime; +__pthread_cond_timedwait ( + pthread_cond_t *cond, + pthread_mutex_t *mutex, + const struct timespec *abstime) { struct _pthread_cleanup_buffer buffer; struct _condvar_cleanup_buffer cbuffer; diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c index b0fe694ba..79245b7c1 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c @@ -81,9 +81,9 @@ __condvar_cleanup (void *arg) int -__pthread_cond_wait (cond, mutex) - pthread_cond_t *cond; - pthread_mutex_t *mutex; +__pthread_cond_wait ( + pthread_cond_t *cond, + pthread_mutex_t *mutex) { struct _pthread_cleanup_buffer buffer; struct _condvar_cleanup_buffer cbuffer; diff --git a/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c b/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c index 0d12fe6bf..6f66bbbff 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_sigmask.c @@ -24,10 +24,10 @@ int -pthread_sigmask (how, newmask, oldmask) - int how; - const sigset_t *newmask; - sigset_t *oldmask; +pthread_sigmask ( + int how, + const sigset_t *newmask, + sigset_t *oldmask) { sigset_t local_newmask; diff --git a/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c b/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c index 4d0109cf0..62082f44e 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_spin_destroy.c @@ -21,8 +21,7 @@ int -pthread_spin_destroy (lock) - pthread_spinlock_t *lock; +pthread_spin_destroy (pthread_spinlock_t *lock) { /* Nothing to do. */ return 0; diff --git a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h index b9528f363..71a358209 100644 --- a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h @@ -27,6 +27,6 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) -/* We use the normal lobngjmp for unwinding. */ +/* We use the normal longjmp for unwinding. */ extern __typeof(longjmp) __libc_longjmp attribute_noreturn; #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 1a060c0f4..1033ebc2d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -173,7 +173,7 @@ extern int __lll_mutex_unlock_wake (int *__futex) #define lll_mutex_timedlock(futex, timeout) \ - ({ int result, ignore1, ignore2; \ + ({ int _result, ignore1, ignore2; \ __asm__ __volatile (LOCK_INSTR "cmpxchgl %1, %3\n\t" \ "jnz _L_mutex_timedlock_%=\n\t" \ ".subsection 1\n\t" \ @@ -186,11 +186,11 @@ extern int __lll_mutex_unlock_wake (int *__futex) ".size _L_mutex_timedlock_%=,.-_L_mutex_timedlock_%=\n"\ ".previous\n" \ "1:" \ - : "=a" (result), "=c" (ignore1), "=&d" (ignore2), \ + : "=a" (_result), "=c" (ignore1), "=&d" (ignore2), \ "=m" (futex) \ : "0" (0), "1" (1), "m" (futex), "m" (timeout) \ : "memory"); \ - result; }) + _result; }) #define lll_mutex_unlock(futex) \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c index 104472468..8d887e020 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_kill.c @@ -26,9 +26,9 @@ int -__pthread_kill (threadid, signo) - pthread_t threadid; - int signo; +__pthread_kill ( + pthread_t threadid, + int signo) { struct pthread *pd = (struct pthread *) threadid; diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c index 09a571659..9f02fe3b2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_create.c @@ -49,10 +49,10 @@ int __no_posix_timers attribute_hidden; int -timer_create (clock_id, evp, timerid) - clockid_t clock_id; - struct sigevent *evp; - timer_t *timerid; +timer_create ( + clockid_t clock_id, + struct sigevent *evp, + timer_t *timerid) { # undef timer_create # ifndef __ASSUME_POSIX_TIMERS diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c index 3ebbbce30..9b92446d5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_delete.c @@ -39,8 +39,7 @@ static int compat_timer_delete (timer_t timerid); int -timer_delete (timerid) - timer_t timerid; +timer_delete (timer_t timerid) { # undef timer_delete # ifndef __ASSUME_POSIX_TIMERS diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c index 4c97f97ce..7afc5ec6f 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_getoverr.c @@ -38,8 +38,7 @@ static int compat_timer_getoverrun (timer_t timerid); int -timer_getoverrun (timerid) - timer_t timerid; +timer_getoverrun (timer_t timerid) { # undef timer_getoverrun # ifndef __ASSUME_POSIX_TIMERS diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c index 3ce0916a8..31401b19b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_gettime.c @@ -39,9 +39,9 @@ static int compat_timer_gettime (timer_t timerid, struct itimerspec *value); int -timer_gettime (timerid, value) - timer_t timerid; - struct itimerspec *value; +timer_gettime ( + timer_t timerid, + struct itimerspec *value) { # undef timer_gettime # ifndef __ASSUME_POSIX_TIMERS diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c index 558c63f26..8c6ad91fa 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_settime.c @@ -41,11 +41,11 @@ static int compat_timer_settime (timer_t timerid, int flags, int -timer_settime (timerid, flags, value, ovalue) - timer_t timerid; - int flags; - const struct itimerspec *value; - struct itimerspec *ovalue; +timer_settime ( + timer_t timerid, + int flags, + const struct itimerspec *value, + struct itimerspec *ovalue) { # undef timer_settime # ifndef __ASSUME_POSIX_TIMERS diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 694cbf448..35cd868d0 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -143,7 +143,7 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden; #define lll_mutex_timedlock(futex, timeout) \ - ({ int result, ignore1, ignore2, ignore3; \ + ({ int _result, ignore1, ignore2, ignore3; \ __asm __volatile (LOCK_INSTR "cmpxchgl %2, %4\n\t" \ "jnz 1f\n\t" \ ".subsection 1\n" \ @@ -155,11 +155,11 @@ extern int __lll_mutex_unlock_wait (int *__futex) attribute_hidden; "jmp 2f\n\t" \ ".previous\n" \ "2:" \ - : "=a" (result), "=&D" (ignore1), "=S" (ignore2), \ + : "=a" (_result), "=&D" (ignore1), "=S" (ignore2), \ "=&d" (ignore3), "=m" (futex) \ : "0" (0), "2" (1), "m" (futex), "m" (timeout) \ : "memory", "cx", "cc", "r10", "r11"); \ - result; }) + _result; }) #define lll_mutex_unlock(futex) \ |