>From 42a5bbbab0c8f42c6014ebe12c9963b371168866 Mon Sep 17 00:00:00 2001 From: Oskari Saarenmaa Date: Tue, 23 Sep 2014 23:53:46 +0300 Subject: [PATCH] atomics: fix atomic add for sunpro and drop invalid #endifs Solaris Studio compiler has an atomic add operation that returns the new value, the one with no _nv suffix doesn't return anything. --- src/include/port/atomics/generic-sunpro.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/include/port/atomics/generic-sunpro.h b/src/include/port/atomics/generic-sunpro.h index 10ac70d..fedc099 100644 --- a/src/include/port/atomics/generic-sunpro.h +++ b/src/include/port/atomics/generic-sunpro.h @@ -47,14 +47,12 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr, return ret; } -#define PG_HAS_ATOMIC_FETCH_ADD_U32 +#define PG_HAS_ATOMIC_ADD_FETCH_U32 STATIC_IF_INLINE uint32 -pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_) +pg_atomic_add_fetch_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_) { - return atomic_add_32(&ptr->value, add_); + return atomic_add_32_nv(&ptr->value, add_); } -#endif - #define PG_HAS_ATOMIC_COMPARE_EXCHANGE_U64 static inline bool @@ -70,12 +68,11 @@ pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr, return ret; } -#define PG_HAS_ATOMIC_FETCH_ADD_U64 +#define PG_HAS_ATOMIC_ADD_FETCH_U64 STATIC_IF_INLINE uint64 -pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_) +pg_atomic_add_fetch_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_) { - return atomic_add_64(&ptr->value, add_); + return atomic_add_64_nv(&ptr->value, add_); } -#endif #endif -- 1.8.4.1