diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-05-25 18:07:22 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-05-25 18:07:22 +0000 |
| commit | 09c2c1a651b8caebf963956ee871e5ea48bcb12b (patch) | |
| tree | 625eee2ffbfe0ed2b4c096d9ac2544a5f2ab1dcb /libexec/ld.so/i386/rtld_machine.c | |
| parent | 4f40e8347f536a8fa0e2caf3e7014349d1d34217 (diff) | |
return object* the symbol is in for _dl_find_symbol*; drahn@ ok
Diffstat (limited to 'libexec/ld.so/i386/rtld_machine.c')
| -rw-r--r-- | libexec/ld.so/i386/rtld_machine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c index 4d6f80023a0..a4737065043 100644 --- a/libexec/ld.so/i386/rtld_machine.c +++ b/libexec/ld.so/i386/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.14 2004/05/25 15:56:18 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.15 2004/05/25 18:07:20 mickey Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -239,7 +239,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz) this = NULL; ooff = _dl_find_symbol_bysym(object, ELF_R_SYM(rels->r_info), _dl_objects, - &this, SYM_SEARCH_ALL|SYM_WARNNOTFOUND| + &this,NULL,SYM_SEARCH_ALL|SYM_WARNNOTFOUND| ((type == R_TYPE(JUMP_SLOT))? SYM_PLT:SYM_NOTPLT), sym->st_size); @@ -269,7 +269,7 @@ resolve_failed: Elf_Addr soff; soff = _dl_find_symbol(symn, object->next, &srcsym, - SYM_SEARCH_ALL|SYM_WARNNOTFOUND| + NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND| ((type == R_TYPE(JUMP_SLOT)) ? SYM_PLT:SYM_NOTPLT), size, object); if (srcsym == NULL) @@ -367,7 +367,7 @@ _dl_bind(elf_object_t *object, int index) addr = (Elf_Word *)(object->load_offs + rel->r_offset); this = NULL; - ooff = _dl_find_symbol(symn, _dl_objects, &this, + ooff = _dl_find_symbol(symn, _dl_objects, &this, NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object); if (this == NULL) { _dl_printf("lazy binding failed!\n"); @@ -417,13 +417,13 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) object->got_addr = NULL; object->got_size = 0; this = NULL; - ooff = _dl_find_symbol("__got_start", object, &this, + ooff = _dl_find_symbol("__got_start", object, &this, NULL, SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object); if (this != NULL) object->got_addr = ooff + this->st_value; this = NULL; - ooff = _dl_find_symbol("__got_end", object, &this, + ooff = _dl_find_symbol("__got_end", object, &this, NULL, SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object); if (this != NULL) object->got_size = ooff + this->st_value - object->got_addr; |