[compiler-rt] r365367 - Revert "[TSan] Attempt to fix linker error for Linux on AArch64"

[Julian Lettner via llvm-commits]

Author: yln
Date: Mon Jul  8 11:37:36 2019
New Revision: 365367

URL: http://llvm.org/viewvc/llvm-project?rev=365367&view=rev
Log:
Revert "[TSan] Attempt to fix linker error for Linux on AArch64"

This reverts commit be4148062b155f3be52e0f6ebcb228f2dc137dcf.

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc?rev=365367&r1=365366&r2=365367&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_platform_linux.cc Mon Jul  8 11:37:36 2019
@@ -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 {

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S?rev=365367&r1=365366&r2=365367&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S Mon Jul  8 11:37:36 2019
@@ -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