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 Bart vdr. Meulen <bartvdrmeulen@gmail.com>
Mon Jul 19 23:16:02 2010 +0200 (2010-07-19)
changeset 2031 3917f2dafed1
permissions -rw-r--r--
complibs: fix using static companion libraries

When building a cross-compiler for a target which uses a file extension for
binaries the symbolic link to cc is not created correctly because the lookup
of the gcc binary is done in a incorrect path

Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com> 
     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