Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch/vax Add back symnum, fix debug print.



details:   https://anonhg.NetBSD.org/src/rev/cbdb77ea24d0
branches:  trunk
changeset: 824843:cbdb77ea24d0
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Jun 20 15:02:54 2017 +0000

description:
Add back symnum, fix debug print.

diffstat:

 libexec/ld.elf_so/arch/vax/mdreloc.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 42671c6592f3 -r cbdb77ea24d0 libexec/ld.elf_so/arch/vax/mdreloc.c
--- a/libexec/ld.elf_so/arch/vax/mdreloc.c      Tue Jun 20 13:51:54 2017 +0000
+++ b/libexec/ld.elf_so/arch/vax/mdreloc.c      Tue Jun 20 15:02:54 2017 +0000
@@ -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 @@
        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 @@
 
                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));



Home | Main Index | Thread Index | Old Index