diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-09-20 04:58:55 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-09-20 04:58:55 +0000 |
| commit | 08f37e4536a319cf1624da42ad30bac34bbf9dea (patch) | |
| tree | 4372dae5559d13d3c411b479b57416e388fd8005 /ld/ldlang.c | |
| parent | 05cf284e625379f5656f95e2e9cde619d40dda23 (diff) | |
| download | binutils-redhat-08f37e4536a319cf1624da42ad30bac34bbf9dea.tar.gz | |
PR ld/12301
* ldlang.h (lang_input_statement_type): Add "reload" bitfield.
Clarify comments.
* ldlang.c (new_afile): Init new field.
(load_symbols): Don't call ldlang_add_file when reloading.
(open_input_bfds): Reload as-needed libs during plugin rescan.
Diffstat (limited to 'ld/ldlang.c')
| -rw-r--r-- | ld/ldlang.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index 7251a86b88..ae541558ec 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1133,6 +1133,7 @@ new_afile (const char *name, #ifdef ENABLE_PLUGINS p->claimed = FALSE; p->claim_archive = FALSE; + p->reload = FALSE; #endif /* ENABLE_PLUGINS */ lang_statement_append (&input_file_chain, @@ -2780,7 +2781,10 @@ load_symbols (lang_input_statement_type *entry, break; case bfd_object: - ldlang_add_file (entry); +#ifdef ENABLE_PLUGINS + if (!entry->reload) +#endif + ldlang_add_file (entry); if (trace_files || trace_file_tries) info_msg ("%I\n", entry); break; @@ -3272,6 +3276,18 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode) && bfd_check_format (s->input_statement.the_bfd, bfd_archive)) s->input_statement.loaded = FALSE; +#ifdef ENABLE_PLUGINS + /* When rescanning, reload --as-needed shared libs. */ + else if ((mode & OPEN_BFD_RESCAN) != 0 + && plugin_insert == NULL + && s->input_statement.loaded + && s->input_statement.add_DT_NEEDED_for_regular + && ((s->input_statement.the_bfd->flags) & DYNAMIC) != 0) + { + s->input_statement.loaded = FALSE; + s->input_statement.reload = TRUE; + } +#endif os_tail = lang_output_section_statement.tail; lang_list_init (&add); |