am e80369ab: Merge "Bionic: Add a TLS slot for ART for Thread self"

* commit 'e80369ab0c484a99925a49a81ab0675538fab38a':
  Bionic: Add a TLS slot for ART for Thread self
This commit is contained in:
Andreas Gampe 2015-08-04 22:51:40 +00:00 committed by Android Git Automerger
commit 5e64d60690

View File

@ -67,6 +67,9 @@ enum {
TLS_SLOT_STACK_GUARD = 5, // GCC requires this specific slot for x86. TLS_SLOT_STACK_GUARD = 5, // GCC requires this specific slot for x86.
TLS_SLOT_DLERROR, TLS_SLOT_DLERROR,
// Fast storage for Thread::Current() in ART.
TLS_SLOT_ART_THREAD_SELF,
BIONIC_TLS_SLOTS // Must come last! BIONIC_TLS_SLOTS // Must come last!
}; };