diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
| commit | de8f2cea32f14099cf756cbef40d312ffd1894a8 (patch) | |
| tree | af4f9ce5798909cfa1eadec07390425937e3886a /patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled | |
| parent | 06cb0b6ddbbb2f9275b3a71eda3f2ffeff929d90 (diff) | |
| parent | 5b0242a30c12e4ce1366788126cea866b21abeba (diff) | |
Merge.
Diffstat (limited to 'patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled')
| -rw-r--r-- | patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled b/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled new file mode 100644 index 0000000..8989579 --- /dev/null +++ b/patches/binutils/2.20/180-only-use-new-ld-dtags.patch.disabled @@ -0,0 +1,25 @@ +Don't generate RPATH if we're going to be generating RUNPATH. + +need to ponder what ramifications this has before enabling it + +--- binutils/bfd/elflink.c ++++ binutils/bfd/elflink.c +@@ -5382,11 +5382,15 @@ + + indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath, + TRUE); +- if (indx == (bfd_size_type) -1 +- || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx)) ++ if (indx == (bfd_size_type) -1) + return FALSE; + +- if (info->new_dtags) ++ if (!info->new_dtags) ++ { ++ if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx)) ++ return FALSE; ++ } ++ else + { + _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx); + if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx)) |