Index: lib/tsan/rtl/tsan_platform_linux.cc
===================================================================
--- lib/tsan/rtl/tsan_platform_linux.cc
+++ lib/tsan/rtl/tsan_platform_linux.cc
@@ -296,7 +296,7 @@
     // 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__)
+#if 1 //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,"
Index: test/tsan/cond_cancel.c
===================================================================
--- test/tsan/cond_cancel.c
+++ test/tsan/cond_cancel.c
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
-// CHECK-NOT: WARNING
+// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: OK
 // This test is failing on powerpc64 (VMA=44). After calling pthread_cancel,
 // the Thread-specific data destructors are not called, so the destructor 
Index: test/tsan/mutex_cycle2.c
===================================================================
--- test/tsan/mutex_cycle2.c
+++ test/tsan/mutex_cycle2.c
@@ -24,7 +24,7 @@
   pthread_mutex_lock(&mu2);
   pthread_mutex_lock(&mu1);
   // CHECK: ThreadSanitizer: lock-order-inversion (potential deadlock)
-  // DISABLED-NOT: ThreadSanitizer
+  // DISABLED-NOT: ThreadSanitizer:
   // DISABLED: PASS
   pthread_mutex_unlock(&mu1);
   pthread_mutex_unlock(&mu2);