[compiler-rt] 522d9f5 - Use modern @got syntax in tsan assembly, instead of old style non_lazy_pointers. NFC
Peter Cooper via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 20 14:47:04 PST 2023
Author: Peter Cooper
Date: 2023-02-20T14:45:37-08:00
New Revision: 522d9f554524de00865dbdfb9e5df9cf50f814b9
URL: https://github.com/llvm/llvm-project/commit/522d9f554524de00865dbdfb9e5df9cf50f814b9
DIFF: https://github.com/llvm/llvm-project/commit/522d9f554524de00865dbdfb9e5df9cf50f814b9.diff
LOG: Use modern @got syntax in tsan assembly, instead of old style non_lazy_pointers. NFC
Reviewed By: kubamracek, yln, wrotki, dvyukov
Differential Revision: https://reviews.llvm.org/D143959
Added:
Modified:
compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
Removed:
################################################################################
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S b/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
index e0b4c71dfed9..c6162659b876 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
+++ b/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 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
ldr x1, [x1, #:got_lo12:_ZN14__interception11real_setjmpE]
ldr x1, [x1]
#else
- adrp x1, _setjmp$non_lazy_ptr at page
- add x1, x1, _setjmp$non_lazy_ptr at pageoff
- ldr x1, [x1]
+ adrp x1, _setjmp at GOTPAGE
+ ldr x1, [x1, _setjmp at GOTPAGEOFF]
#endif
br x1
@@ -126,9 +103,8 @@ ASM_SYMBOL_INTERCEPTOR(_setjmp):
ldr x1, [x1, #:got_lo12:_ZN14__interception12real__setjmpE]
ldr x1, [x1]
#else
- adrp x1, __setjmp$non_lazy_ptr at page
- add x1, x1, __setjmp$non_lazy_ptr at pageoff
- ldr x1, [x1]
+ adrp x1, __setjmp at GOTPAGE
+ ldr x1, [x1, __setjmp at GOTPAGEOFF]
#endif
br x1
@@ -179,9 +155,8 @@ ASM_SYMBOL_INTERCEPTOR(sigsetjmp):
ldr x2, [x2, #:got_lo12:_ZN14__interception14real_sigsetjmpE]
ldr x2, [x2]
#else
- adrp x2, _sigsetjmp$non_lazy_ptr at page
- add x2, x2, _sigsetjmp$non_lazy_ptr at pageoff
- ldr x2, [x2]
+ adrp x2, _sigsetjmp at GOTPAGE
+ ldr x2, [x2, _sigsetjmp at GOTPAGEOFF]
#endif
br x2
CFI_ENDPROC
More information about the llvm-commits
mailing list