* archive.cc (Archive::add_symbols): Only look up a symbol without

	a version if there is, in fact, a version.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 03e03ae3208af3a196fc722502e16a49eb1eb59f..7084de85a523edd594814cf99896317939e51124 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  Ian Lance Taylor  <iant@google.com>
+
+       * archive.cc (Archive::add_symbols): Only look up a symbol without
+       a version if there is, in fact, a version.
+
 2009-12-14  Ian Lance Taylor  <iant@google.com>
 
        Revert -Wshadow changes, all changes from:

diff --git a/gold/archive.cc b/gold/archive.cc
index 569a491ae1a1b6628b189abd74c9ef2aec683dc3..011c36ddd613a660d00c623c8494a5779f8d3651 100644 (file)
--- a/gold/archive.cc
+++ b/gold/archive.cc
@@ -688,6 +688,7 @@ Archive::add_symbols(Symbol_table* symtab, Layout* layout,
 
          Symbol* sym = symtab->lookup(sym_name, ver);
          if (def
+             && ver != NULL
              && (sym == NULL
                  || !sym->is_undefined()
                  || sym->binding() == elfcpp::STB_WEAK))