Index: layout.cc
===================================================================
RCS file: /cvs/src/src/gold/layout.cc,v
retrieving revision 1.245
diff -u -p -r1.245 layout.cc
--- layout.cc	24 Jan 2013 18:49:54 -0000	1.245
+++ layout.cc	12 Feb 2013 19:06:53 -0000
@@ -1654,6 +1654,10 @@ Layout::make_output_section(const char* 
       && strcmp(name, ".text") == 0)
     os->set_may_sort_attached_input_sections();
 
+  // GNU linker sorts section by name with --sort-section=name.
+  if (strcmp(parameters->options().sort_section(), "name") == 0)
+      os->set_must_sort_attached_input_sections();
+
   // Check for .stab*str sections, as .stab* sections need to link to
   // them.
   if (type == elfcpp::SHT_STRTAB
Index: options.h
===================================================================
RCS file: /cvs/src/src/gold/options.h,v
retrieving revision 1.183
diff -u -p -r1.183 options.h
--- options.h	24 Jan 2013 18:49:54 -0000	1.183
+++ options.h	12 Feb 2013 19:06:53 -0000
@@ -1016,6 +1016,12 @@ class General_options
 			 N_("Sort common symbols by alignment"),
 			 N_("[={ascending,descending}]"));
 
+  DEFINE_enum(sort_section, options::TWO_DASHES, '\0', "none",
+	      N_("Sort sections by name.  \'--no-text-reorder\'"
+		 " will override \'--sort-section=name\' for .text"),
+	      N_("[none,name]"),
+	      {"none", "name"});
+
   DEFINE_uint(spare_dynamic_tags, options::TWO_DASHES, '\0', 5,
 	      N_("Dynamic tag slots to reserve (default 5)"),
 	      N_("COUNT"));
Index: output.cc
===================================================================
RCS file: /cvs/src/src/gold/output.cc,v
retrieving revision 1.181
diff -u -p -r1.181 output.cc
--- output.cc	24 Jan 2013 18:49:54 -0000	1.181
+++ output.cc	12 Feb 2013 19:06:53 -0000
@@ -3498,8 +3498,9 @@ Output_section::Input_section_sort_secti
 // Return true if S1 should come before S2.  This is the sort comparison
 // function for .text to sort sections with prefixes
 // .text.{unlikely,exit,startup,hot} before other sections.
+
 bool
-Output_section::Input_section_sort_section_name_special_ordering_compare
+Output_section::Input_section_sort_section_prefix_special_ordering_compare
   ::operator()(
     const Output_section::Input_section_sort_entry& s1,
     const Output_section::Input_section_sort_entry& s2) const
@@ -3513,7 +3514,7 @@ Output_section::Input_section_sort_secti
 	return false;
       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());
@@ -3528,7 +3529,35 @@ Output_section::Input_section_sort_secti
     }
 
   // Keep input order otherwise.
-  return s1.index() < s2.index();  
+  return s1.index() < s2.index();
+}
+
+// Return true if S1 should come before S2.  This is the sort comparison
+// function for sections to sort them by name.
+
+bool
+Output_section::Input_section_sort_section_name_compare
+  ::operator()(
+    const Output_section::Input_section_sort_entry& s1,
+    const Output_section::Input_section_sort_entry& s2) const
+{
+  // We 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();
+    }
+
+  // We sort by name.
+  int compare = s1.section_name().compare(s2.section_name());
+  if (compare != 0)
+    return compare < 0;
+
+  // Keep input order otherwise.
+  return s1.index() < s2.index();
 }
 
 // This updates the section order index of input sections according to the
@@ -3599,9 +3628,12 @@ Output_section::sort_attached_input_sect
           || this->type() == elfcpp::SHT_FINI_ARRAY)
         std::sort(sort_list.begin(), sort_list.end(),
 	          Input_section_sort_init_fini_compare());
+      else if (strcmp(parameters->options().sort_section(), "name") == 0)
+	std::sort(sort_list.begin(), sort_list.end(),
+		  Input_section_sort_section_name_compare());
       else if (strcmp(this->name(), ".text") == 0)
-        std::sort(sort_list.begin(), sort_list.end(),
-	          Input_section_sort_section_name_special_ordering_compare());
+	std::sort(sort_list.begin(), sort_list.end(),
+		  Input_section_sort_section_prefix_special_ordering_compare());
       else
         std::sort(sort_list.begin(), sort_list.end(),
 	          Input_section_sort_compare());
Index: output.h
===================================================================
RCS file: /cvs/src/src/gold/output.h,v
retrieving revision 1.146
diff -u -p -r1.146 output.h
--- output.h	24 Jan 2013 18:49:54 -0000	1.146
+++ output.h	12 Feb 2013 19:06:53 -0000
@@ -4202,7 +4202,15 @@ class Output_section : public Output_dat
 
   // This is the sort comparison function for .text to sort sections with
   // prefixes .text.{unlikely,exit,startup,hot} before other sections.
