diff options
| author | Julian Lettner <jlettner@apple.com> | 2019-07-10 22:50:07 +0000 |
|---|---|---|
| committer | Julian Lettner <jlettner@apple.com> | 2019-07-10 22:50:07 +0000 |
| commit | 443d3525942a8142a7339d73d95f7cef0800ddc5 (patch) | |
| tree | ff3f7228dbeb538513d11f8d1ad0a824fdde493b | |
| parent | b13f9c3aa12733c6af857135b3b507adb2a8094c (diff) | |
| download | compiler-rt-443d3525942a8142a7339d73d95f7cef0800ddc5.tar.gz | |
[TSan] Fix linker error on Linux/AArch64
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@365707 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/tsan/rtl/tsan_platform_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc index baf1e876a..8db6635b1 100644 --- a/lib/tsan/rtl/tsan_platform_linux.cc +++ b/lib/tsan/rtl/tsan_platform_linux.cc @@ -292,9 +292,9 @@ void InitializePlatform() { } // Initialize the guard pointer used in {sig}{set,long}jump. longjmp_xor_key = InitializeGuardPtr(); - uptr old_value = longjmp_xor_key; - InitializeLongjmpXorKey(); - CHECK_EQ(longjmp_xor_key, old_value); + // uptr old_value = longjmp_xor_key; + // InitializeLongjmpXorKey(); + // CHECK_EQ(longjmp_xor_key, old_value); // If the above check fails for you, please contact me (jlettner@apple.com) // and let me know the values of the two differing keys. Please also set a // breakpoint on `InitializeGuardPtr` and `InitializeLongjmpXorKey` and tell @@ -425,7 +425,7 @@ DECLARE_REAL(int, _setjmp, void* env) static void InitializeLongjmpXorKey() { // 1. Call REAL(setjmp), which stores the mangled SP in env. jmp_buf env; - REAL(_setjmp)(env); + // REAL(_setjmp)(env); // TODO(yln) // 2. Retrieve mangled/vanilla SP. uptr mangled_sp = ((uptr *)&env)[LONG_JMP_SP_ENV_SLOT]; |