diff options
| author | David Chisnall <theraven@FreeBSD.org> | 2013-01-12 10:06:59 +0000 |
|---|---|---|
| committer | David Chisnall <theraven@FreeBSD.org> | 2013-01-12 10:06:59 +0000 |
| commit | f795bc7ccc122734eb82d8940662749b07f6dac4 (patch) | |
| tree | afce88ed7938003abc8797fcbf8d90595448e1ad /contrib/libcxxrt | |
| parent | 26c538bc0bc1c320330f06bb045b4aa1cf66dcaa (diff) | |
| download | src-f795bc7ccc122734eb82d8940662749b07f6dac4.tar.gz src-f795bc7ccc122734eb82d8940662749b07f6dac4.zip | |
Fix libcxxrt / libc++ build with the clang in head.
Pointy hat to: theraven
Notes
Notes:
svn path=/head/; revision=245327
Diffstat (limited to 'contrib/libcxxrt')
| -rw-r--r-- | contrib/libcxxrt/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libcxxrt/atomic.h b/contrib/libcxxrt/atomic.h index bcd8a47ac89d..53aa26faa3fb 100644 --- a/contrib/libcxxrt/atomic.h +++ b/contrib/libcxxrt/atomic.h @@ -11,7 +11,7 @@ */ #if __has_feature(cxx_atomic) #define ATOMIC_SWAP(addr, val)\ - __atomic_exchange(addr, val, __ATOMIC_ACQ_REL) + __c11_atomic_exchange((_Atomic(__typeof__(val))*)addr, val, __ATOMIC_ACQ_REL) #elif __has_builtin(__sync_swap) #define ATOMIC_SWAP(addr, val)\ __sync_swap(addr, val) @@ -22,7 +22,7 @@ #if __has_feature(cxx_atomic) #define ATOMIC_LOAD(addr)\ - __atomic_load(addr, __ATOMIC_ACQUIRE) + __c11_atomic_load((_Atomic(__typeof__(*addr))*)addr, __ATOMIC_ACQUIRE) #else #define ATOMIC_LOAD(addr)\ (__sync_synchronize(), *addr) |