jocke@1700: diff -p -c -u -r1.196 elf32-arm.c
jocke@1700: --- a/bfd/elf32-arm.c	22 May 2009 11:58:44 -0000	1.196
jocke@1700: +++ b/bfd/elf32-arm.c	12 Jun 2009 13:18:20 -0000
jocke@1700: @@ -3175,11 +3175,15 @@ arm_type_of_stub (struct bfd_link_info *
jocke@1700:  
jocke@1700:  	  /* We have an extra 2-bytes reach because of
jocke@1700:  	     the mode change (bit 24 (H) of BLX encoding).  */
jocke@1700: +	  /* A stub is needed only if this call is not throught a PLT
jocke@1700: +	     entry, because PLT stubs handle mode switching
jocke@1700: +	     already.  */
jocke@1700:  	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)
jocke@1700:  	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)
jocke@1700: -	      || ((r_type == R_ARM_CALL) && !globals->use_blx)
jocke@1700: -	      || (r_type == R_ARM_JUMP24)
jocke@1700: -	      || (r_type == R_ARM_PLT32))
jocke@1700: +	      || ( (((r_type == R_ARM_CALL) && !globals->use_blx)
jocke@1700: +		    || (r_type == R_ARM_JUMP24)
jocke@1700: +		    || (r_type == R_ARM_PLT32))
jocke@1700: +		   && !use_plt))
jocke@1700:  	    {
jocke@1700:  	      stub_type = (info->shared | globals->pic_veneer)
jocke@1700:  		/* PIC stubs.  */