Module Name: src
Committed By: maxv
Date: Sat Jan 5 22:11:07 UTC 2019
Modified Files:
src/sys/arch/amd64/stand/prekern: elf.c
Log Message:
Apply amd64/kobj_machdep.c::rev1.7 to the prekern too, to fix the
relocation with updated binutils.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/stand/prekern/elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/stand/prekern/elf.c
diff -u src/sys/arch/amd64/stand/prekern/elf.c:1.17 src/sys/arch/amd64/stand/prekern/elf.c:1.18
--- src/sys/arch/amd64/stand/prekern/elf.c:1.17 Tue Nov 21 07:56:05 2017
+++ src/sys/arch/amd64/stand/prekern/elf.c Sat Jan 5 22:11:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elf.c,v 1.17 2017/11/21 07:56:05 maxv Exp $ */
+/* $NetBSD: elf.c,v 1.18 2019/01/05 22:11:07 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -196,6 +196,7 @@ elf_apply_reloc(uintptr_t relocbase, con
break;
case R_X86_64_PC32: /* S + A - P */
+ case R_X86_64_PLT32:
addr = elf_sym_lookup(symidx);
where32 = (Elf32_Addr *)where;
val32 = (Elf32_Addr)(addr + addend - (Elf64_Addr)where);
