diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-07-28 02:19:49 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-07-28 02:30:15 -0400 |
| commit | cf31a2c79957936b60de34ea1e718e892baf669c (patch) | |
| tree | 68829b422bec72b81b34eac41edf559c389e3a83 | |
| parent | 18855eca3202da90bd4111168a1bf15f7100c435 (diff) | |
| download | glibc-cf31a2c79957936b60de34ea1e718e892baf669c.tar.gz glibc-cf31a2c79957936b60de34ea1e718e892baf669c.tar.xz glibc-cf31a2c79957936b60de34ea1e718e892baf669c.zip | |
ia64: atomic.h: fix atomic_exchange_and_add 64bit handling
Way back in 2005 the atomic_exchange_and_add function was cleaned up to avoid the explicit size checking and instead let gcc handle things itself. Unfortunately that change ended up leaving beyond a cast to int, even when the incoming value was a long. This has flown under the radar for a long time due to the function not being heavily used in the tree (especially as a full 64bit field), but a recent change to semaphores made some nptl tests fail reliably. This is due to the code packing two 32bit values into one 64bit variable (where the high 32bits contained the number of waiters), and then the whole variable being atomically updated between threads. On ia64, that meant we never atomically updated the count, so sometimes the sem_post would not wake up the waiters.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/ia64/bits/atomic.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index b177adc143..cd2d8274c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-07-27 Mike Frysinger <vapier@gentoo.org> + * sysdeps/ia64/bits/atomic.h (atomic_exchange_and_add): Define + directly in terms of __sync_fetch_and_add and delete (int) cast. + +2015-07-27 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/ia64/Makefile (CPPFLAGS): Delete the -D_ASM_IA64_CURRENT_H flag. diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/bits/atomic.h index 0e9dfc7174..4c2b54094c 100644 --- a/sysdeps/ia64/bits/atomic.h +++ b/sysdeps/ia64/bits/atomic.h @@ -82,9 +82,7 @@ typedef uintmax_t uatomic_max_t; (__sync_synchronize (), __sync_lock_test_and_set (mem, value)) #define atomic_exchange_and_add(mem, value) \ - ({ __typeof (*mem) __result; \ - __result = __sync_fetch_and_add ((mem), (int) (value)); \ - __result; }) + __sync_fetch_and_add ((mem), (value)) #define atomic_decrement_if_positive(mem) \ ({ __typeof (*mem) __oldval, __val; \ |