diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 9 | ||||
| -rw-r--r-- | ld/ldelf.c | 19 | ||||
| -rw-r--r-- | ld/testsuite/ld-cris/gotplt1.d | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 9bc9bd6..3cb0cf8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2020-02-26 Alan Modra <amodra@gmail.com> + + PR 25593 + * ldelf.c (ldelf_try_needed): Add DT_NEEDED lib to input_bfds. + (ldelf_after_open): Save state of input_bfds list before loading + DT_NEEDED libs. Traverse input_bfds list adding DT_NEEDED tags. + Restore input_bfds list. + * testsuite/ld-cris/gotplt1.d: Adjust for changed .dynstr order. + 2020-02-24 Nick Clifton <nickc@redhat.com> * po/fr.po: Update French translation. @@ -375,6 +375,9 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux) bfd_elf_set_dyn_lib_class (abfd, (enum dynamic_lib_link_class) link_class); + *link_info.input_bfds_tail = abfd; + link_info.input_bfds_tail = &abfd->link.next; + /* Add this file into the symbol table. */ if (! bfd_link_add_symbols (abfd, &link_info)) einfo (_("%F%P: %pB: error adding symbols: %E\n"), abfd); @@ -992,6 +995,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, struct elf_link_hash_table *htab; asection *s; bfd *abfd; + bfd **save_input_bfd_tail; after_open_default (); @@ -1134,6 +1138,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, special action by the person doing the link. Note that the needed list can actually grow while we are stepping through this loop. */ + save_input_bfd_tail = link_info.input_bfds_tail; needed = bfd_elf_get_needed_list (link_info.output_bfd, &link_info); for (l = needed; l != NULL; l = l->next) { @@ -1290,6 +1295,20 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, l->name, l->by); } + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_format (abfd) == bfd_object + && ((abfd->flags) & DYNAMIC) != 0 + && bfd_get_flavour (abfd) == bfd_target_elf_flavour + && (elf_dyn_lib_class (abfd) & (DYN_AS_NEEDED | DYN_NO_NEEDED)) == 0 + && elf_dt_name (abfd) != NULL) + { + if (bfd_elf_add_dt_needed_tag (abfd, &link_info) < 0) + einfo (_("%F%P: failed to add DT_NEEDED dynamic tag\n")); + } + + link_info.input_bfds_tail = save_input_bfd_tail; + *save_input_bfd_tail = NULL; + if (link_info.eh_frame_hdr_type == COMPACT_EH_HDR) if (!bfd_elf_parse_eh_frame_entries (NULL, &link_info)) einfo (_("%F%P: failed to parse EH frame entries\n")); diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d index 28724d7..defba8a 100644 --- a/ld/testsuite/ld-cris/gotplt1.d +++ b/ld/testsuite/ld-cris/gotplt1.d @@ -34,7 +34,7 @@ Contents of section \.text: 80178 6f0d1000 0000611a 6f2e5401 08000000 .* 80188 6f3e70df ffff0000 .* Contents of section \.dynamic: - 82190 01000000 01000000 04000000 e4000800 .* + 82190 01000000 07000000 04000000 e4000800 .* 821a0 05000000 18010800 06000000 f8000800 .* 821b0 0a000000 1a000000 0b000000 10000000 .* 821c0 15000000 00000000 03000000 18220800 .* |