diff options
| author | Roland McGrath <roland@gnu.org> | 2002-02-18 01:50:52 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-02-18 01:50:52 +0000 |
| commit | 9ce8b3c817156108b9f1a1cf12a3fa6eb4332f11 (patch) | |
| tree | 42ddd752b714edca7487883fb1e04fc20bc2c6a4 /sysdeps/mach/hurd/dl-sysdep.c | |
| parent | 89c255f160cdc8a12b5babe1592ce43f0264360d (diff) | |
| download | glibc-9ce8b3c817156108b9f1a1cf12a3fa6eb4332f11.tar.gz glibc-9ce8b3c817156108b9f1a1cf12a3fa6eb4332f11.tar.xz glibc-9ce8b3c817156108b9f1a1cf12a3fa6eb4332f11.zip | |
* hurd/Versions (libc: GLIBC_2.0): Add _S_catch_exception_raise_state,
_S_catch_exception_raise_state_identity, _hurdsig_fault_catch_exception_raise_state, _hurdsig_fault_catch_exception_raise_state_identity. * mach/shortcut.awk: Don't apply the /^}$/ rule when $proto == "". * sysdeps/mach/getsysstats.c (__get_avphys_pages) [HOST_VM_INFO]: Use __host_info with HOST_VM_INFO flavor instead of __vm_statistics. * sysdeps/mach/hurd/getpriority.c [TASK_SCHED_TIMESHARE_INFO]: Find `base_priority' in PIP->timeshare_base_info instead of PIP->taskinfo. * sysdeps/mach/hurd/dl-sysdep.c [FMH]: Define for i386 only. (fmh, unfmh): Define these functions only #if FMH. Otherwise define them as no-op macros. [FMH] (ELF_MACHINE_USER_ADDRESS_MASK): Redefine it to zero. (__mmap): Uncomment uses of ELF_MACHINE_USER_ADDRESS_MASK. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_USER_ADDRESS_MASK): New macro.
Diffstat (limited to 'sysdeps/mach/hurd/dl-sysdep.c')
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 596f161525..520385513d 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -71,7 +71,14 @@ unsigned long int __hurd_threadvar_stack_offset = (unsigned long int) &threadvars; unsigned long int __hurd_threadvar_stack_mask; +#define FMH defined(__i386__) +#if ! FMH +# define fmh() ((void)0) +# define unfmh() ((void)0) +#else /* XXX loser kludge for vm_map kernel bug */ +#undef ELF_MACHINE_USER_ADDRESS_MASK +#define ELF_MACHINE_USER_ADDRESS_MASK 0 static vm_address_t fmha; static vm_size_t fmhs; static void unfmh(void){ @@ -93,7 +100,7 @@ static void fmh(void) { assert_perror(err);} } /* XXX loser kludge for vm_map kernel bug */ - +#endif Elf32_Addr @@ -446,7 +453,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) mapaddr = (vm_address_t) addr; err = __vm_map (__mach_task_self (), - &mapaddr, (vm_size_t) len, 0 /*ELF_MACHINE_USER_ADDRESS_MASK*/, + &mapaddr, (vm_size_t) len, ELF_MACHINE_USER_ADDRESS_MASK, !(flags & MAP_FIXED), memobj_rd, (vm_offset_t) offset, @@ -460,7 +467,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) 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*/, + &mapaddr, (vm_size_t) len, + ELF_MACHINE_USER_ADDRESS_MASK, !(flags & MAP_FIXED), memobj_rd, (vm_offset_t) offset, flags & (MAP_COPY|MAP_PRIVATE), |