diff options
| author | Josh Gao <jmgao@google.com> | 2019-02-14 13:07:51 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-14 13:07:51 -0800 |
| commit | 0162a2440d395e3ae3bb6456a2bdca1dd9af229c (patch) | |
| tree | d712c7b3e84d3ddfa8f521515e542e410403d128 | |
| parent | 3930c1250d6e2289eb77bb3debca056302b4866e (diff) | |
| parent | 40a97db9090e9abe63847ebd454bc4a9a1e42858 (diff) | |
| download | libcxx-0162a2440d395e3ae3bb6456a2bdca1dd9af229c.tar.gz | |
Functionally revert "config: disable thread safety analysis on COFF". am: 0680af7288 am: 9168854bc9
am: 40a97db909
Change-Id: I060914da4e60b8b8743cd3eb638f78c5b04ca1f0
| -rw-r--r-- | include/__config | 7 |
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 |