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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4f3b21196a6d5859670f2fcb5edc3b95be96806d..b2eb1c9225aa7b1a8143d9f0a4a42080f4b20ad7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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.
 

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index fcde30ec84c57221337af88c68bf4e091482028b..2b627ec13f7b1d7a9fb307e9281106412145e395 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -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
                }
            }