Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Feb 17 21:54:07 2011 +0100 (2011-02-17)
changeset 2301 a3818c3b03e0
permissions -rw-r--r--
internals: fix stripping host binaries

The gcc used by linaro has a version number specific to Linaro, but
identifies itself with its upstream version numbering scheme.

This breaks the strip in the finish step, because the actual gcc version
is not the same as the configured one (eg. 4.5.2 vs. linaro-4.5-2011.02-0).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Don't generate RPATH if we're going to be generating RUNPATH.

     2 

     3 need to ponder what ramifications this has before enabling it

     4 

     5 --- binutils/bfd/elflink.c

     6 +++ binutils/bfd/elflink.c

     7 @@ -5382,11 +5382,15 @@

     8  

     9  	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,

    10  				      TRUE);

    11 -	  if (indx == (bfd_size_type) -1

    12 -	      || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))

    13 +	  if (indx == (bfd_size_type) -1)

    14  	    return FALSE;

    15  

    16 -	  if  (info->new_dtags)

    17 +	  if (!info->new_dtags)

    18 +	    {

    19 +	      if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))

    20 +		return FALSE;

    21 +	    }

    22 +	  else

    23  	    {

    24  	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);

    25  	      if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))
crosstool-ng