diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-05-23 14:27:15 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-05-23 14:27:15 +0000 |
| commit | 9ebafd4bb2e316e73addd017b088c5e84cba7bad (patch) | |
| tree | eaf1359d11ed34e8b3fb97ce3da3c40fcfc0ab61 /nptl | |
| parent | cbeae26ce77eb559b3a90ec31886dac15d2f9071 (diff) | |
Updated to fedora-glibc-20050523T1354
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 11 | ||||
| -rw-r--r-- | nptl/sysdeps/ia64/pthread_spin_lock.c | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/ia64/pthread_spin_trylock.c | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h | 12 |
4 files changed, 19 insertions, 8 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index d5d6dad89e..82d01308fc 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2005-05-17 Alan Modra <amodra@bigpond.net.au> + + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete + all occurrences of JUMPTARGET. Instead append @local to labels. + 2005-05-20 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/tls.h (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN): Define to @@ -9,6 +14,12 @@ * sysdeps/sparc/tls.h (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN): Likewise. +2005-05-19 Richard Henderson <rth@redhat.com> + + * sysdeps/ia64/pthread_spin_lock.c (pthread_spin_lock): Use + __sync_val_compare_and_swap, not explicit _si variant. + * sysdeps/ia64/pthread_spin_trylock.c (pthread_spin_trylock): Likewise. + 2005-05-03 Ulrich Drepper <drepper@redhat.com> [BZ #915] diff --git a/nptl/sysdeps/ia64/pthread_spin_lock.c b/nptl/sysdeps/ia64/pthread_spin_lock.c index 71aaef9451..7d25af7c4b 100644 --- a/nptl/sysdeps/ia64/pthread_spin_lock.c +++ b/nptl/sysdeps/ia64/pthread_spin_lock.c @@ -25,7 +25,7 @@ pthread_spin_lock (lock) { int *p = (int *) lock; - while (__builtin_expect (__sync_val_compare_and_swap_si (p, 0, 1), 0)) + while (__builtin_expect (__sync_val_compare_and_swap (p, 0, 1), 0)) { /* Spin without using the atomic instruction. */ do diff --git a/nptl/sysdeps/ia64/pthread_spin_trylock.c b/nptl/sysdeps/ia64/pthread_spin_trylock.c index b7cbf14782..0fd8b99b7a 100644 --- a/nptl/sysdeps/ia64/pthread_spin_trylock.c +++ b/nptl/sysdeps/ia64/pthread_spin_trylock.c @@ -24,5 +24,5 @@ int pthread_spin_trylock (lock) pthread_spinlock_t *lock; { - return __sync_val_compare_and_swap_si ((int *) lock, 0, 1) == 0 ? 0 : EBUSY; + return __sync_val_compare_and_swap ((int *) lock, 0, 1) == 0 ? 0 : EBUSY; } diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index 7f5ba4aeef..c61b3a66bb 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -85,14 +85,14 @@ # define UNDOCARGS_6 lwz 8,40(1); UNDOCARGS_5 # ifdef IS_IN_libpthread -# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel) -# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel) +# define CENABLE bl __pthread_enable_asynccancel@local +# define CDISABLE bl __pthread_disable_asynccancel@local # elif !defined NOT_IN_libc -# define CENABLE bl JUMPTARGET(__libc_enable_asynccancel) -# define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel) +# define CENABLE bl __libc_enable_asynccancel@local +# define CDISABLE bl __libc_disable_asynccancel@local # elif defined IS_IN_librt -# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) -# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) +# define CENABLE bl __librt_enable_asynccancel@local +# define CDISABLE bl __librt_disable_asynccancel@local # else # error Unsupported library # endif |