From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 2 Apr 2004 15:25:05 +0000 (+0000)
Subject: 2004-04-02  H.J. Lu  <hongjiu.lu@intel.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f433d93ad63424103d5b3c08d44e6eaff234293;p=binutils-gdb.git

2004-04-02  H.J. Lu  <hongjiu.lu@intel.com>

	* elf32-arm.h (elf32_arm_final_link_relocate): Handle
	R_ARM_ALU* only if OLD_ARM_ABI is not defined.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6f6b14c27df..b54be88b13a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Handle
+	R_ARM_ALU* only if OLD_ARM_ABI is not defined.
+
 2004-04-01  Paul Brook  <paul@codesourcery.com>
 
 	* bfd-in.h (bfd_elf32_arm_process_before_allocation): Update.
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index d3f8d1f0ea5..39864d427c4 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1767,6 +1767,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	return bfd_reloc_ok;
       }
 
+#ifndef OLD_ARM_ABI
     case R_ARM_ALU_PCREL7_0:
     case R_ARM_ALU_PCREL15_8:
     case R_ARM_ALU_PCREL23_15:
@@ -1791,6 +1792,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	bfd_put_32 (input_bfd, value, hit_data);
       }
       return bfd_reloc_ok;
+#endif
 
     case R_ARM_GNU_VTINHERIT:
     case R_ARM_GNU_VTENTRY: