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 | 6a155f52bc2a5c2edf97ca2b7eaf37fd3d868f59 (patch) | |
| tree | a816fc62b5e1fd4a725ed02dcf5e911468560152 | |
| parent | e26398849dccd9e4533a14553d53aa02595f6d8c (diff) | |
| download | bcm5719-llvm-6a155f52bc2a5c2edf97ca2b7eaf37fd3d868f59.tar.gz bcm5719-llvm-6a155f52bc2a5c2edf97ca2b7eaf37fd3d868f59.zip | |
[TSan] Fix linker error on Linux/AArch64
llvm-svn: 365707
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc index baf1e876a70..8db6635b141 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc +++ b/compiler-rt/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]; |

