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/m68k | |
| 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/m68k')
| -rw-r--r-- | ldso/ldso/m68k/dl-sysdep.h | 8 | ||||
| -rw-r--r-- | ldso/ldso/m68k/elfinterp.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h index 2cbc7d46b..d8936f530 100644 --- a/ldso/ldso/m68k/dl-sysdep.h +++ b/ldso/ldso/m68k/dl-sysdep.h @@ -86,3 +86,11 @@ extern unsigned int _dl_linux_resolver (int, int, struct elf_resolve *, int); #define PAGE_ALIGN 0xfffff000 #define ADDR_ALIGN 0xfff #define OFFS_ALIGN 0x7ffff000 + +/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so + PLT entries should not be allowed to define the value. + ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one + of the main executable's symbols, as for a COPY reloc. */ +#define elf_machine_type_class(type) \ + ((((type) == R_68K_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ + | (((type) == R_68K_COPY) * ELF_RTYPE_CLASS_COPY)) diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index 1bcbec389..a03352976 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -98,7 +98,7 @@ unsigned int _dl_linux_resolver (int dummy1, int dummy2, /* Get the address of the GOT entry. */ new_addr = _dl_find_hash (strtab + symtab[symtab_index].st_name, - tpnt->symbol_scope, tpnt, resolver); + tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT); if (!new_addr) { _dl_dprintf (2, "%s: can't resolve symbol '%s'\n", @@ -218,7 +218,7 @@ int _dl_parse_relocation_information(struct dyn_elf *rpnt, symbol_addr = (unsigned int) _dl_find_hash (strtab + symtab[symtab_index].st_name, tpnt->symbol_scope, - reloc_type == R_68K_JMP_SLOT ? tpnt : NULL, symbolrel); + elf_machine_type_class(reloc_type)); /* We want to allow undefined references to weak symbols - this might have been intentional. We should not be @@ -342,7 +342,7 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, { symbol_addr = (unsigned int) _dl_find_hash (strtab + symtab[symtab_index].st_name, - xpnt->next, NULL, copyrel); + xpnt->next, ELF_RTYPE_CLASS_COPY); if (!symbol_addr) { _dl_dprintf (2, "%s: can't resolve symbol '%s'\n", |