diff options
author | Alan Modra <amodra@bigpond.net.au> | 2011-05-03 14:56:14 +0000 |
---|---|---|
committer | Alan Modra <amodra@bigpond.net.au> | 2011-05-03 14:56:14 +0000 |
commit | 7271ea650c369704e736a0902869479e5a536618 (patch) | |
tree | 2a22a2e1cc50b7977ee2577055f638c2cd0207ca /ld/ldlang.c | |
parent | ee97f9909cd2e60e8edcb8b14710dfe05890f23e (diff) | |
download | binutils-redhat-7271ea650c369704e736a0902869479e5a536618.tar.gz |
PR ld/12726
* ldexp.h (lang_phase_type): Add lang_assigning_phase_enum.
* ldexp.c (exp_fold_tree_1): Correct assign to dot comment. Don't
assign to dot when lang_assigning_phase_enum.
* ldlang.h (lang_do_assignments): Update prototype.
* ldlang.c (lang_do_assignments): Add phase parameter. Update all
callers.
* pe-dll.c (pe_dll_fill_sections, pe_exe_fill_sections): Update
lang_do_assignments calls.
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r-- | ld/ldlang.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index 2c07fa4d35..c291fd9347 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -5606,8 +5606,9 @@ lang_do_assignments_1 (lang_statement_union_type *s, } void -lang_do_assignments (void) +lang_do_assignments (lang_phase_type phase) { + expld.phase = phase; lang_statement_iteration++; lang_do_assignments_1 (statement_list.head, abs_output_section, NULL, 0); } @@ -6403,7 +6404,7 @@ lang_relax_sections (bfd_boolean need_layout) /* Do all the assignments with our current guesses as to section sizes. */ - lang_do_assignments (); + lang_do_assignments (lang_assigning_phase_enum); /* We must do this after lang_do_assignments, because it uses size. */ @@ -6424,7 +6425,7 @@ lang_relax_sections (bfd_boolean need_layout) if (need_layout) { /* Final extra sizing to report errors. */ - lang_do_assignments (); + lang_do_assignments (lang_assigning_phase_enum); lang_reset_memory_regions (); lang_size_sections (NULL, TRUE); } @@ -6666,8 +6667,7 @@ lang_process (void) /* Do all the assignments, now that we know the final resting places of all the symbols. */ - expld.phase = lang_final_phase_enum; - lang_do_assignments (); + lang_do_assignments (lang_final_phase_enum); ldemul_finish (); |