From 0649a8891297644c801b0df951be9f7c957c23a1 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 15 Dec 2009 22:05:22 +0000 Subject: [PATCH] * archive.cc (Archive::add_symbols): Only look up a symbol without a version if there is, in fact, a version. --- gold/ChangeLog | 5 +++++ gold/archive.cc | 1 + 2 files changed, 6 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index 03e03ae3208..7084de85a52 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2009-12-15 Ian Lance Taylor + + * 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 Revert -Wshadow changes, all changes from: diff --git a/gold/archive.cc b/gold/archive.cc index 569a491ae1a..011c36ddd61 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)) -- 2.30.2