Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.20.1/290-ld-stub-crash.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 17 19:48:49 2010 +0200 (2010-08-17)
changeset 2088 4f21ba5f8e91
parent 1700 patches/binutils/2.20/290-ld-stub-crash.patch@eccc37dd1a25
permissions -rw-r--r--
binutils/binutils: forward-port the patchset from 2.20 to 2.20.1

Among other things, this should fix the issue reported by Thomas at:
http://sourceware.org/ml/crossgcc/2010-08/msg00115.html

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 diff -p -c -u -r1.196 elf32-arm.c

     2 

     3 diff -durN binutils-2.20.1.orig/bfd/elf32-arm.c binutils-2.20.1/bfd/elf32-arm.c

     4 --- binutils-2.20.1.orig/bfd/elf32-arm.c	2010-02-22 09:06:48.000000000 +0100

     5 +++ binutils-2.20.1/bfd/elf32-arm.c	2010-08-17 19:32:25.000000000 +0200

     6 @@ -3194,11 +3194,15 @@

     7  

     8  	  /* We have an extra 2-bytes reach because of

     9  	     the mode change (bit 24 (H) of BLX encoding).  */

    10 +	  /* A stub is needed only if this call is not throught a PLT

    11 +	     entry, because PLT stubs handle mode switching

    12 +	     already.  */

    13  	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)

    14  	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)

    15 -	      || ((r_type == R_ARM_CALL) && !globals->use_blx)

    16 -	      || (r_type == R_ARM_JUMP24)

    17 -	      || (r_type == R_ARM_PLT32))

    18 +	      || ( (((r_type == R_ARM_CALL) && !globals->use_blx)

    19 +		    || (r_type == R_ARM_JUMP24)

    20 +		    || (r_type == R_ARM_PLT32))

    21 +		   && !use_plt))

    22  	    {

    23  	      stub_type = (info->shared | globals->pic_veneer)

    24  		/* PIC stubs.  */
crosstool-ng