Fix problems with bss handling in linker scripts.

PR 16711 noted that gold allocates file space for BSS sections when using
a linker script. I've fixed that by rewriting set_section_addresses and
set_section_list_addresses to track the file offset separate from the
current virtual address, so that BSS sections do not move the file offset.
Now, if a series of BSS sections come at the end of a segment, we do not
allocate file space; but if a script forces them into the middle of a
segment, we will still allocate file space (matching Gnu ld behavior).
I've also added a warning when that happens.

That exposed another problem where orphan .bss sections were sometimes
placed in the middle of a segment. For example, if the script mentions
the .got section, but both .data and .bss are orphans, gold would put
both .data and .bss in front of .got. I've fixed that by ensuring that
orphan BSS sections are always placed after all other allocated sections.

It also exposed a problem where the SUBALIGN property is not handled
properly. The ld manual clearly states that it should override input section
alignment, whether greater or less than the given alignment, but gold would
only increase an input section's alignment. Gold would also place the output
section based on its original alignment before the SUBALIGN property took
effect, leading to a misaligned output section (where the input section
was properly aligned in memory, but was not aligned relative to the start
of the section), in violation of the ELF/gABI spec. I've fixed that by
making sure that the SUBALIGN property overrides the internal alignment of
the input sections as well as the external alignment of the output section.
This affected the behavior of script_test_2, which was written to expect
a misaligned section.

The net effect is, I think, improved compatibility with the BFD linker.
There are still cases where orphan placement differs, but the differences
should be rarer and less important. ALIGN and SUBALIGN behavior is closer,
but still not an exact match -- I still found cases where ld would create
a misaligned output section, and where gold will properly align it.

gold/
	PR gold/16711
	* output.cc (Output_section::set_final_data_size): Calculate data size
	based on relative offset rather than file offset.
	(Output_segment::set_section_addresses): Track file offset separately
	from address offset.
	(Output_segment::set_section_list_addresses): Add pfoff parameter.
	Track file offset separately.  Don't move file offset for BSS
	sections.
	* output.h (Output_segment::set_section_list_addresses): Add pfoff
	parameter.
	* script-sections.cc (Orphan_section_placement): Add PLACE_LAST_ALLOC.
	(Orphan_section_placement::Orphan_section_placement): Initialize it.
	(Orphan_section_placement::output_section_init): Track last allocated
	section.
	(Orphan_section_placement::find_place): Place BSS after last allocated
	section.
	(Output_section_element_input::set_section_addresses): Always override
	input section alignment when SUBALIGN is specified.
	(Output_section_definition::set_section_addresses): Override alignment
	of output section when SUBALIGN is specified.

	* testsuite/Makefile.am (script_test_15a, script_test_15b)
	(script_test_15c): New test cases.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/script_test_2.cc: Adjust expected layout.
	* testsuite/script_test_15.c: New source file.
	* testsuite/script_test_15a.sh: New shell script.
	* testsuite/script_test_15a.t: New linker script.
	* testsuite/script_test_15b.sh: New shell script.
	* testsuite/script_test_15b.t: New linker script.
	* testsuite/script_test_15c.sh: New shell script.
	* testsuite/script_test_15c.t: New linker script.

1 files changed, 45 insertions, 20 deletions

diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index f35ecc1..ae81f89 100644
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -329,6 +329,7 @@ class Orphan_section_placement
     PLACE_TLS,
     PLACE_TLS_BSS,
     PLACE_BSS,
+    PLACE_LAST_ALLOC,
     PLACE_REL,
     PLACE_INTERP,
     PLACE_NONALLOC,
@@ -368,6 +369,7 @@ Orphan_section_placement::Orphan_section_placement()
   this->initialize_place(PLACE_TLS, NULL);
   this->initialize_place(PLACE_TLS_BSS, NULL);
   this->initialize_place(PLACE_BSS, ".bss");
