diff --git a/gold/ChangeLog b/gold/ChangeLog
index 050a42a554..aca6c8e046 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-19  Ian Lance Taylor  <iant@google.com>
 
+	* object.cc (Sized_relobj::do_add_symbols): Always pass
+	local_symbol_count_ to add_from_relobj.
+
 	* testsuite/Makefile.am (many_sections_check.h): Only check one in
 	every thousand variables.
 	* testsuite/Makefile.in: Rebuild.
diff --git a/gold/object.cc b/gold/object.cc
index 19d9185c44..d060f8d735 100644
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -946,10 +946,7 @@ Sized_relobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
     reinterpret_cast<const char*>(sd->symbol_names->data());
   symtab->add_from_relobj(this,
 			  sd->symbols->data() + sd->external_symbols_offset,
-			  symcount,
-			  (sd->external_symbols_offset == 0
-			   ? this->local_symbol_count_
-			   : 0),
+			  symcount, this->local_symbol_count_,
 			  sym_names, sd->symbol_names_size,
 			  &this->symbols_);