From eebb6d6061c2c96b15494293aad17222343f343b Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 22 Sep 2015 20:48:12 +0000 Subject: [PATCH] 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. --- contrib/libc++/src/support/atomic_support.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/libc++/src/support/atomic_support.h b/contrib/libc++/src/support/atomic_support.h index b0ff7f69fa68..dbf3b9c81ea4 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