am df0891ad: Merge "Add a TLS slot for TSAN."

* commit 'df0891adcfe97dd8e4c825ea6ea586cc5bd09ef6':
  Add a TLS slot for TSAN.
This commit is contained in:
Dan Albert 2015-08-18 22:57:57 +00:00 committed by Android Git Automerger
commit af86eeecc9

View File

@ -70,6 +70,10 @@ enum {
// Fast storage for Thread::Current() in ART.
TLS_SLOT_ART_THREAD_SELF,
// Lets TSAN avoid using pthread_getspecific for finding the current thread
// state.
TLS_SLOT_TSAN,
BIONIC_TLS_SLOTS // Must come last!
};