diff --git a/ld/ChangeLog b/ld/ChangeLog index 7789ed66d8..12d643be02 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2005-06-04 H.J. Lu + + PR 992 + * ldexp.c (exp_mark_used_section): Set SEC_KEEP on current + section for etree_assign, etree_provide and etree_provided. + Call fold_binary on etree_binary. + + * ldlang.c (lang_mark_used_section_1): Handle load base. + 2005-06-03 Alan Modra * ldmain.c (link_callbacks): Add einfo. diff --git a/ld/ldexp.c b/ld/ldexp.c index 1790e8c2a3..7d63c8d9ac 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -1217,6 +1217,8 @@ align_n (bfd_vma value, bfd_vma align) void exp_mark_used_section (etree_type *tree, asection *current_section) { + bfd_vma dot = 0; + switch (tree->type.node_class) { case etree_value: @@ -1232,6 +1234,8 @@ exp_mark_used_section (etree_type *tree, asection *current_section) break; case etree_binary: + fold_binary (tree, current_section, lang_allocating_phase_enum, + dot, &dot, TRUE); break; case etree_trinary: @@ -1243,12 +1247,13 @@ exp_mark_used_section (etree_type *tree, asection *current_section) if (tree->assign.dst[0] != '.' || tree->assign.dst[1] != 0) { etree_value_type result; - bfd_vma dot = 0; result = exp_fold_tree_1 (tree->assign.src, current_section, lang_allocating_phase_enum, dot, &dot, TRUE); + if (current_section != bfd_abs_section_ptr) + current_section->flags |= SEC_KEEP; if (result.valid_p) { bfd_boolean create; diff --git a/ld/ldlang.c b/ld/ldlang.c index b4f767d6e8..973ed4105a 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3065,7 +3065,12 @@ lang_mark_used_section_1 os = &(s->output_section_statement); if (os->bfd_section != NULL) - lang_mark_used_section_1 (os->children.head, os); + { + lang_mark_used_section_1 (os->children.head, os); + if (os->load_base) + exp_mark_used_section (os->load_base, + bfd_abs_section_ptr); + } } break; case lang_wild_statement_enum: