* layout.cc (Layout::special_ordering_of_input_section): New

	function.
	(Layout::layout): If input section requires special ordering, must
	sort input sections.
	(Layout::make_output_section): May sort .text input sections.
	(Layout::is_section_name_prefix_grouped): Remove.
	* layout.h (class Layout): Declare
	special_ordering_of_input_section.  Don't declare
	is_section_name_prefix_grouped.
	* output.cc (Output_section::add_input_section): Revert last
	change.
	(Output_section::Input_section_sort::match_file_name): Don't crash
	if called on output section data.
	(Output_section::Input_section_sort_compare): Sort based on
	special ordering.
	(Output_section::Input_section_sort_section_order_index_compare):
	Revert last patch.
	(Output_section::sort_attached_input_sections): Likewise.

1 files changed, 25 insertions, 73 deletions

diff --git a/gold/output.cc b/gold/output.cc
index 39eb1b7dc7..f2321b77fc 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -2478,19 +2478,6 @@ Output_section::add_input_section(Layout* layout,
         }
     }
 
-  // The GNU linker groups input sections whose names match .text.unlikely.*.
-  // This is used to get better code layout.  We are compatible.
-  // Additionally, it could also be beneficial to group .text.hot.*,
-  // .text.startup.* prefixed input sections.  Function
-  // "is_section_name_prefix_grouped" in layout.cc determines the input
-  // section prefixes that must be grouped.
-  if (!have_sections_script
-      && !parameters->options().relocatable()
-      && !this->input_section_order_specified()
-      && !this->must_sort_attached_input_sections()
-      && layout->is_section_name_prefix_grouped(secname))
-    this->set_input_section_order_specified();
-
   // We need to keep track of this section if we are already keeping
   // track of sections, or if we are relaxing.  Also, if this is a
   // section which requires sorting, or which may require sorting in
@@ -2504,8 +2491,7 @@ Output_section::add_input_section(Layout* layout,
       || this->must_sort_attached_input_sections()
       || parameters->options().user_set_Map()
       || parameters->target().may_relax()
-      || layout->is_section_ordering_specified()
-      || this->input_section_order_specified())
+      || layout->is_section_ordering_specified())
     {
       Input_section isecn(object, shndx, input_section_size, addralign);
       /* If section ordering is requested by specifying a ordering file,
@@ -3337,7 +3323,11 @@ class Output_section::Input_section_sort_entry
   // in order to better support gcc, and we need to be compatible.
   bool
   match_file_name(const char* file_name) const
-  { return Layout::match_file_name(this->input_section_.relobj(), file_name); }
+  {
+    if (this->input_section_.is_output_section_data())
+      return false;
+    return Layout::match_file_name(this->input_section_.relobj(), file_name);
+  }
 
   // Returns 1 if THIS should appear before S in section order, -1 if S
   // appears before THIS and 0 if they are not comparable.
@@ -3409,6 +3399,19 @@ Output_section::Input_section_sort_compare::operator()(
       return s1.index() < s2.index();
     }
 
+  // Some input section names have special ordering requirements.
+  int o1 = Layout::special_ordering_of_input_section(s1.section_name().c_str());
+  int o2 = Layout::special_ordering_of_input_section(s2.section_name().c_str());
+  if (o1 != o2)
+    {
+      if (o1 < 0)
+	return false;
+      else if (o2 < 0)
+	return true;
+      else
+	return o1 < o2;
+    }
+
   // A section with a priority follows a section without a priority.
   bool s1_has_priority = s1.has_priority();
   bool s2_has_priority = s2.has_priority();
@@ -3498,9 +3501,7 @@ Output_section::Input_section_sort_init_fini_compare::operator()(
 
 // Return true if S1 should come before S2.  Sections that do not match
 // any pattern in the section ordering file are placed ahead of the sections
-// that match some pattern.  This function is also used to group text according
-// to their prefix.  The following prefixes are recognized: ".text.startup",
-// ".text.hot", and ".text.unlikely".
+// that match some pattern.
 
 bool
 Output_section::Input_section_sort_section_order_index_compare::operator()(
@@ -3510,59 +3511,11 @@ Output_section::Input_section_sort_section_order_index_compare::operator()(
   unsigned int s1_secn_index = s1.input_section().section_order_index();
   unsigned int s2_secn_index = s2.input_section().section_order_index();
 
-  // If section ordering is specified, it takes precedence.
-  if (s1_secn_index != s2_secn_index)
-    return s1_secn_index < s2_secn_index;
-
-  // Sort all the sections with no names to the end.
-  if (!s1.section_has_name() || !s2.section_has_name())
-    {
-      if (s1.section_has_name())
-	return true;
-      if (s2.section_has_name())
-	return false;
-      return s1.index() < s2.index();
-    }
-
-  // If it is a text section use the following order:
-  // .text.unlikely, .text.startup, .text.hot. The prefixes
-  // must match those in function is_section_name_prefix_grouped
-  // in layout.cc
-  const char* section_prefix [] = 
-  {
-    ".text.unlikely",
-    ".text.startup",
-    ".text.hot"
-  };
-
-  const unsigned int num_prefixes
-    = sizeof(section_prefix) / sizeof(const char*);
-
-  unsigned int s1_group_index = num_prefixes;
-  unsigned int s2_group_index = num_prefixes;
-
-  unsigned int flag_done = 0;
-  for (unsigned int i = 0; i < num_prefixes && flag_done < 2; i++)
-    {
-      if (s1_group_index == num_prefixes
-	  && is_prefix_of(section_prefix[i], s1.section_name().c_str()))
-	{
-          s1_group_index = i;
-	  flag_done++;
-	}
-
-      if (s2_group_index == num_prefixes
-	  && is_prefix_of(section_prefix[i], s2.section_name().c_str()))
-	{
-          s2_group_index = i;
-	  flag_done++;
-	}
-    }
-
-  if (s1_group_index == s2_group_index)
+  // Keep input order if section ordering cannot determine order.
+  if (s1_secn_index == s2_secn_index)
     return s1.index() < s2.index();
-  else
-    return s1_group_index < s2_group_index;
+
+  return s1_secn_index < s2_secn_index;
 }
 
 // This updates the section order index of input sections according to the
@@ -3623,8 +3576,7 @@ Output_section::sort_attached_input_sections()
        p != this->input_sections_.end();
        ++p, ++i)
       sort_list.push_back(Input_section_sort_entry(*p, i,
-                            (this->must_sort_attached_input_sections()
-			     || this->input_section_order_specified())));
+                            this->must_sort_attached_input_sections()));
 
   // Sort the input sections.
   if (this->must_sort_attached_input_sections())