gold/

	* script-sections.cc (Orphan_output_section): Reset address
	to zero after each orphaned section for relocatable links.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index a635214..595c017 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,10 @@
 2013-04-15  Cary Coutant  <ccoutant@google.com>
 
+       * script-sections.cc (Orphan_output_section): Reset address
+       to zero after each orphaned section for relocatable links.
+
+2013-04-15  Cary Coutant  <ccoutant@google.com>
+
        * symtab.cc (Symbol_table::sized_write_globals): Subtract
        section starting address for relocatable link.
        * testsuite/Makefile.am (script_test_11): New test.

diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index 2fb8cbb..a57e53f 100644 (file)
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -2918,11 +2918,17 @@ Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
       address += size;
     }
 
-  // An SHF_TLS/SHT_NOBITS section does not take up any address space.
-  if (this->os_ == NULL
-      || (this->os_->flags() & elfcpp::SHF_TLS) == 0
-      || this->os_->type() != elfcpp::SHT_NOBITS)
+  if (parameters->options().relocatable())
+    {
+      // For a relocatable link, reset DOT_VALUE to 0.
+      *dot_value = 0;
+      *load_address = 0;
+    }
+  else if (this->os_ == NULL
+          || (this->os_->flags() & elfcpp::SHF_TLS) == 0
+          || this->os_->type() != elfcpp::SHT_NOBITS)
     {
+      // An SHF_TLS/SHT_NOBITS section does not take up any address space.
       if (!have_load_address)
        *load_address = address;
       else