aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2001-03-07 23:52:58 +0000
committerNick Clifton <nickc@redhat.com>2001-03-07 23:52:58 +0000
commitdf425bc0dd07e99e14176f2bc34a83b93d37e717 (patch)
tree4f07a32f6fe0e05709517090c9786c2f16ca0dae /bfd
parentf6bb7a3bb0f985b7043ac9b63dc0769d73648008 (diff)
downloadgdb-df425bc0dd07e99e14176f2bc34a83b93d37e717.zip
gdb-df425bc0dd07e99e14176f2bc34a83b93d37e717.tar.gz
gdb-df425bc0dd07e99e14176f2bc34a83b93d37e717.tar.bz2
Conditionalize prevbious pathc on ! defined OLD_ARM_ABI.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2667ff9..ad88335 100644
--- 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 b64df9a..666e9cc 100644
--- 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);