diff options
| author | Roland McGrath <roland@gnu.org> | 1996-01-10 10:00:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-01-10 10:00:22 +0000 |
| commit | 22930c9bf21ea15d0da1477a379029e2de259b69 (patch) | |
| tree | 4965b8c88d7fa7c00db1b58de2029b26d3310d95 /sysdeps/mach/hurd/dl-sysdep.c | |
| parent | 7410183b8b5e048a99b715c18b7259160077c4e0 (diff) | |
Tue Jan 9 16:10:26 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-960110
* elf/dl-load.c (_dl_map_object_from_fd): After mapping first
segment to find location, mprotect excess region to no access,
don't munmap it.
* sysdeps/mach/hurd/dl-sysdep.c (mmap): If vm_map returns
KERN_NO_SPACE for fixed location, deallocate it and try again.
Diffstat (limited to 'sysdeps/mach/hurd/dl-sysdep.c')
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 2d2d360cf2..fece47ba97 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -1,5 +1,5 @@ /* Operating system support for run-time dynamic linker. Hurd version. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -518,6 +518,22 @@ mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) flags & (MAP_COPY|MAP_PRIVATE), vmprot, VM_PROT_ALL, (flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY); + if (err == KERN_NO_SPACE && (flags & MAP_FIXED)) + { + /* XXX this is not atomic as it is in unix! */ + /* The region is already allocated; deallocate it first. */ + err = __vm_deallocate (__mach_task_self (), mapaddr, len); + if (! err) + err = __vm_map (__mach_task_self (), + &mapaddr, (vm_size_t) len, 0 /*ELF_MACHINE_USER_ADDRESS_MASK*/, + !(flags & MAP_FIXED), + (mach_port_t) fd, (vm_offset_t) offset, + flags & (MAP_COPY|MAP_PRIVATE), + vmprot, VM_PROT_ALL, + (flags & MAP_SHARED) + ? VM_INHERIT_SHARE : VM_INHERIT_COPY); + } + return err ? (caddr_t) __hurd_fail (err) : (caddr_t) mapaddr; } |