diff options
| author | Roland McGrath <roland@gnu.org> | 1995-05-08 09:11:25 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-05-08 09:11:25 +0000 |
| commit | 421f82e5cc8f81ab003247d771bcecbad799be85 (patch) | |
| tree | 6d2e888aa32ba05854b1bd793b903cd0eb755bc4 /elf/dl-reloc.c | |
| parent | 0fb807c1dbb08de4408c440c2db490b52bd16f57 (diff) | |
| download | glibc-421f82e5cc8f81ab003247d771bcecbad799be85.tar.gz glibc-421f82e5cc8f81ab003247d771bcecbad799be85.tar.xz glibc-421f82e5cc8f81ab003247d771bcecbad799be85.zip | |
Sat May 6 11:06:47 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* Makeconfig (+gccwarn): Add -Winline. * hurd/hurdsig.c (_hurd_internal_post_signal): If SS->context is set, avoid abort_rpcs, and use reply and intr ports saved in SS->context. * sysdeps/mach/hurd/i386/trampoline.c: Don't set SS->intr_port from SS->context. Don't clear SS->context. * sysdeps/mach/hurd/i386/sigreturn.c: Don't set SS->intr_port when setting SS->context. If msg_sig_post returns, re-lock and clear SS->context. Fri May 5 10:37:09 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * mach/Makefile (errsystems.c): Comment out generation rule. * sysdeps/mach/_strerror.c: Consider a system unknown if its bad_sub member is null. * mach/mig-alloc.c: Add weak alias to non-__ name.
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 8efb3f04a6..94ffb71759 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -48,7 +48,7 @@ _dl_relocate_object (struct link_map *l, int lazy) & ~(pagesize - 1))); if (mprotect (mapstart, mapend - mapstart, PROT_READ|PROT_WRITE) < 0) - _dl_signal_error (errno, + _dl_signal_error (errno, l->l_name, "cannot make segment writable for relocation"); } } @@ -62,7 +62,8 @@ _dl_relocate_object (struct link_map *l, int lazy) Elf32_Addr resolve (const Elf32_Sym **ref) { - return _dl_lookup_symbol (strtab + (*ref)->st_name, ref, scope); + return _dl_lookup_symbol (strtab + (*ref)->st_name, ref, scope, + l->l_name); } real_next = l->l_next; @@ -75,7 +76,7 @@ _dl_relocate_object (struct link_map *l, int lazy) else scope = _dl_loaded; - elf_dynamic_relocate (l->l_info, l->l_addr, lazy, resolve); + ELF_DYNAMIC_RELOCATE (l, lazy, resolve); /* Restore list frobnication done above for DT_SYMBOLIC. */ l->l_next = real_next; @@ -107,7 +108,7 @@ _dl_relocate_object (struct link_map *l, int lazy) if (ph->p_flags & PF_X) prot |= PROT_EXEC; if (mprotect (mapstart, mapend - mapstart, prot) < 0) - _dl_signal_error (errno, + _dl_signal_error (errno, l->l_name, "can't restore segment prot after reloc"); } } |