Module Name: src
Committed By: joerg
Date: Tue Jun 20 15:02:55 UTC 2017
Modified Files:
src/libexec/ld.elf_so/arch/vax: mdreloc.c
Log Message:
Add back symnum, fix debug print.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/vax/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/vax/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.32 src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.33
--- src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.32 Mon Jun 19 11:57:02 2017
+++ src/libexec/ld.elf_so/arch/vax/mdreloc.c Tue Jun 20 15:02:54 2017
@@ -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>
#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 */
#include <sys/types.h>
@@ -58,6 +58,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
for (rela = obj->rela; rela < obj->relalim; rela++) {
Elf_Addr *where;
Elf_Addr tmp;
+ unsigned long symnum;
where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
@@ -120,12 +121,11 @@ _rtld_relocate_nonplt_objects(Obj_Entry
default:
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_TYPE(rela->r_info),
(void *)rela->r_offset, (void *)rela->r_addend,
- (void *)*where,
- obj->strtab + obj->symtab[symnum].st_name));
+ (void *)*where));
_rtld_error("%s: Unsupported relocation type %ld "
"in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
