aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSriraman Tallam <tmsriram@google.com>2011-02-12 03:19:24 +0000
committerSriraman Tallam <tmsriram@google.com>2011-02-12 03:19:24 +0000
commit4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc (patch)
treecb44316cc8ef294e0095aeed7148bd92671940f7
parentd40a55942b7bc8f716de2895010fb60adb44a8c3 (diff)
downloadgdb-4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc.zip
gdb-4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc.tar.gz
gdb-4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc.tar.bz2
2011-02-11 Sriraman Tallam <tmsriram@google.com>
* output.cc (Output_section::add_input_section): Delay fill generation for section ordering.
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/output.cc6
2 files changed, 9 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0313619..6bdc568 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11 Sriraman Tallam <tmsriram@google.com>
+
+ * output.cc (Output_section::add_input_section): Delay fill
+ generation for section ordering.
+
2011-02-09 Ian Lance Taylor <iant@google.com>
PR gold/12316
diff --git a/gold/output.cc b/gold/output.cc
index 1158a77..739e00e 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;