Backed out changeset 9809ac55fe34 (bug 1357897) for build bustage at …

…ThreadLocal.h:35:67. r=backout on a CLOSED TREE
mozilla-spidermonkey · Apr 25, 2017 · d376f1e · d376f1e
1 parent 3cc6f88
commit d376f1e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h
@@ -31,8 +31,7 @@ typedef sig_atomic_t sig_safe_t;
 
 namespace detail {
 
-#if defined(HAVE_THREAD_TLS_KEYWORD) || defined(XP_WIN) || \
-    (defined(XP_MACOSX) && defined(__has_feature) && __has_feature(cxx_thread_local))
+#if defined(HAVE_THREAD_TLS_KEYWORD) || defined(XP_WIN) || defined(XP_MACOSX)
 #define MOZ_HAS_THREAD_LOCAL
 #endif
 
@@ -182,7 +181,7 @@ ThreadLocal<T>::set(const T aValue)
 }
 
 #ifdef MOZ_HAS_THREAD_LOCAL
-#if defined(XP_WIN) || (defined(XP_MACOSX) && defined(__has_feature) && __has_feature(cxx_thread_local))
+#if defined(XP_WIN) || defined(XP_MACOSX)
 #define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE>
 #else
 #define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE>