diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2008-04-09 21:45:27 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2008-04-09 21:45:27 +0000 |
| commit | e8fa3db80c2b63ccd534533dd3faba4cea7228b8 (patch) | |
| tree | 576d27cf7bc73facdc4c3316c2b0c99491e0e78d /libexec/ld.so/sparc/rtld_machine.c | |
| parent | 2649d5c18f001d23bb274cca5b01e455722dcc89 (diff) | |
Improve support for shared libs linked at non-zero addreses:
- rename private values in struct elf_object to better
describe their meaning:
s/load_offs/obj_base/ "object's address '0' base"
s/load_addr/load_base/ "The base address of the loadable
segments"
- gdb needs the obj_base value so swap positions with load_base in
struct elf_object
- fix a few occurrences of where load_base was used instead of
obj_base.
With help and okay drahn@
Diffstat (limited to 'libexec/ld.so/sparc/rtld_machine.c')
| -rw-r--r-- | libexec/ld.so/sparc/rtld_machine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c index 1438447cdaf..1e44efa51aa 100644 --- a/libexec/ld.so/sparc/rtld_machine.c +++ b/libexec/ld.so/sparc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.30 2008/02/24 15:47:47 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.31 2008/04/09 21:45:26 kurt Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -184,7 +184,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) Elf_RelA *relas; struct load_list *llist; - loff = object->load_offs; + loff = object->obj_base; numrela = object->Dyn.info[relasz] / sizeof(Elf_RelA); relas = (Elf_RelA *)(object->Dyn.info[rel]); @@ -324,7 +324,7 @@ _dl_bind(elf_object_t *object, int reloff) sym += ELF_R_SYM(rela->r_info); symn = object->dyn.strtab + sym->st_name; - addr = (Elf_Addr *)(object->load_offs + rela->r_offset); + addr = (Elf_Addr *)(object->obj_base + rela->r_offset); this = NULL; ooff = _dl_find_symbol(symn, &this, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym, |