From 37b01f6a13f21f274bf9758ecbf5d9efd6153444 Mon Sep 17 00:00:00 2001 From: Dan Gissel Date: Fri, 11 Mar 2016 09:17:28 +0000 Subject: Fix some places where octet to byte conversions are needed. PR 19713 * elf.c (_bfd_elf_section_offset): Ensure that the returned offset uses bytes not octets. * elflink.c (resolve_section): Likewise. Add a bfd parameter. (eval_section): Pass the input_bfd to resolve_section. (bfd_elf_perform_complex_relocation): Convert byte offset to octets before read and writing values. (elf_link_input_bfd): Add byte to octet conversions. (elf_reloc_link_order): Likewise. (elf_fixup_link_order): Likewise. (bfd_elf_final_link): Likewise. * reloc.c (_bfd_final_link_relocate): Likewise. * syms.c (_bfd_stab_section_find_nearest_line): Likewise. --- bfd/reloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bfd/reloc.c') diff --git a/bfd/reloc.c b/bfd/reloc.c index a1683d8..0135c04 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -1375,7 +1375,8 @@ _bfd_final_link_relocate (reloc_howto_type *howto, } return _bfd_relocate_contents (howto, input_bfd, relocation, - contents + address); + contents + + address * bfd_octets_per_byte (input_bfd)); } /* Relocate a given location using a given value and howto. */ -- cgit v1.1