diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2009-10-23 11:30:25 +0000 |
|---|---|---|
| committer | Kai Tietz <kai.tietz@onevision.com> | 2009-10-23 11:30:25 +0000 |
| commit | 0f46c87233ad420e129f4894765f30667673c2c3 (patch) | |
| tree | 806e9594484d5cb8965c12adfbfd475e967affff /bfd | |
| parent | 4d2041b723966e3712d63de54a670d0ddd8898f5 (diff) | |
| download | binutils-redhat-0f46c87233ad420e129f4894765f30667673c2c3.tar.gz | |
2009-10-23 Kai Tietz <kai.tietz@onevision.com>
* coff-x86_64.c (coff_amd64_rtype_to_howto): Subtract offset
of R_AMD64_PCRLONG_<X> relocations from addend.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/coff-x86_64.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6fabb76285..35a295a801 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-10-23 Kai Tietz <kai.tietz@onevision.com> + + * coff-x86_64.c (coff_amd64_rtype_to_howto): Subtract offset + of R_AMD64_PCRLONG_<X> relocations from addend. + 2009-10-23 Alan Modra <amodra@bigpond.net.au> * plugin.c: Produce empty object if not BFD_SUPPORTS_PLUGINS. diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c index ecce9f40c8..08ada5a6c1 100644 --- a/bfd/coff-x86_64.c +++ b/bfd/coff-x86_64.c @@ -550,16 +550,16 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, bfd_set_error (bfd_error_bad_value); return NULL; } - if (rel->r_type >= R_AMD64_PCRLONG_1 && rel->r_type <= R_AMD64_PCRLONG_5) - { - rel->r_vaddr += (bfd_vma)(rel->r_type-R_AMD64_PCRLONG); - rel->r_type = R_AMD64_PCRLONG; - } howto = howto_table + rel->r_type; #if defined(COFF_WITH_PE) /* Cancel out code in _bfd_coff_generic_relocate_section. */ *addendp = 0; + if (rel->r_type >= R_AMD64_PCRLONG_1 && rel->r_type <= R_AMD64_PCRLONG_5)
+ {
+ *addendp -= (bfd_vma)(rel->r_type - R_AMD64_PCRLONG);
+ rel->r_type = R_AMD64_PCRLONG;
+ } #endif if (howto->pc_relative) |