[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] atomic.h: Fix build with clang
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/11] atomic.h: Fix build with clang |
Date: |
Thu, 21 Nov 2013 17:49:31 +0100 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL for-1.7 00/11] Miscellaneous -rc patches, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 01/11] sun4m: Add FCode ROM for TCX framebuffer, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 02/11] configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 04/11] atomic.h: Fix build with clang,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/11] target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid(), Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 05/11] vfio-pci: Fix multifunction=on, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 08/11] rng-egd: offset the point when repeatedly read from the buffer, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 09/11] target-i386: yield to another VCPU on PAUSE, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 07/11] rng-egd: remove redundant free, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 10/11] mips jazz: do not raise data bus exception when accessing invalid addresses, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 11/11] qga: Fix compiler warnings (missing format attribute, wrong format strings), Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 03/11] pc: get rid of builtin pvpanic for "-M pc-1.5", Paolo Bonzini, 2013/11/21
- Re: [Qemu-devel] [PULL for-1.7 00/11] Miscellaneous -rc patches, Paolo Bonzini, 2013/11/25