Conditionalize prevbious pathc on ! defined OLD_ARM_ABI.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2667ff9ee243ba0f532341e088a9e93925bd083b..ad88335998c1a68650ee855bc2e42d42f59fe0d9 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-07  Nick Clifton  <nickc@redhat.com>
+
+       * elf32-arm.h (elf32_arm_final_link_relocate): Conditionalise
+       prior patch on ! defined OLD_ARM_ABI.
+
 2001-03-07  Andreas Jaeger  <aj@suse.de>
 
        * elf64-x86-64.c (elf64_x86_64_relocate_section): Fix handling of

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index b64df9a9469c06107a67700c16393b50d6689866..666e9cc4b52c6eda4635059907f927afade02900 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1434,6 +1434,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
        upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
        lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
 
+#ifndef OLD_ARM_ABI
        if (r_type == R_ARM_THM_XPC22
            && ((lower_insn & 0x1800) == 0x0800))
          /* Remove bit zero of the adjusted offset.  Bit zero can only be
@@ -1444,7 +1445,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
             corresponding bit one in the target address will be set from bit
             one of the source address.  */
          lower_insn &= ~1;
-       
+#endif 
        /* Put the relocated value back in the object file:  */
        bfd_put_16 (input_bfd, upper_insn, hit_data);
        bfd_put_16 (input_bfd, lower_insn, hit_data + 2);