Do not rightshift recomputed addend during relocatable link if not USE_REL.

This commit is contained in:
Nick Clifton 2001-08-31 16:23:25 +00:00
parent 374b596dd6
commit 5fb1c3f282
2 changed files with 5 additions and 3 deletions

View file

@ -1,5 +1,8 @@
2001-08-31 Nick Clifton <nickc@cambridge.redhat.com>
* elf32-arm.h (elf32_arm_relocate_section): Do not rightshift
recomputed addend during relocatable link.
* elflink.h (elf_gc_propagate_vtable_entries_used): Fix off-by-one
error.

View file

@ -1810,7 +1810,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
|| r_type == R_ARM_GNU_VTINHERIT)
continue;
elf32_arm_info_to_howto (input_bfd, & bfd_reloc, rel);
elf32_arm_info_to_howto (input_bfd, & bfd_reloc, (Elf32_Internal_Rel *) rel);
howto = bfd_reloc.howto;
if (info->relocateable)
@ -1829,8 +1829,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
arm_add_to_rel (input_bfd, contents + rel->r_offset,
howto, sec->output_offset + sym->st_value);
#else
rel->r_addend += (sec->output_offset + sym->st_value)
>> howto->rightshift;
rel->r_addend += (sec->output_offset + sym->st_value);
#endif
}
}