commit 9e20193f9e22de45aa353a7b87748c453c9caa9d
author Ryan Prichard <rprichard@google.com> Thu Jan 24 12:08:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 12:08:09 2019 -0800
tree 0207af336cdc9a10648be5263036f36df859f79c
parent 027a1c0818da5ff5cd5e2a8ce853fd42df292c2e
parent 0dff05088ae967447745a7bad1f400eaad8ea60b

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

Change-Id: Iddd81e7187ed18ea45a35cd5c29fec5f7a6fb0f2

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