summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2019-02-13 14:32:04 -0800
committerJosh Gao <jmgao@google.com>2019-02-13 14:40:20 -0800
commit0680af728815bb00742ce0302fdf06a59c85f39a (patch)
treed712c7b3e84d3ddfa8f521515e542e410403d128
parente4b6d367d490a1498a8d1cef84c1f52752a8a0f9 (diff)
downloadexternal_libcxx-0680af728815bb00742ce0302fdf06a59c85f39a.tar.gz
external_libcxx-0680af728815bb00742ce0302fdf06a59c85f39a.tar.bz2
external_libcxx-0680af728815bb00742ce0302fdf06a59c85f39a.zip
Functionally revert "config: disable thread safety analysis on COFF".
We don't use shared libraries on Windows anyway, so this shouldn't hurt us, even if the bug in clang hasn't been fixed since the commit went in two years ago. Bug: http://b/124392080 Change-Id: Id562ac2bb64f1a384caa1553d2eeddd8371cf2ba
-rw-r--r--include/__config7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/__config b/include/__config
index 728387642..09e712848 100644
--- a/include/__config
+++ b/include/__config
@@ -1219,12 +1219,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS)
# if defined(__clang__) && __has_attribute(acquire_capability)
-// Work around the attribute handling in clang. When both __declspec and
-// __attribute__ are present, the processing goes awry preventing the definition
-// of the types.
-# if !defined(_LIBCPP_OBJECT_FORMAT_COFF)
-# define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
-# endif
+# define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
# endif
#endif