Index: compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
===================================================================
--- compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
+++ compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
@@ -3,28 +3,6 @@
 
 #include "sanitizer_common/sanitizer_asm.h"
 
-#if defined(__APPLE__)
-.align  2
-
-.section  __DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-.long _setjmp$non_lazy_ptr
-_setjmp$non_lazy_ptr:
-.indirect_symbol _setjmp
-.long 0
-
-.section  __DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-.long __setjmp$non_lazy_ptr
-__setjmp$non_lazy_ptr:
-.indirect_symbol __setjmp
-.long 0
-
-.section  __DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-.long _sigsetjmp$non_lazy_ptr
-_sigsetjmp$non_lazy_ptr:
-.indirect_symbol _sigsetjmp
-.long 0
-#endif
-
 #if !defined(__APPLE__)
 .section .text
 #else
@@ -75,9 +53,8 @@
   ldr     x1, [x1, #:got_lo12:_ZN14__interception11real_setjmpE]
   ldr     x1, [x1]
 #else
-  adrp    x1, _setjmp$non_lazy_ptr@page
-  add     x1, x1, _setjmp$non_lazy_ptr@pageoff
-  ldr     x1, [x1]
+  adrp    x1, ASM_SYMBOL(_setjmp)@GOTPAGE
+  ldr     x1, [x1, ASM_SYMBOL(_setjmp)@GOTPAGEOFF]
 #endif
   br      x1
 
@@ -126,9 +103,8 @@
   ldr     x1, [x1, #:got_lo12:_ZN14__interception12real__setjmpE]
   ldr     x1, [x1]
 #else
-  adrp    x1, __setjmp$non_lazy_ptr@page
-  add     x1, x1, __setjmp$non_lazy_ptr@pageoff
-  ldr     x1, [x1]
+  adrp    x1, ASM_SYMBOL(_setjmp)@GOTPAGE
+  ldr     x1, [x1, ASM_SYMBOL(_setjmp)@GOTPAGEOFF]
 #endif
   br      x1
 
@@ -179,9 +155,8 @@
   ldr     x2, [x2, #:got_lo12:_ZN14__interception14real_sigsetjmpE]
   ldr     x2, [x2]
 #else
-  adrp    x2, _sigsetjmp$non_lazy_ptr@page
-  add     x2, x2, _sigsetjmp$non_lazy_ptr@pageoff
-  ldr     x2, [x2]
+  adrp    x2, ASM_SYMBOL(sigsetjmp)@GOTPAGE
+  ldr     x2, [x2, ASM_SYMBOL(sigsetjmp)@GOTPAGEOFF]
 #endif
   br      x2
   CFI_ENDPROC