Module Name: src
Committed By: christos
Date: Wed Jul 12 17:54:23 UTC 2017
Modified Files:
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
Log Message:
make this compile with debug again (symnum uninitialized)
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/libexec/ld.elf_so/arch/x86_64/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/x86_64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.42 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.43
--- src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.42 Mon Jun 19 07:57:02 2017
+++ src/libexec/ld.elf_so/arch/x86_64/mdreloc.c Wed Jul 12 13:54:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.42 2017/06/19 11:57:02 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.43 2017/07/12 17:54:23 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.42 2017/06/19 11:57:02 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.43 2017/07/12 17:54:23 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -91,6 +91,9 @@ caddr_t _rtld_bind(const Obj_Entry *, El
static inline int _rtld_relocate_plt_object(const Obj_Entry *,
const Elf_Rela *, Elf_Addr *);
+#define rdbg_symnum(obj, rela) \
+ ((obj)->strtab + (obj)->symtab[ELF_R_SYM((rela)->r_info)].st_name)
+
void
_rtld_setup_pltgot(const Obj_Entry *obj)
{
@@ -180,7 +183,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
if (*where32 != tmp32)
*where32 = tmp32;
rdbg(("32/32S %s in %s --> %p in %s",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)(uintptr_t)*where32,
defobj->path));
break;
@@ -191,7 +194,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
if (*where64 != tmp64)
*where64 = tmp64;
rdbg(("64 %s in %s --> %p in %s",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)*where64, defobj->path));
break;
case R_TYPE(PC32): /* word32 S + A - P */
@@ -201,7 +204,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
if (*where32 != tmp32)
*where32 = tmp32;
rdbg(("PC32 %s in %s --> %p in %s",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)(unsigned long)*where32,
defobj->path));
break;
@@ -211,7 +214,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
if (*where64 != tmp64)
*where64 = tmp64;
rdbg(("64 %s in %s --> %p in %s",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)*where64, defobj->path));
break;
case R_TYPE(RELATIVE): /* word64 B + A */
@@ -231,7 +234,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
defobj->tlsoffset + rela->r_addend);
rdbg(("TPOFF64 %s in %s --> %p",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)*where64));
break;
@@ -240,7 +243,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
*where64 = (Elf64_Addr)defobj->tlsindex;
rdbg(("DTPMOD64 %s in %s --> %p",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)*where64));
break;
@@ -249,7 +252,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
*where64 = (Elf64_Addr)(def->st_value + rela->r_addend);
rdbg(("DTPOFF64 %s in %s --> %p",
- obj->strtab + obj->symtab[symnum].st_name,
+ rdbg_symnum(obj, rela),
obj->path, (void *)*where64));
break;
@@ -264,8 +267,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
(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 *)*where64,
- obj->strtab + obj->symtab[symnum].st_name));
+ (void *)*where64, rdbg_symnum(obj, rela)));
_rtld_error("%s: Unsupported relocation type %ld "
"in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
