diff options
Diffstat (limited to 'sysdeps/ia64/bits/atomic.h')
| -rw-r--r-- | sysdeps/ia64/bits/atomic.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/bits/atomic.h index 1020c2f229..e7d312c539 100644 --- a/sysdeps/ia64/bits/atomic.h +++ b/sysdeps/ia64/bits/atomic.h @@ -52,12 +52,12 @@ typedef uintmax_t uatomic_max_t; (abort (), 0) #define __arch_compare_and_exchange_bool_32_acq(mem, newval, oldval) \ - (!__sync_bool_compare_and_swap ((mem), (int) (long) (oldval), \ - (int) (long) (newval))) + (!__sync_bool_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \ + (int) (long) (newval))) #define __arch_compare_and_exchange_bool_64_acq(mem, newval, oldval) \ - (!__sync_bool_compare_and_swap ((mem), (long) (oldval), \ - (long) (newval))) + (!__sync_bool_compare_and_swap_di ((void *) (mem), (long) (oldval), \ + (long) (newval))) #define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ (abort (), (__typeof (*mem)) 0) @@ -66,11 +66,12 @@ typedef uintmax_t uatomic_max_t; (abort (), (__typeof (*mem)) 0) #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ - __sync_val_compare_and_swap ((mem), (int) (long) (oldval), \ - (int) (long) (newval)) + __sync_val_compare_and_swap_si ((void *) (mem), (int) (long) (oldval), \ + (int) (long) (newval)) #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ - __sync_val_compare_and_swap ((mem), (long) (oldval), (long) (newval)) + __sync_val_compare_and_swap_di ((void *) (mem), (long) (oldval), \ + (long) (newval)) /* Atomically store newval and return the old value. */ #define atomic_exchange_acq(mem, value) \ @@ -79,9 +80,15 @@ typedef uintmax_t uatomic_max_t; #define atomic_exchange_rel(mem, value) \ (__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)); \ + if (sizeof (*mem) == 4) \ + __result = __sync_fetch_and_add_si ((void *) (mem), (int) (value)); \ + else if (sizeof (*mem) == 8) \ + __result = __sync_fetch_and_add_di ((void *) (mem), (long) (value)); \ + else \ + abort (); \ __result; }) #define atomic_decrement_if_positive(mem) \ |