From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjXS4-000471-5h for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:50:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjXRy-0005lN-N2 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:50:00 -0500 Received: from mail-ea0-x22e.google.com ([2a00:1450:4013:c01::22e]:53661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjXRy-0005l7-FX for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:49:54 -0500 Received: by mail-ea0-f174.google.com with SMTP id b10so2499797eae.33 for ; Thu, 21 Nov 2013 08:49:53 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 21 Nov 2013 17:49:31 +0100 Message-Id: <1385052578-32352-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385052578-32352-1-git-send-email-pbonzini@redhat.com> References: <1385052578-32352-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/11] atomic.h: Fix build with clang List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , aliguori@amazon.com From: Peter Maydell clang defines __ATOMIC_SEQ_CST but its implementation of the __atomic_exchange() builtin differs from that of gcc. Move the __clang__ branch of the ifdef ladder to the top and fix its implementation (there is no such builtin as __sync_exchange), so we can compile with clang again. Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- include/qemu/atomic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index 0aa8913..492bce1 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -168,14 +168,14 @@ #endif #ifndef atomic_xchg -#ifdef __ATOMIC_SEQ_CST +#if defined(__clang__) +#define atomic_xchg(ptr, i) __sync_swap(ptr, i) +#elif defined(__ATOMIC_SEQ_CST) #define atomic_xchg(ptr, i) ({ \ typeof(*ptr) _new = (i), _old; \ __atomic_exchange(ptr, &_new, &_old, __ATOMIC_SEQ_CST); \ _old; \ }) -#elif defined __clang__ -#define atomic_xchg(ptr, i) __sync_exchange(ptr, i) #else /* __sync_lock_test_and_set() is documented to be an acquire barrier only. */ #define atomic_xchg(ptr, i) (smp_mb(), __sync_lock_test_and_set(ptr, i)) -- 1.8.3.1