diff options
| author |   guenther <guenther@openbsd.org> | 2015-11-12 21:10:14 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2015-11-12 21:10:14 +0000 |
| commit | 1c39d0de478ccc0b9f75c4d94a7dfa6625c21df9 (patch) | |
| tree | 811dd03db0682cd822f8453f84726baea548e07b | |
| parent | Remove repeat of getpwnam() that is not needed at all. (diff) | |
| download | wireguard-openbsd-1c39d0de478ccc0b9f75c4d94a7dfa6625c21df9.tar.xz wireguard-openbsd-1c39d0de478ccc0b9f75c4d94a7dfa6625c21df9.zip | |
With --enable-new-dtags, only generate DT_RUNPATH and no DT_RPATH
ok kettenis@
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/bfd/elflink.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gnu/usr.bin/binutils-2.17/bfd/elflink.c b/gnu/usr.bin/binutils-2.17/bfd/elflink.c index 75fff26a14b..6f679366b7c 100644 --- a/gnu/usr.bin/binutils-2.17/bfd/elflink.c +++ b/gnu/usr.bin/binutils-2.17/bfd/elflink.c @@ -5073,15 +5073,9 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, 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)) + || !_bfd_elf_add_dynamic_entry (info, info->new_dtags ? + DT_RUNPATH : DT_RPATH, indx)) return FALSE; - - if (info->new_dtags) - { - _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx); - if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx)) - return FALSE; - } } if (filter_shlib != NULL) |