[compiler-rt] r267251 - [sanitizer] revert r267203 as it breaks aarch64 bots

[Kostya Serebryany via llvm-commits]

Author: kcc
Date: Fri Apr 22 18:27:15 2016
New Revision: 267251

URL: http://llvm.org/viewvc/llvm-project?rev=267251&view=rev
Log:
[sanitizer] revert r267203 as it breaks aarch64 bots

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc?rev=267251&r1=267250&r2=267251&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc Fri Apr 22 18:27:15 2016
@@ -272,8 +272,7 @@ void *MmapFixedNoReserve(uptr fixed_addr
 
 void *MmapNoAccess(uptr fixed_addr, uptr size, const char *name) {
   int fd = name ? GetNamedMappingFd(name, size) : -1;
-  unsigned flags = MAP_PRIVATE | MAP_NORESERVE;
-  if (fixed_addr != 0) flags |= MAP_FIXED;
+  unsigned flags = MAP_PRIVATE | MAP_FIXED | MAP_NORESERVE;
   if (fd == -1) flags |= MAP_ANON;
 
   return (void *)internal_mmap((void *)fixed_addr, size, PROT_NONE, flags, fd,