1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/binutils/2.20.1a/290-ld-stub-crash.patch	Sun Sep 11 18:18:53 2011 +0200
     1.3 @@ -0,0 +1,24 @@
     1.4 +diff -p -c -u -r1.196 elf32-arm.c
     1.5 +
     1.6 +diff -durN binutils-2.20.1.orig/bfd/elf32-arm.c binutils-2.20.1/bfd/elf32-arm.c
     1.7 +--- binutils-2.20.1.orig/bfd/elf32-arm.c	2010-02-22 09:06:48.000000000 +0100
     1.8 ++++ binutils-2.20.1/bfd/elf32-arm.c	2010-08-17 19:32:25.000000000 +0200
     1.9 +@@ -3194,11 +3194,15 @@
    1.10 + 
    1.11 + 	  /* We have an extra 2-bytes reach because of
    1.12 + 	     the mode change (bit 24 (H) of BLX encoding).  */
    1.13 ++	  /* A stub is needed only if this call is not throught a PLT
    1.14 ++	     entry, because PLT stubs handle mode switching
    1.15 ++	     already.  */
    1.16 + 	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)
    1.17 + 	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)
    1.18 +-	      || ((r_type == R_ARM_CALL) && !globals->use_blx)
    1.19 +-	      || (r_type == R_ARM_JUMP24)
    1.20 +-	      || (r_type == R_ARM_PLT32))
    1.21 ++	      || ( (((r_type == R_ARM_CALL) && !globals->use_blx)
    1.22 ++		    || (r_type == R_ARM_JUMP24)
    1.23 ++		    || (r_type == R_ARM_PLT32))
    1.24 ++		   && !use_plt))
    1.25 + 	    {
    1.26 + 	      stub_type = (info->shared | globals->pic_veneer)
    1.27 + 		/* PIC stubs.  */