Disable WINCE workaround that subtracted 8 from pc relative relocations.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 78d5e8d..2e02617 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-21  Nick Clifton  <nickc@redhat.com>
+
+       * coff-arm.c (coff_arm_relocate_section): Disable WINCE workaround
+       that subtracted 8 from pc relative relocations.
+
 2002-12-20  Kazu Hirata  <kazu@cs.umass.edu>
 
        * coff-h8300.c: Fix comment typos.

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index ce711d1..2fadcbe 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1281,9 +1281,12 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 #ifdef ARM_WINCE
       /* MS ARM-CE makes the reloc relative to the opcode's pc, not
         the next opcode's pc, so is off by one.  */
+#if 0 /* This appears to have been true for WINCE 2.0, but it is not
+        true for WINCE 3.0.  */
       if (howto->pc_relative && !info->relocateable)
        addend -= 8;
 #endif
+#endif
 
       /* If we are doing a relocateable link, then we can just ignore
          a PC relative reloc that is pcrel_offset.  It will already