Add back symnum, fix debug print.
This commit is contained in:
parent
af8b71f9de
commit
152a0d21c4
|
@ -1,8 +1,8 @@
|
||||||
/* $NetBSD: mdreloc.c,v 1.32 2017/06/19 11:57:02 joerg Exp $ */
|
/* $NetBSD: mdreloc.c,v 1.33 2017/06/20 15:02:54 joerg Exp $ */
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
__RCSID("$NetBSD: mdreloc.c,v 1.32 2017/06/19 11:57:02 joerg Exp $");
|
__RCSID("$NetBSD: mdreloc.c,v 1.33 2017/06/20 15:02:54 joerg Exp $");
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -58,6 +58,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
|
||||||
for (rela = obj->rela; rela < obj->relalim; rela++) {
|
for (rela = obj->rela; rela < obj->relalim; rela++) {
|
||||||
Elf_Addr *where;
|
Elf_Addr *where;
|
||||||
Elf_Addr tmp;
|
Elf_Addr tmp;
|
||||||
|
unsigned long symnum;
|
||||||
|
|
||||||
where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
|
where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
|
||||||
|
|
||||||
|
@ -120,12 +121,11 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
rdbg(("sym = %lu, type = %lu, offset = %p, "
|
rdbg(("sym = %lu, type = %lu, offset = %p, "
|
||||||
"addend = %p, contents = %p, symbol = %s",
|
"addend = %p, contents = %p",
|
||||||
(u_long)ELF_R_SYM(rela->r_info),
|
(u_long)ELF_R_SYM(rela->r_info),
|
||||||
(u_long)ELF_R_TYPE(rela->r_info),
|
(u_long)ELF_R_TYPE(rela->r_info),
|
||||||
(void *)rela->r_offset, (void *)rela->r_addend,
|
(void *)rela->r_offset, (void *)rela->r_addend,
|
||||||
(void *)*where,
|
(void *)*where));
|
||||||
obj->strtab + obj->symtab[symnum].st_name));
|
|
||||||
_rtld_error("%s: Unsupported relocation type %ld "
|
_rtld_error("%s: Unsupported relocation type %ld "
|
||||||
"in non-PLT relocations",
|
"in non-PLT relocations",
|
||||||
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
|
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
|
||||||
|
|
Loading…
Reference in New Issue