mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-18 12:24:38 +08:00
Conditionalize prevbious pathc on ! defined OLD_ARM_ABI.
This commit is contained in:
parent
f6bb7a3bb0
commit
df425bc0dd
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user