diff options
Diffstat (limited to 'winsup/cygwin/mmap.cc')
| -rw-r--r-- | winsup/cygwin/mmap.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index 068413bb3..1a8f15338 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -530,6 +530,10 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off) if (flags & MAP_ANONYMOUS) fd = -1; + /* If MAP_FIXED is requested on a non-granularity boundary, change request + so that this looks like a request with offset addr % granularity. */ + if (fd == -1 && (flags & MAP_FIXED) && ((DWORD)addr % granularity) && !off) + off = (DWORD)addr % granularity; /* Map always in multipliers of `granularity'-sized chunks. */ _off64_t gran_off = off & ~(granularity - 1); DWORD gran_len = howmany (off + len, granularity) * granularity - gran_off; @@ -615,7 +619,7 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off) return ret; } } - if (map_list && fd == -1 && off == 0 && (flags & MAP_FIXED)) + if (map_list && fd == -1 && (flags & MAP_FIXED)) { caddr_t u_addr; DWORD u_len; |