Module Name: src
Committed By: joerg
Date: Tue Jun 20 11:01:18 UTC 2017
Modified Files:
src/libexec/ld.elf_so/arch/arm: mdreloc.c
Log Message:
Drop symbol number from default branch diagnostic, it isn't set at this
point and most likely not valid either.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/libexec/ld.elf_so/arch/arm/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/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.39 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.40
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.39 Mon Jun 19 11:57:01 2017
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Tue Jun 20 11:01:18 2017
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.39 2017/06/19 11:57:01 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.39 2017/06/19 11:57:01 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -236,11 +236,10 @@ _rtld_relocate_nonplt_objects(Obj_Entry
default:
rdbg(("sym = %lu, type = %lu, offset = %p, "
- "contents = %p, symbol = %s",
+ "contents = %p",
(u_long)ELF_R_SYM(rel->r_info),
(u_long)ELF_R_TYPE(rel->r_info),
- (void *)rel->r_offset, (void *)load_ptr(where),
- obj->strtab + obj->symtab[symnum].st_name));
+ (void *)rel->r_offset, (void *)load_ptr(where)));
_rtld_error("%s: Unsupported relocation type %ld "
"in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rel->r_info));
