diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator64_testlib.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator64_testlib.cc index 3e9c541bceb..258d498b06c 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator64_testlib.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator64_testlib.cc @@ -34,7 +34,7 @@ typedef LargeMmapAllocator<> SecondaryAllocator; typedef CombinedAllocator<PrimaryAllocator, AllocatorCache, SecondaryAllocator> Allocator; -static THREADLOCAL AllocatorCache cache; +static AllocatorCache cache; static Allocator allocator; static int inited = 0; diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc index 54a662ad3d0..013b5cb361e 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc @@ -386,7 +386,7 @@ TEST(SanitizerCommon, CombinedAllocator32Compact) { template <class AllocatorCache> void TestSizeClassAllocatorLocalCache() { - static THREADLOCAL AllocatorCache static_allocator_cache; + static AllocatorCache static_allocator_cache; static_allocator_cache.Init(); AllocatorCache cache; typedef typename AllocatorCache::Allocator Allocator; @@ -438,7 +438,7 @@ TEST(SanitizerCommon, SizeClassAllocator32CompactLocalCache) { #if SANITIZER_WORDSIZE == 64 typedef SizeClassAllocatorLocalCache<Allocator64> AllocatorCache; -static THREADLOCAL AllocatorCache static_allocator_cache; +static AllocatorCache static_allocator_cache; void *AllocatorLeakTestWorker(void *arg) { typedef AllocatorCache::Allocator Allocator; diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_list_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_list_test.cc index 323ae4189ea..fbe53c0375c 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_list_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_list_test.cc @@ -21,8 +21,7 @@ struct ListItem { typedef IntrusiveList<ListItem> List; -// Check that IntrusiveList can be made thread-local. -static THREADLOCAL List static_list; +static List static_list; static void SetList(List *l, ListItem *x = 0, ListItem *y = 0, ListItem *z = 0) { |