-  struct Input_section_sort_section_name_special_ordering_compare
+  struct Input_section_sort_section_prefix_special_ordering_compare
+  {
+    bool
+    operator()(const Input_section_sort_entry&,
+	       const Input_section_sort_entry&) const;
+  };
+
+  // This is the sort comparison function for sorting sections by name.
+  struct Input_section_sort_section_name_compare
   {
     bool
     operator()(const Input_section_sort_entry&,
cvs diff: Diffing po
cvs diff: Diffing testsuite
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/src/src/gold/testsuite/Makefile.am,v
retrieving revision 1.207
diff -u -p -r1.207 Makefile.am
--- testsuite/Makefile.am	24 Jan 2013 18:49:54 -0000	1.207
+++ testsuite/Makefile.am	12 Feb 2013 19:06:53 -0000
@@ -272,6 +272,16 @@ text_section_grouping.stdout: text_secti
 text_section_no_grouping.stdout: text_section_no_grouping
 	$(TEST_NM) -n --synthetic text_section_no_grouping > text_section_no_grouping.stdout 
 
+check_SCRIPTS += section_sorting_name.sh
+check_DATA += section_sorting_name.stdout
+MOSTLYCLEANFILES += section_sorting_name
+section_sorting_name.o: section_sorting_name.cc
+	$(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
+section_sorting_name: section_sorting_name.o gcctestdir/ld
+	$(CXXLINK)  -Bgcctestdir/ -Wl,--sort-section=name section_sorting_name.o
+section_sorting_name.stdout: section_sorting_name
+	$(TEST_NM) -n --synthetic section_sorting_name > section_sorting_name.stdout
+
 check_PROGRAMS += icf_virtual_function_folding_test
 MOSTLYCLEANFILES += icf_virtual_function_folding_test icf_virtual_function_folding_test.map
 icf_virtual_function_folding_test.o: icf_virtual_function_folding_test.cc
Index: testsuite/Makefile.in
===================================================================
RCS file: /cvs/src/src/gold/testsuite/Makefile.in,v
retrieving revision 1.219
diff -u -p -r1.219 Makefile.in
--- testsuite/Makefile.in	24 Jan 2013 18:49:55 -0000	1.219
+++ testsuite/Makefile.in	12 Feb 2013 19:06:53 -0000
@@ -82,6 +82,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_safe_so_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	final_layout.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	text_section_grouping.sh \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	section_sorting_name.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_preemptible_functions_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_string_merge_test.sh \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_sht_rel_addend_test.sh \
@@ -114,6 +115,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	final_layout.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	text_section_grouping.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	text_section_no_grouping.stdout \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	section_sorting_name.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_preemptible_functions_test.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_string_merge_test.stdout \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_sht_rel_addend_test.stdout \
@@ -130,6 +132,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	final_layout_script.lds \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	text_section_grouping \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	text_section_no_grouping \
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	section_sorting_name \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_virtual_function_folding_test \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_virtual_function_folding_test.map \
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	icf_preemptible_functions_test \
@@ -3725,6 +3728,8 @@ final_layout.sh.log: final_layout.sh
 	@p='final_layout.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 text_section_grouping.sh.log: text_section_grouping.sh
 	@p='text_section_grouping.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+section_sorting_name.sh.log: section_sorting_name.sh
+	@p='section_sorting_name.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 icf_preemptible_functions_test.sh.log: icf_preemptible_functions_test.sh
 	@p='icf_preemptible_functions_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 icf_string_merge_test.sh.log: icf_string_merge_test.sh
@@ -4384,6 +4389,12 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_NM) -n --synthetic text_section_grouping > text_section_grouping.stdout
 @GCC_TRUE@@NATIVE_LINKER_TRUE@text_section_no_grouping.stdout: text_section_no_grouping
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_NM) -n --synthetic text_section_no_grouping > text_section_no_grouping.stdout 
+@GCC_TRUE@@NATIVE_LINKER_TRUE@section_sorting_name.o: section_sorting_name.cc
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -O0 -c -ffunction-sections -g -o $@ $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@section_sorting_name: section_sorting_name.o gcctestdir/ld
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK)  -Bgcctestdir/ -Wl,--sort-section=name section_sorting_name.o
+@GCC_TRUE@@NATIVE_LINKER_TRUE@section_sorting_name.stdout: section_sorting_name
+@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_NM) -n --synthetic section_sorting_name > section_sorting_name.stdout
 @GCC_TRUE@@NATIVE_LINKER_TRUE@icf_virtual_function_folding_test.o: icf_virtual_function_folding_test.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -O0 -c -ffunction-sections -fPIE -g -o $@ $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@icf_virtual_function_folding_test: icf_virtual_function_folding_test.o gcctestdir/ld