diff options
| author | dim <dim@FreeBSD.org> | 2015-09-22 20:48:12 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-22 20:48:12 +0000 |
| commit | eebb6d6061c2c96b15494293aad17222343f343b (patch) | |
| tree | 99ffdc8a83cf12741cb854ee432f2c3d193eeeb0 /contrib/libc++ | |
| parent | 5e9fd86be6bb5aeb2eac364646ac25710ed023da (diff) | |
| download | FreeBSD-src-eebb6d6061c2c96b15494293aad17222343f343b.zip FreeBSD-src-eebb6d6061c2c96b15494293aad17222343f343b.tar.gz | |
Partially revert r288121, removing the workaround for arm < v6. Since
r288125, the required atomic library calls are available in compiler-rt.
The added stub for __libcpp_relaxed_store() can stay as a fallback; I
have also committed it upstream.
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/src/support/atomic_support.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/libc++/src/support/atomic_support.h b/contrib/libc++/src/support/atomic_support.h index b0ff7f6..dbf3b9c 100644 --- a/contrib/libc++/src/support/atomic_support.h +++ b/contrib/libc++/src/support/atomic_support.h @@ -13,8 +13,7 @@ && defined(__ATOMIC_ACQUIRE) \ && defined(__ATOMIC_RELEASE) \ && defined(__ATOMIC_ACQ_REL) \ - && defined(__ATOMIC_SEQ_CST) \ - && defined(__ARM_ARCH) && __ARM_ARCH >= 6 + && defined(__ATOMIC_SEQ_CST) # define _LIBCPP_HAS_ATOMIC_BUILTINS #elif !defined(__clang__) && defined(_GNUC_VER) && _GNUC_VER >= 407 # define _LIBCPP_HAS_ATOMIC_BUILTINS |
