jocke@1700: diff -p -c -u -r1.196 elf32-arm.c
yann@2088: 
yann@2088: diff -durN binutils-2.20.1.orig/bfd/elf32-arm.c binutils-2.20.1/bfd/elf32-arm.c
yann@2088: --- binutils-2.20.1.orig/bfd/elf32-arm.c	2010-02-22 09:06:48.000000000 +0100
yann@2088: +++ binutils-2.20.1/bfd/elf32-arm.c	2010-08-17 19:32:25.000000000 +0200
yann@2088: @@ -3194,11 +3194,15 @@
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.  */