Module Name: src
Committed By: joerg
Date: Wed Jun 21 12:34:01 UTC 2017
Modified Files:
src/libexec/ld.elf_so/arch/mips: mips_reloc.c
Log Message:
Replace last use of r_type.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/libexec/ld.elf_so/arch/mips/mips_reloc.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/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.67 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.68
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.67 Tue Jun 20 13:24:03 2017
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c Wed Jun 21 12:34:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_reloc.c,v 1.67 2017/06/20 13:24:03 joerg Exp $ */
+/* $NetBSD: mips_reloc.c,v 1.68 2017/06/21 12:34:01 joerg Exp $ */
/*
* Copyright 1997 Michael L. Hitch <mhi...@montana.edu>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.67 2017/06/20 13:24:03 joerg Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.68 2017/06/21 12:34:01 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -350,7 +350,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
/* 32-bit PC-relative reference */
const Elf_Sym *def2;
const size_t rlen =
- ELF_R_NXTTYPE_64_P(r_type)
+ ELF_R_NXTTYPE_64_P(ELF_R_TYPE(rel->r_info))
? sizeof(Elf_Sxword)
: sizeof(Elf_Sword);
Elf_Sxword old = load_ptr(where, rlen);
