diff options
| author | Kostya Serebryany <kcc@google.com> | 2016-04-22 23:27:15 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2016-04-22 23:27:15 +0000 |
| commit | 80fd6de57ba6f262faee90c745d7c90f6007819a (patch) | |
| tree | 0892b4e8f5a581846f1edb415e4363612c0f2736 /lib | |
| parent | 7575ed5f5244615b1e2dfcee45ff965565dd6c97 (diff) | |
[sanitizer] revert r267203 as it breaks aarch64 bots
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@267251 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_posix_libcdep.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_posix_libcdep.cc b/lib/sanitizer_common/sanitizer_posix_libcdep.cc index 20aed194e..6c1a85239 100644 --- a/lib/sanitizer_common/sanitizer_posix_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_posix_libcdep.cc @@ -272,8 +272,7 @@ void *MmapFixedNoReserve(uptr fixed_addr, uptr size, const char *name) { 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, |