From 384f7503344b1d07561f801ced7493858cde6164 Mon Sep 17 00:00:00 2001 From: Awson Date: Mon, 26 Sep 2016 16:16:25 +0100 Subject: Fix the calculation of AMD64_PCRQUAD relocations. PR ld/17955 * coff-x86_64.c (coff_amd64_rtype_to_howto): Use an 8 byte offset for R_AMD64_PCRQUAD relocations. --- bfd/ChangeLog | 6 ++++++ bfd/coff-x86_64.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index da0d7a0..ce06702 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-09-26 Awson + + PR ld/17955 + * coff-x86_64.c (coff_amd64_rtype_to_howto): Use an 8 byte offset + for R_AMD64_PCRQUAD relocations. + 2016-09-26 Alan Modra * elf-bfd.h (_bfd_elf_ppc_merge_fp_attributes): Declare. diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c index 398bc48..d92e03d 100644 --- a/bfd/coff-x86_64.c +++ b/bfd/coff-x86_64.c @@ -614,7 +614,12 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, #if defined(COFF_WITH_PE) if (howto->pc_relative) { - *addendp -= 4; +#ifndef DONT_EXTEND_AMD64 + if (rel->r_type == R_AMD64_PCRQUAD) + *addendp -= 8; + else +#endif + *addendp -= 4; /* If the symbol is defined, then the generic code is going to add back the symbol value in order to cancel out an -- cgit v1.1