commit e74ab5e8a4cf9121a7f5842150fbff2cf8c1d942
author Ryan Prichard <rprichard@google.com> Thu Jan 24 11:10:40 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 11:10:40 2019 -0800
tree 8c9a90f00043f62f17a769a86c60cbf11c3be41b
parent b621d1474d124765edd63b767d4e991d16414364
parent 3ce06c7b0ad60cafece0fedd2cf88340eb6a6c22

Merge "Reassign TLS slot 2 to TLS_SLOT_APP."
am: 3ce06c7b0a

Change-Id: I91031668fe12352c7957b45066e2efb0b0b1e6ba

libc/private/bionic_asm_tls.h

diff --git a/libc/private/bionic_asm_tls.h b/libc/private/bionic_asm_tls.h
index 0f0873f..92f707a 100644
--- a/libc/private/bionic_asm_tls.h
+++ b/libc/private/bionic_asm_tls.h
@@ -65,6 +65,9 @@
 //
 //  - TLS_SLOT_BIONIC_TLS: Optimizes accesses to bionic_tls by one load versus
 //    finding it using __get_thread().
+//
+//  - TLS_SLOT_APP: Available for use by apps in Android Q and later. (This slot
+//    was used for errno in P and earlier.)
 
 #if defined(__arm__) || defined(__aarch64__)
 
@@ -81,7 +84,7 @@
 #define TLS_SLOT_BIONIC_TLS       -1
 #define TLS_SLOT_DTV              0
 #define TLS_SLOT_THREAD_ID        1
-// Slot 2 is free (was historically used for TLS_SLOT_ERRNO)
+#define TLS_SLOT_APP              2 // was historically used for errno
 #define TLS_SLOT_OPENGL           3
 #define TLS_SLOT_OPENGL_API       4
 #define TLS_SLOT_STACK_GUARD      5
@@ -101,7 +104,7 @@
 
 #define TLS_SLOT_SELF             0
 #define TLS_SLOT_THREAD_ID        1
-// Slot 2 is free (was historically used for TLS_SLOT_ERRNO)
+#define TLS_SLOT_APP              2 // was historically used for errno
 #define TLS_SLOT_OPENGL           3
 #define TLS_SLOT_OPENGL_API       4
 #define TLS_SLOT_STACK_GUARD      5