Implement SIZEOF_HEADERS, section constraints, other minor linker

script items.

1 files changed, 6 insertions, 5 deletions

diff --git a/gold/output.cc b/gold/output.cc
index c0db1af..8eb79fa 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -2324,21 +2324,22 @@ Output_segment::set_section_list_addresses(bool reset, Output_data_list* pdl,
        p != pdl->end();
        ++p)
     {
-      off = align_address(off, (*p)->addralign());
-
       if (reset)
 	(*p)->reset_address_and_file_offset();
 
       // When using a linker script the section will most likely
       // already have an address.
       if (!(*p)->is_address_valid())
-	(*p)->set_address_and_file_offset(addr + (off - startoff), off);
+	{
+	  off = align_address(off, (*p)->addralign());
+	  (*p)->set_address_and_file_offset(addr + (off - startoff), off);
+	}
       else
 	{
 	  // The script may have inserted a skip forward, but it
 	  // better not have moved backward.
-	  gold_assert((*p)->address() >= addr);
-	  off = startoff + ((*p)->address() - addr);
+	  gold_assert((*p)->address() >= addr + (off - startoff));
+	  off += (*p)->address() - (addr + (off - startoff));
 	  (*p)->set_file_offset(off);
 	  (*p)->finalize_data_size();
 	}