diff options
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r-- | ld/ldlang.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index fc20ecb820b..2d792f88c72 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1056,8 +1056,8 @@ new_afile (const char *name, p->next_real_file = NULL; p->next = NULL; p->dynamic = config.dynamic_link; - p->add_needed = add_needed; - p->as_needed = as_needed; + p->add_DT_NEEDED_for_dynamic = add_DT_NEEDED_for_dynamic; + p->add_DT_NEEDED_for_regular = add_DT_NEEDED_for_regular; p->whole_archive = whole_archive; p->loaded = FALSE; lang_statement_append (&input_file_chain, @@ -2592,7 +2592,9 @@ load_symbols (lang_input_statement_type *entry, { bfd_error_type err; bfd_boolean save_ldlang_sysrooted_script; - bfd_boolean save_as_needed, save_add_needed, save_whole_archive; + bfd_boolean save_add_DT_NEEDED_for_regular; + bfd_boolean save_add_DT_NEEDED_for_dynamic; + bfd_boolean save_whole_archive; err = bfd_get_error (); @@ -2623,10 +2625,10 @@ load_symbols (lang_input_statement_type *entry, push_stat_ptr (place); save_ldlang_sysrooted_script = ldlang_sysrooted_script; ldlang_sysrooted_script = entry->sysrooted; - save_as_needed = as_needed; - as_needed = entry->as_needed; - save_add_needed = add_needed; - add_needed = entry->add_needed; + save_add_DT_NEEDED_for_regular = add_DT_NEEDED_for_regular; + add_DT_NEEDED_for_regular = entry->add_DT_NEEDED_for_regular; + save_add_DT_NEEDED_for_dynamic = add_DT_NEEDED_for_dynamic; + add_DT_NEEDED_for_dynamic = entry->add_DT_NEEDED_for_dynamic; save_whole_archive = whole_archive; whole_archive = entry->whole_archive; @@ -2639,8 +2641,8 @@ load_symbols (lang_input_statement_type *entry, ldfile_assumed_script = FALSE; ldlang_sysrooted_script = save_ldlang_sysrooted_script; - as_needed = save_as_needed; - add_needed = save_add_needed; + add_DT_NEEDED_for_regular = save_add_DT_NEEDED_for_regular; + add_DT_NEEDED_for_dynamic = save_add_DT_NEEDED_for_dynamic; whole_archive = save_whole_archive; pop_stat_ptr (); |