diff options
| author | Julian Lettner <jlettner@apple.com> | 2019-07-08 18:37:36 +0000 |
|---|---|---|
| committer | Julian Lettner <jlettner@apple.com> | 2019-07-08 18:37:36 +0000 |
| commit | fbc7f176b193cfb50b26057d7745fda5a7d4db61 (patch) | |
| tree | 07a9081b5db0690b5dc93dceaf8869b62caedd4d | |
| parent | 3f399d2315069523b917fff8da00c55e2517afd2 (diff) | |
| download | compiler-rt-fbc7f176b193cfb50b26057d7745fda5a7d4db61.tar.gz | |
Revert "[TSan] Attempt to fix linker error for Linux on AArch64"
This reverts commit be4148062b155f3be52e0f6ebcb228f2dc137dcf.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@365367 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/tsan/rtl/tsan_platform_linux.cc | 2 | ||||
| -rw-r--r-- | lib/tsan/rtl/tsan_rtl_aarch64.S | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc index 86d732dce..1c61c99ee 100644 --- a/lib/tsan/rtl/tsan_platform_linux.cc +++ b/lib/tsan/rtl/tsan_platform_linux.cc @@ -69,7 +69,7 @@ void *__libc_stack_end = 0; #if SANITIZER_LINUX && defined(__aarch64__) void InitializeGuardPtr() __attribute__((visibility("hidden"))); -extern "C" __tsan::uptr _tsan_pointer_chk_guard = 0; +extern "C" __tsan::uptr _tsan_pointer_chk_guard; #endif namespace __tsan { diff --git a/lib/tsan/rtl/tsan_rtl_aarch64.S b/lib/tsan/rtl/tsan_rtl_aarch64.S index 93948e953..55487bd77 100644 --- a/lib/tsan/rtl/tsan_rtl_aarch64.S +++ b/lib/tsan/rtl/tsan_rtl_aarch64.S @@ -3,6 +3,14 @@ #include "sanitizer_common/sanitizer_asm.h" +#if !defined(__APPLE__) +.section .bss +.type __tsan_pointer_chk_guard, %object +ASM_SIZE(ASM_SYMBOL_INTERCEPTOR(__tsan_pointer_chk_guard)) +__tsan_pointer_chk_guard: +.zero 8 +#endif + #if defined(__APPLE__) .align 2 |