diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
commit | deec524084aa2faad66f7aae7e8b5ba1ab6789fd (patch) | |
tree | 8498414c429c57ce6b93a49c265aebcb8180c312 /ldso/ldso/mips/elfinterp.c | |
parent | 7bd4a2f4aaabca0e46015fe0216c086c7f61f1d4 (diff) |
Joakim Tjernlund writes:
Hi it is me again.
This is the latest ldso patch. the NEW weak symbol handling works now
with a little special handling in _dl_find_hash(). You get to chose
if you want the new or old handling :)
There was 2 missing _dl_check_if_named_library_is_loaded() calls in _dlopen().
I then disabled the _dl_check_if_named_library_is_loaded() in dl-elf.c since
it is rendundant.
Question, why does some _dl_linux_resolver(), like i386, have 2 calls
to _dl_find_hash()? I think that is wrong, isn't it?
I really hope you can check this out soon ...
Diffstat (limited to 'ldso/ldso/mips/elfinterp.c')
-rw-r--r-- | ldso/ldso/mips/elfinterp.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 59eca691b..5d3355b88 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -128,8 +128,13 @@ unsigned long _dl_linux_resolver(unsigned long sym_index, strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); symname = strtab + sym->st_name; - new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name, - tpnt->symbol_scope, tpnt, resolver); + new_addr = (unsigned long) _dl_find_hash(symname, + tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT); + if (!new_addr) { + _dl_dprintf (2, "%s: can't resolve symbol '%s'\n", + _dl_progname, symname); + _dl_exit (1); + } /* Address of jump instruction to fix up */ instr_addr = (unsigned long) (got + local_gotno + sym_index - gotsym); @@ -279,12 +284,12 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt) *got_entry = sym->st_value + (unsigned long) tpnt->loadaddr; else { *got_entry = (unsigned long) _dl_find_hash(strtab + - sym->st_name, tpnt->symbol_scope, NULL, copyrel); + sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY); } } else if (sym->st_shndx == SHN_COMMON) { *got_entry = (unsigned long) _dl_find_hash(strtab + - sym->st_name, tpnt->symbol_scope, NULL, copyrel); + sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY); } else if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC && *got_entry != sym->st_value) @@ -295,7 +300,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt) } else { *got_entry = (unsigned long) _dl_find_hash(strtab + - sym->st_name, tpnt->symbol_scope, NULL, copyrel); + sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY); } got_entry++; |