aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2011-03-14 15:22:16 +0000
committerIan Lance Taylor <ian@airs.com>2011-03-14 15:22:16 +0000
commitfd7a005d9d5ed10fbc5094a1e19684141bf9d569 (patch)
tree276bc218f1ffaf10299da7174fc02503219b6b30
parent20453c56b18278007e1a1113d65a252c97e2e128 (diff)
downloadgdb-fd7a005d9d5ed10fbc5094a1e19684141bf9d569.zip
gdb-fd7a005d9d5ed10fbc5094a1e19684141bf9d569.tar.gz
gdb-fd7a005d9d5ed10fbc5094a1e19684141bf9d569.tar.bz2
* script-sections.cc (Sort_output_sections::script_compare):
Rename from is_before, change return type. (Sort_output_sections::operator()): Adjust accordingly.
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/script-sections.cc52
2 files changed, 39 insertions, 19 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 986f16e..ed3dc6c 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-14 Ian Lance Taylor <iant@google.com>
+
+ * script-sections.cc (Sort_output_sections::script_compare):
+ Rename from is_before, change return type.
+ (Sort_output_sections::operator()): Adjust accordingly.
+
2011-03-11 Jeffrey Yasskin <jyasskin@google.com>
PR gold/12572
diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index bdbd811..10af8e1 100644
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -3561,8 +3561,8 @@ class Sort_output_sections
operator()(const Output_section* os1, const Output_section* os2) const;
private:
- bool
- is_before(const Output_section* os1, const Output_section* os2) const;
+ int
+ script_compare(const Output_section* os1, const Output_section* os2) const;
private:
const Script_sections::Sections_elements* elements_;
@@ -3586,6 +3586,12 @@ Sort_output_sections::operator()(const Output_section* os1,
if (os1->address() != os2->address())
return os1->address() < os2->address();
+ // If the linker script says which of these sections is first, go
+ // with what it says.
+ int i = this->script_compare(os1, os2);
+ if (i != 0)
+ return i < 0;
+
// Sort PROGBITS before NOBITS.
bool nobits1 = os1->type() == elfcpp::SHT_NOBITS;
bool nobits2 = os2->type() == elfcpp::SHT_NOBITS;
@@ -3604,38 +3610,46 @@ Sort_output_sections::operator()(const Output_section* os1,
return true;
if (!os1->is_noload() && os2->is_noload())
return true;
-
- // The sections have the same address. Check the section positions
- // in accordance with the linker script.
- return this->is_before(os1, os2);
+
+ // The sections seem practically identical. Sort by name to get a
+ // stable sort.
+ return os1->name() < os2->name();
}
-// Return true if OS1 comes before OS2 in ELEMENTS_. This ensures
-// that we keep empty sections in the order in which they appear in a
-// linker script.
+// Return -1 if OS1 comes before OS2 in ELEMENTS_, 1 if comes after, 0
+// if either OS1 or OS2 is not mentioned. This ensures that we keep
+// empty sections in the order in which they appear in a linker
+// script.
-bool
-Sort_output_sections::is_before(const Output_section* os1,
- const Output_section* os2) const
+int
+Sort_output_sections::script_compare(const Output_section* os1,
+ const Output_section* os2) const
{
if (this->elements_ == NULL)
- return false;
+ return 0;
+ bool found_os1 = false;
+ bool found_os2 = false;
for (Script_sections::Sections_elements::const_iterator
p = this->elements_->begin();
p != this->elements_->end();
++p)
{
- if (os1 == (*p)->get_output_section())
+ if (os2 == (*p)->get_output_section())
{
- for (++p; p != this->elements_->end(); ++p)
- if (os2 == (*p)->get_output_section())
- return true;
- break;
+ if (found_os1)
+ return -1;
+ found_os2 = true;
+ }
+ else if (os1 == (*p)->get_output_section())
+ {
+ if (found_os2)
+ return 1;
+ found_os1 = true;
}
}
- return false;
+ return 0;
}
// Return whether OS is a BSS section. This is a SHT_NOBITS section.