diff --git a/gold/output.cc b/gold/output.cc
index 9fc3103138..6d782e2772 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -839,7 +839,8 @@ Output_section::Input_section::output_address(const Relobj* object,
 					  output_section_address, poutput);
   else
     {
-      if (this->u2_.object != object)
+      if (this->shndx_ != shndx
+	  || this->u2_.object != object)
 	return false;
       off_t output_offset;
       Output_section* os = object->output_section(shndx, &output_offset);