+  this->initialize_place(PLACE_LAST_ALLOC, NULL);
   this->initialize_place(PLACE_REL, NULL);
   this->initialize_place(PLACE_INTERP, ".interp");
   this->initialize_place(PLACE_NONALLOC, NULL);
@@ -396,6 +398,15 @@ Orphan_section_placement::output_section_init(const std::string& name,
   bool first_init = this->first_init_;
   this->first_init_ = false;
 
+  // Remember the last allocated section. Any orphan bss sections
+  // will be placed after it.
+  if (os != NULL
+      && (os->flags() & elfcpp::SHF_ALLOC) != 0)
+    {
+      this->places_[PLACE_LAST_ALLOC].location = location;
+      this->places_[PLACE_LAST_ALLOC].have_location = true;
+    }
+
   for (int i = 0; i < PLACE_MAX; ++i)
     {
       if (this->places_[i].name != NULL && this->places_[i].name == name)
@@ -509,7 +520,7 @@ Orphan_section_placement::find_place(Output_section* os,
 	  follow = PLACE_TEXT;
 	  break;
 	case PLACE_BSS:
-	  follow = PLACE_DATA;
+	  follow = PLACE_LAST_ALLOC;
 	  break;
 	case PLACE_REL:
 	  follow = PLACE_TEXT;
@@ -1751,16 +1762,16 @@ Output_section_element_input::set_section_addresses(
 	   p != matching_sections[i].end();
 	   ++p)
 	{
-	  // Override the original address alignment if SUBALIGN is specified
-	  // and is greater than the original alignment.  We need to make a
-	  // copy of the input section to modify the alignment.
+	  // Override the original address alignment if SUBALIGN is specified.
+	  // We need to make a copy of the input section to modify the
+	  // alignment.
 	  Output_section::Input_section sis(p->input_section());
 
 	  uint64_t this_subalign = sis.addralign();
 	  if (!sis.is_input_section())
 	    sis.output_section_data()->finalize_data_size();
 	  uint64_t data_size = sis.data_size();
-	  if (this_subalign < subalign)
+	  if (subalign > 0)
 	    {
 	      this_subalign = subalign;
 	      sis.set_addralign(subalign);
@@ -2463,6 +2474,35 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
 	this->output_section_->set_addralign(align);
     }
 
+  uint64_t subalign;
+  if (this->subalign_ == NULL)
+    subalign = 0;
+  else
+    {
+      Output_section* subalign_section;
+      subalign = this->subalign_->eval_with_dot(symtab, layout, true,
+						*dot_value, NULL,
+						&subalign_section, NULL,
+						false);
+      if (subalign_section != NULL)
+	gold_warning(_("subalign of section %s is not absolute"),
+		     this->name_.c_str());
+
+      // Reserve a value of 0 to mean there is no SUBALIGN property.
+      if (subalign == 0)
+	subalign = 1;
+
+      // The external alignment of the output section must be at least
+      // as large as that of the input sections.  If there is no
+      // explicit ALIGN property, we set the output section alignment
+      // to match the input section alignment.
+      if (align < subalign || this->align_ == NULL)
+	{
+	  align = subalign;
+	  this->output_section_->set_addralign(align);
+	}
+    }
+
   address = align_address(address, align);
 
   uint64_t start_address = address;
@@ -2547,21 +2587,6 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
 
   this->evaluated_load_address_ = laddr;
 
-  uint64_t subalign;
-  if (this->subalign_ == NULL)
-    subalign = 0;
-  else
-    {
-      Output_section* subalign_section;
-      subalign = this->subalign_->eval_with_dot(symtab, layout, true,
-						*dot_value, NULL,
-						&subalign_section, NULL,
-						false);
-      if (subalign_section != NULL)
-	gold_warning(_("subalign of section %s is not absolute"),
-		     this->name_.c_str());
-    }
-
   std::string fill;
   if (this->fill_ != NULL)
     {