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/sh/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/sh/elfinterp.c')
| -rw-r--r-- | ldso/ldso/sh/elfinterp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c index a2edffea2..e0032601c 100644 --- a/ldso/ldso/sh/elfinterp.c +++ b/ldso/ldso/sh/elfinterp.c @@ -149,13 +149,8 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) /* Get the address of the GOT entry */ - new_addr = _dl_find_hash(symname, tpnt->symbol_scope, tpnt, resolver); + new_addr = _dl_find_hash(symname, tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT); if (!new_addr) { - new_addr = _dl_find_hash(symname, NULL, NULL, resolver); - if (new_addr) { - return (unsigned long) new_addr; - } - _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", _dl_progname, symname); _dl_exit(1); } @@ -270,7 +265,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, symbol_addr = (unsigned long) _dl_find_hash(symname, scope, - (reloc_type == R_SH_JMP_SLOT ? tpnt : NULL), symbolrel); + elf_machine_type_class(reloc_type)); /* * We want to allow undefined references to weak symbols - this might @@ -385,7 +380,7 @@ _dl_do_copy_reloc (struct elf_resolve *tpnt, struct dyn_elf *scope, if (symtab_index) { - symbol_addr = (unsigned long) _dl_find_hash(symname, scope, NULL, copyrel); + symbol_addr = (unsigned long) _dl_find_hash(symname, scope, ELF_RTYPE_CLASS_COPY); if (!symbol_addr) goof++; } if (!goof) { |