Replace VXWORKS with ARM_COFF_BUGFIX.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e43763075ac148f8c14bd529554158015ae361c7..f451dde616eb1904af9501c3693a4c0e617d1190 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-01  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * config.bfd (arm-vxworks): Change name of define from VXWORKS to
+       ARM_COFF_BUGFIX.
+       (arm-epoc-pe): Define ARM_COFF_BUGFIX.
+       coff-arm.c (coff_arm_relocate_section): Replace VXWORKS with
+       ARM_COFF_BUGFIX.
+
 2001-07-30  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * libecoff.h (_bfd_ecoff_styp_to_sec_flags): Changed return type

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 8bb4e6c4940b0fbaf45133af3bad7e9272ba257c..bfedfdbc68af007e7af1c07637e2487108949275 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1246,10 +1246,10 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
             continue;
          /* FIXME - it is not clear which targets need this next test
             and which do not.  It is known that it is needed for the
-            VXworks target (hence the #ifdef), but it is also known
-            that it was supressed for other (arm) targets.  This ought
-            to be sorted out one day.  */
-#ifdef VXWORKS
+            VxWorks and EPOC-PE targets, but it is also known that it
+            was supressed for other ARM targets.  This ought to be
+            sorted out one day.  */
+#ifdef ARM_COFF_BUGFIX
          /* We must not ignore the symbol value.  If the symbol is
             within the same section, the relocation should have already
             been fixed, but if it is not, we'll be handed a reloc into

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 2989dedb1b1c527919439b5642ef4146282bf053..33dc81d399a9c54a3f9d5f1ee96697daa90386b2 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -120,6 +120,7 @@ case "${targ}" in
     targ_defvec=arm_epoc_pe_little_vec
     targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
     targ_underscore=no
+    targ_cflags=-DARM_COFF_BUGFIX
     ;;
   arm-wince-pe | arm-*-wince)
     targ_defvec=armpe_little_vec
@@ -144,7 +145,7 @@ case "${targ}" in
     targ_defvec=armcoff_little_vec
     targ_selvecs=armcoff_big_vec
     targ_underscore=yes
-    targ_cflags=-DVXWORKS
+    targ_cflags=-DARM_COFF_BUGFIX
     ;;
   arm-*-coff)
     targ_defvec=armcoff_little_vec