From 0680af728815bb00742ce0302fdf06a59c85f39a Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 13 Feb 2019 14:32:04 -0800 Subject: [PATCH] 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 --- include/__config | 7 +------ 1 file changed, 1 insertion(+), 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