Mercurialcrosstool-ng / annotate
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 Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 1700 eccc37dd1a25
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
jocke@1700 
     1
 
diff -p -c -u -r1.196 elf32-arm.c
yann@2088 
     2
 






yann@2088


     3


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







yann@2088


     4


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







yann@2088


     5


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







yann@2088


     6


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







jocke@1700


     7


 







jocke@1700


     8


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







jocke@1700


     9


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







jocke@1700


    10


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







jocke@1700


    11


+	     entry, because PLT stubs handle mode switching







jocke@1700


    12


+	     already.  */







jocke@1700


    13


 	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)







jocke@1700


    14


 	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)







jocke@1700


    15


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







jocke@1700


    16


-	      || (r_type == R_ARM_JUMP24)







jocke@1700


    17


-	      || (r_type == R_ARM_PLT32))







jocke@1700


    18


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







jocke@1700


    19


+		    || (r_type == R_ARM_JUMP24)







jocke@1700


    20


+		    || (r_type == R_ARM_PLT32))







jocke@1700


    21


+		   && !use_plt))







jocke@1700


    22


 	    {







jocke@1700


    23


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







jocke@1700


    24


 		/* PIC stubs.  */












crosstool-ng