commit 82aea781365f911e29386479a1da24c7664d78b7
author Ryan Prichard <rprichard@google.com> Thu Jan 03 00:06:17 2019 -0800
committer Ryan Prichard <rprichard@google.com> Wed Jan 16 01:11:26 2019 -0800
tree 98d93d63c4233ea77fbadce21c7c54f2b3b7e5a6
parent ca305a39e50d92dc572f50f00262b3dbb0dece9d

Use TLS_SLOT_THREAD_ID macro in vfork.S

No functional change intended.

Bug: none
Test: bionic unit tests
Change-Id: I7ee0a2b3f0e3807abe88bfa34ef3cd56c150a8f6

libc/arch-arm64/bionic/vfork.S

diff --git a/libc/arch-arm64/bionic/vfork.S b/libc/arch-arm64/bionic/vfork.S
index 0a83cc7..6acd64b 100644
--- a/libc/arch-arm64/bionic/vfork.S
+++ b/libc/arch-arm64/bionic/vfork.S
@@ -27,6 +27,7 @@
  */
 
 #include <private/bionic_asm.h>
+#include <private/bionic_asm_tls.h>
 #include <asm/signal.h>
 #include <linux/sched.h>
 
@@ -34,7 +35,7 @@
 __BIONIC_WEAK_ASM_FOR_NATIVE_BRIDGE(vfork)
     // __get_tls()[TLS_SLOT_THREAD_ID]->cached_pid_ = 0
     mrs     x0, tpidr_el0
-    ldr     x0, [x0, #8]
+    ldr     x0, [x0, #(TLS_SLOT_THREAD_ID * 8)]
     str     wzr, [x0, #20]
 
     mov     x0, #(CLONE_VM | CLONE_VFORK | SIGCHLD)