From 4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc Mon Sep 17 00:00:00 2001 From: Sriraman Tallam Date: Sat, 12 Feb 2011 03:19:24 +0000 Subject: [PATCH] 2011-02-11 Sriraman Tallam * output.cc (Output_section::add_input_section): Delay fill generation for section ordering. --- gold/ChangeLog | 5 +++++ gold/output.cc | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 0313619bcf7..6bdc568fbcc 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2011-02-11 Sriraman Tallam + + * output.cc (Output_section::add_input_section): Delay fill + generation for section ordering. + 2011-02-09 Ian Lance Taylor PR gold/12316 diff --git a/gold/output.cc b/gold/output.cc index 1158a77661c..739e00eac19 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -2111,12 +2111,14 @@ Output_section::add_input_section(Layout* layout, // Determine if we want to delay code-fill generation until the output // section is written. When the target is relaxing, we want to delay fill - // generating to avoid adjusting them during relaxation. + // generating to avoid adjusting them during relaxation. Also, if we are + // sorting input sections we must delay fill generation. if (!this->generate_code_fills_at_write_ && !have_sections_script && (sh_flags & elfcpp::SHF_EXECINSTR) != 0 && parameters->target().has_code_fill() - && parameters->target().may_relax()) + && (parameters->target().may_relax() + || parameters->options().section_ordering_file())) { gold_assert(this->fills_.empty()); this->generate_code_fills_at_write_ = true; -- 2.30.2