From 07ece367fb5fe071fa75a426a3ce28e3b4ce04ba Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 11 Nov 2014 08:19:27 -0800 Subject: ovs-atomic: Prefer Clang intrinsics over . On my Debian "jessie" system, provided by GCC 4.9 is busted when Clang 3.5 tries to use it. Even a trivial program like this: #include void foo(void) { _Atomic(int) x; atomic_fetch_add(&x, 1); } yields: atomic.c:7:5: error: address argument to atomic operation must be a pointer to integer or pointer ('_Atomic(int) *' invalid) The Clang-specific version of ovs-atomic.h stills works, though, so this commit works around the problem. Signed-off-by: Ben Pfaff Acked-by: Jarno Rajahalme --- lib/ovs-atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/ovs-atomic.h') diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h index 6a213727f..9ead90779 100644 --- a/lib/ovs-atomic.h +++ b/lib/ovs-atomic.h @@ -321,10 +321,10 @@ #if __CHECKER__ /* sparse doesn't understand some GCC extensions we use. */ #include "ovs-atomic-pthreads.h" - #elif HAVE_STDATOMIC_H - #include "ovs-atomic-c11.h" #elif __has_extension(c_atomic) #include "ovs-atomic-clang.h" + #elif HAVE_STDATOMIC_H + #include "ovs-atomic-c11.h" #elif __GNUC__ >= 4 && __GNUC_MINOR__ >= 7 #include "ovs-atomic-gcc4.7+.h" #elif __GNUC__ && defined(__x86_64__) -- cgit v1.2.1