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 | c2eb17db3750ebf0c2e0021ed9b5a58b46b9d478 (patch) | |
| tree | fd7c23d1f93ca3320f27daec3945a595e589cd0d /compiler-rt | |
| parent | 09ca33ebc4ccfce284b97a0cebaf5d0d84b26781 (diff) | |
| download | bcm5719-llvm-c2eb17db3750ebf0c2e0021ed9b5a58b46b9d478.tar.gz bcm5719-llvm-c2eb17db3750ebf0c2e0021ed9b5a58b46b9d478.zip | |
[sanitizer] revert r267203 as it breaks aarch64 bots
llvm-svn: 267251
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc index 20aed194ea0..6c1a8523943 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc +++ b/compiler-rt/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, |
