From c8622e8cde5af98ed488e11d41e2471ca681d841 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Wed, 23 Mar 2016 11:24:30 +0000 Subject: [PATCH] Revert "[tsan] Disable randomized address space on linux aarch64." This reverts commits r264068 and r264079, and they were breaking the build and weren't reverted in time, nor they exhibited expected behaviour from the reviewers. There is more to discuss than just a test fix. llvm-svn: 264150 --- compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc index 3301fde..3e962fc 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -292,20 +291,6 @@ void InitializePlatform() { SetAddressSpaceUnlimited(); reexec = true; } - // 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 - // this big range, we should disable randomized virtual space on aarch64. -#if defined(__aarch64__) - int old_personality = personality(0xffffffff); - if (old_personality != -1 && (old_personality & ADDR_NO_RANDOMIZE) == 0) { - Report("WARNING: Program is run with randomized virtual address space," - " which wouldn't work with ThreadSanitizer.\n"); - Report("Re-execing with fixed virtual address space.\n"); - CHECK_NE(-1, personality(old_personality | ADDR_NO_RANDOMIZE)); - reexec = true; - } -#endif if (reexec) ReExec(); } -- 2.7.4