diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp index 9a66a7feb5b39..0d0b1aba1f852 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp +++ b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp @@ -243,12 +243,13 @@ static void ReExecIfNeeded() { reexec = true; } +# if SANITIZER_LINUX // ASLR personality check. int old_personality = personality(0xffffffff); bool aslr_on = (old_personality != -1) && ((old_personality & ADDR_NO_RANDOMIZE) == 0); -# if SANITIZER_ANDROID && (defined(__aarch64__) || defined(__x86_64__)) +# if SANITIZER_ANDROID && (defined(__aarch64__) || defined(__x86_64__)) // After patch "arm64: mm: support ARCH_MMAP_RND_BITS." is introduced in // linux kernel, the random gap between stack and mapped area is increased // from 128M to 36G on 39-bit aarch64. As it is almost impossible to cover @@ -261,7 +262,7 @@ static void ReExecIfNeeded() { CHECK_NE(personality(old_personality | ADDR_NO_RANDOMIZE), -1); reexec = true; } -# endif +# endif if (reexec) { // Don't check the address space since we're going to re-exec anyway. @@ -288,6 +289,7 @@ static void ReExecIfNeeded() { Die(); } } +# endif // SANITIZER_LINUX if (reexec) ReExec();