diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-17 13:37:54 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-17 13:37:54 +0000 |
| commit | 6d6f3a5c26adcf6b105edfb4b53e97ceee81944c (patch) | |
| tree | fdf250e80080d49b1e421f7157661033821c5fb7 /ldso/ldso/m68k | |
| parent | d965f80088fafaacfd33d0b0770724f4fbcbe6e5 (diff) | |
Let ldso decide if it should relocate itselft a second time. This
is needed if ldso should use libcs malloc whenever possible.
Fix RTLD_LAZY propagation to RTLD_NOW relocation when requested by
libdl.
Diffstat (limited to 'ldso/ldso/m68k')
| -rw-r--r-- | ldso/ldso/m68k/elfinterp.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index a3f529402..5e8249504 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -152,13 +152,6 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt, reloc_type = ELF32_R_TYPE (rpnt->r_info); symtab_index = ELF32_R_SYM (rpnt->r_info); - /* When the dynamic linker bootstrapped itself, it resolved some symbols. - Make sure we do not do them again. */ - if (tpnt->libtype == program_interpreter - && (!symtab_index - || _dl_symbol (strtab + symtab[symtab_index].st_name))) - continue; - switch (reloc_type) { case R_68K_NONE: @@ -207,12 +200,6 @@ int _dl_parse_relocation_information(struct dyn_elf *rpnt, reloc_type = ELF32_R_TYPE (rpnt->r_info); symtab_index = ELF32_R_SYM (rpnt->r_info); symbol_addr = 0; - - if (tpnt->libtype == program_interpreter - && (!symtab_index - || _dl_symbol (strtab + symtab[symtab_index].st_name))) - continue; - if (symtab_index) { symbol_addr = (unsigned int) @@ -334,10 +321,6 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, continue; symtab_index = ELF32_R_SYM (rpnt->r_info); symbol_addr = 0; - if (tpnt->libtype == program_interpreter - && (!symtab_index - || _dl_symbol (strtab + symtab[symtab_index].st_name))) - continue; if (symtab_index) { symbol_addr = (unsigned int) |