| author | Arnaud Lacombe <lacombar@gmail.com> |
| Thu Aug 05 17:59:51 2010 +0200 (2010-08-05) | |
| changeset 2069 | 366bd2b22675 |
| permissions | -rw-r--r-- |
| yann@1614 | 1 |
Don't generate RPATH if we're going to be generating RUNPATH. |
| yann@1614 | 2 |
|
| yann@1614 | 3 |
need to ponder what ramifications this has before enabling it |
| yann@1614 | 4 |
|
| yann@1614 | 5 |
--- binutils/bfd/elflink.c |
| yann@1614 | 6 |
+++ binutils/bfd/elflink.c |
| yann@1614 | 7 |
@@ -5382,11 +5382,15 @@ |
| yann@1614 | 8 |
|
| yann@1614 | 9 |
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath, |
| yann@1614 | 10 |
TRUE); |
| yann@1614 | 11 |
- if (indx == (bfd_size_type) -1 |
| yann@1614 | 12 |
- || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx)) |
| yann@1614 | 13 |
+ if (indx == (bfd_size_type) -1) |
| yann@1614 | 14 |
return FALSE; |
| yann@1614 | 15 |
|
| yann@1614 | 16 |
- if (info->new_dtags) |
| yann@1614 | 17 |
+ if (!info->new_dtags) |
| yann@1614 | 18 |
+ {
|
| yann@1614 | 19 |
+ if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx)) |
| yann@1614 | 20 |
+ return FALSE; |
| yann@1614 | 21 |
+ } |
| yann@1614 | 22 |
+ else |
| yann@1614 | 23 |
{
|
| yann@1614 | 24 |
_bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx); |
| yann@1614 | 25 |
if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx)) |