Bug 1073709 - Disable C++11 <atomic> when using GCC with libc++. r=waldo

Thaodan · Sep 26, 2014 · 2e6d852 · 2e6d852
1 parent 333bf1d
commit 2e6d852
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mfbt/Atomics.h b/mfbt/Atomics.h
@@ -34,10 +34,12 @@
     * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline
     * definitions for unspecialized std::atomic and causes linking errors.
     * Therefore, we require at least 4.7.0 for using libstdc++.
+    *
+    * libc++ <atomic> is only functional with clang.
     */
 #  if MOZ_USING_LIBSTDCXX && MOZ_LIBSTDCXX_VERSION_AT_LEAST(4, 7, 0)
 #    define MOZ_HAVE_CXX11_ATOMICS
-#  elif MOZ_USING_LIBCXX
+#  elif MOZ_USING_LIBCXX && defined(__clang__)
 #    define MOZ_HAVE_CXX11_ATOMICS
 #  endif
 /*