../../bfd/elf32-arm.h:1438: `R_ARM_THM_XPC22' undeclared

[Nick Clifton]

Hi Dave,

> ../../bfd/elf32-arm.h:1438: `R_ARM_THM_XPC22' undeclared (first use in this function)

Oops - I have checked in the following to fix this.

Cheers
        Nick

2001-03-07  Nick Clifton  <nickc@redhat.com>

	* elf32-arm.h (elf32_arm_final_link_relocate): Conditionalise
	prior patch on ! defined OLD_ARM_ABI.

Index: bfd/elf32-arm.h
===================================================================
RCS file: /cvs/src//src/bfd/elf32-arm.h,v
retrieving revision 1.45
diff -p -r1.45 elf32-arm.h
*** elf32-arm.h	2001/03/06 22:33:46	1.45
--- elf32-arm.h	2001/03/07 23:12:39
*************** elf32_arm_final_link_relocate (howto, in
*** 1434,1439 ****
--- 1434,1440 ----
  	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
*************** elf32_arm_final_link_relocate (howto, in
*** 1444,1450 ****
  	     corresponding bit one in the target address will be set from bit
  	     one of the source address.  */
  	  lower_insn &= ~1;
! 	
  	/* 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);
--- 1445,1451 ----
  	     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);