commit c49776bffc92c623c0bbb9d517252bf95bf9b652
author Chih-hung Hsieh <chh@google.com> Wed Dec 12 03:00:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 12 03:00:08 2018 +0000
tree 186ed8b5eb2a1c053aea3552f5793459eac427ed
parent b0a55fbf748c8564daabd51a7d95113576040efb
parent c2edae3f863f7c04d3b543c608319584527f2435

Merge "Fix cert-dcl16-c clang-tidy warnings in tests."

libc/private/bionic_tls.h

diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h
index da5a0e0..4749cee 100644
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@ -66,7 +66,9 @@
 
   TLS_SLOT_STACK_GUARD = 5, // GCC requires this specific slot for x86.
 
-  // TLS slot 6 was used for dlerror but is now free.
+  // Lets sanitizers avoid using pthread_getspecific for finding the current
+  // thread state. (Slot 6 was historically used for dlerror instead.)
+  TLS_SLOT_SANITIZER = 6,
 
   // Fast storage for Thread::Current() in ART.
   TLS_SLOT_ART_THREAD_SELF = 7,