summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-09-22 03:15:35 +0000
committerEric Fiselier <eric@efcs.ca>2015-09-22 03:15:35 +0000
commit927a11e380d5c5fb1e618a6ce6bdf6c1f423e53f (patch)
tree4a0c85fe9481c306a28d9658cd01b2220f9f9a55
parent26fabd7ac59306b88706d18a4afcabaa4c336b62 (diff)
downloadbcm5719-llvm-927a11e380d5c5fb1e618a6ce6bdf6c1f423e53f.tar.gz
bcm5719-llvm-927a11e380d5c5fb1e618a6ce6bdf6c1f423e53f.zip
Fix <atomic> with -pedantic-errors
llvm-svn: 248240
-rw-r--r--libcxx/include/__config2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index e951f9b11ec..554109727fd 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -786,7 +786,7 @@ extern "C" void __sanitizer_annotate_contiguous_container(
#define _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
#endif
-#if __has_extension(c_atomic)
+#if __has_feature(cxx_atomic) || __has_extension(c_atomic)
#define _LIBCPP_HAS_C_ATOMIC_IMP
#elif _GNUC_VER > 407
#define _LIBCPP_HAS_GCC_ATOMIC_IMP
OpenPOWER on IntegriCloud