From b29289dde23b883ad17982a2fd9315cffbb3591b Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 28 Jan 2009 13:36:43 +0000 Subject: Remove check for the relocation type check in the resolver, from all archs. Signed-off-by: Jiri Olsa --- ldso/ldso/m68k/elfinterp.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ldso/ldso/m68k') diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index 8f7364f30..106ad528a 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -47,7 +47,6 @@ extern int _dl_linux_resolve(void); unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) { - int reloc_type; ELF_RELOC *this_reloc; char *strtab; ElfW(Sym) *symtab; @@ -60,19 +59,12 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL]; this_reloc = (ELF_RELOC *)(rel_addr + reloc_entry); - reloc_type = ELF_R_TYPE(this_reloc->r_info); symtab_index = ELF_R_SYM(this_reloc->r_info); symtab = (ElfW(Sym) *)tpnt->dynamic_info[DT_SYMTAB]; strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; symname = strtab + symtab[symtab_index].st_name; - if (unlikely(reloc_type != R_68K_JMP_SLOT)) { - _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", - _dl_progname); - _dl_exit(1); - } - /* Address of the jump instruction to fix up. */ instr_addr = (this_reloc->r_offset + tpnt->loadaddr); got_addr = (char **)instr_addr; -- cgit v1.2.3