From: Nick Clifton <nickc@redhat.com>
Date: Fri, 31 Aug 2001 16:23:25 +0000 (+0000)
Subject: Do not rightshift recomputed addend during relocatable link if not USE_REL.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;ds=sidebyside;h=5fb1c3f28281809a976539b4a6810cae766bbd68;p=deliverable%2Fbinutils-gdb.git

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4f3b21196a..b2eb1c9225 100644
--- 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 fcde30ec84..2b627ec13f 100644
--- 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
 		}
 	    }