From 13e0a8749590a7f97f486f5767c47e1fcdc60576 Mon Sep 17 00:00:00 2001 From: Dave Anglin Date: Sun, 15 Feb 2009 19:39:44 +0000 Subject: [PATCH] * elf-hppa.h (elf_hppa_final_link_relocate): Correct addend value used in branch offset check. --- bfd/ChangeLog | 5 +++++ bfd/elf-hppa.h | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 83d7d0b..cd9033d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-02-15 John David Anglin + + * elf-hppa.h (elf_hppa_final_link_relocate): Correct addend value used + in branch offset check. + 2009-02-15 Alan Modra * elf64-ppc.c (struct _ppc64_elf_section_data): Delete t_symndx, diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h index b371c0e..0edf989 100644 --- a/bfd/elf-hppa.h +++ b/bfd/elf-hppa.h @@ -1684,6 +1684,7 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel, /* Turn VALUE into a proper PC relative address. */ value -= (offset + input_section->output_offset + input_section->output_section->vma); + addend -= 8; if (r_type == (unsigned int) R_PARISC_PCREL22F) max_branch_offset = (1 << (22-1)) << 2; @@ -1708,9 +1709,9 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel, /* Adjust for any field selectors. */ if (r_type == R_PARISC_PCREL17R) - value = hppa_field_adjust (value, -8 + addend, e_rsel); + value = hppa_field_adjust (value, addend, e_rsel); else - value = hppa_field_adjust (value, -8 + addend, e_fsel); + value = hppa_field_adjust (value, addend, e_fsel); /* All branches are implicitly shifted by 2 places. */ value >>= 2; -- 2.7.4