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/alpha | |
| parent | 4f40e8347f536a8fa0e2caf3e7014349d1d34217 (diff) | |
return object* the symbol is in for _dl_find_symbol*; drahn@ ok
Diffstat (limited to 'libexec/ld.so/alpha')
| -rw-r--r-- | libexec/ld.so/alpha/rtld_machine.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libexec/ld.so/alpha/rtld_machine.c b/libexec/ld.so/alpha/rtld_machine.c index b42428cbcb6..6c2c80341b1 100644 --- a/libexec/ld.so/alpha/rtld_machine.c +++ b/libexec/ld.so/alpha/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.29 2003/09/05 03:56:58 drahn Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.30 2004/05/25 18:07:20 mickey Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -109,7 +109,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) case R_TYPE(REFQUAD): ooff = _dl_find_symbol_bysym(object, ELF64_R_SYM(relas->r_info), _dl_objects, &this, - SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_NOTPLT, + NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_NOTPLT, sym->st_size); if (this == NULL) goto resolve_failed; @@ -134,7 +134,7 @@ _dl_printf("unaligned RELATIVE: %p type: %d %s 0x%lx -> 0x%lx\n", r_addr, break; case R_TYPE(JMP_SLOT): ooff = _dl_find_symbol(symn, _dl_objects, &this, - SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, + NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object); if (this == NULL) goto resolve_failed; @@ -143,7 +143,7 @@ _dl_printf("unaligned RELATIVE: %p type: %d %s 0x%lx -> 0x%lx\n", r_addr, case R_TYPE(GLOB_DAT): ooff = _dl_find_symbol_bysym(object, ELF64_R_SYM(relas->r_info), _dl_objects, &this, - SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_NOTPLT, + NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_NOTPLT, sym->st_size); if (this == NULL) goto resolve_failed; @@ -197,7 +197,7 @@ _dl_bind(elf_object_t *object, int reloff) addr = (Elf_Addr *)(object->load_offs + rela->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"); @@ -241,13 +241,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; @@ -255,13 +255,13 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) plt_addr = NULL; object->plt_size = 0; this = NULL; - ooff = _dl_find_symbol("__plt_start", object, &this, + ooff = _dl_find_symbol("__plt_start", object, &this, NULL, SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object); if (this != NULL) plt_addr = ooff + this->st_value; this = NULL; - ooff = _dl_find_symbol("__plt_end", object, &this, + ooff = _dl_find_symbol("__plt_end", object, &this, NULL, SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object); if (this != NULL) object->plt_size = ooff + this->st_value - plt_addr; |