aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/archive.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 03e03ae..7084de8 100644
--- 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 569a491..011c36d 100644
--- 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))