diff options
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc index 5de6f6a8031..1d4ef6b54fc 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc @@ -69,9 +69,8 @@ void *__libc_stack_end = 0; #if SANITIZER_LINUX && defined(__aarch64__) void InitializeGuardPtr() __attribute__((visibility("hidden"))); -#endif -// TODO(yln): only define this when necessary extern "C" __tsan::uptr _tsan_pointer_chk_guard = 0; +#endif namespace __tsan { @@ -353,7 +352,11 @@ uptr UnmangleLongJmpSp(uptr mangled_sp) { return sp; #endif #elif defined(__aarch64__) +# if SANITIZER_LINUX return mangled_sp ^ _tsan_pointer_chk_guard; +# else + return mangled_sp; +# endif #elif defined(__powerpc64__) // Reverse of: // ld r4, -28696(r13) |
