-#define clib_atomic_test_and_set(a) __sync_lock_test_and_set(a, 1)
-#define clib_atomic_release(a) __sync_lock_release(a)
+#define clib_atomic_cmp_and_swap_acq_relax_n(addr,exp,new,weak) __atomic_compare_exchange_n ((addr), (exp), (new), (weak), __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)
+#define clib_atomic_cmp_and_swap_acq_relax(addr, exp, new, weak) \
+ __atomic_compare_exchange ((addr), (exp), (new), (weak), __ATOMIC_ACQUIRE, \
+ __ATOMIC_RELAXED)