From 7198066bc1e788f08e3a3fd1435ea50a610b8999 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 Jan 2010 05:44:04 +0000 Subject: [PATCH] * resolve.cc (Symbol_table::resolve): Add symbols to the list of ODR candidates if only one is weak. --- gold/ChangeLog | 5 +++++ gold/resolve.cc | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index a92796ab8aa..77df2b89d5e 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2010-01-10 Ian Lance Taylor + + * resolve.cc (Symbol_table::resolve): Add symbols to the list of + ODR candidates if only one is weak. + 2010-01-08 Ian Lance Taylor * script.cc (Version_script_info::build_expression_list_lookup): diff --git a/gold/resolve.cc b/gold/resolve.cc index 9a402f39277..408e83becab 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -342,13 +342,15 @@ Symbol_table::resolve(Sized_symbol* to, // reference, could be a One Definition Rule (ODR) violation -- // especially if the types or sizes of the references differ. We'll // store such pairs and look them up later to make sure they - // actually refer to the same lines of code. (Note: not all ODR - // violations can be found this way, and not everything this finds - // is an ODR violation. But it's helpful to warn about.) + // actually refer to the same lines of code. We also check + // combinations of weak and strong, which might occur if one case is + // inline and the other is not. (Note: not all ODR violations can + // be found this way, and not everything this finds is an ODR + // violation. But it's helpful to warn about.) bool to_is_ordinary; if (parameters->options().detect_odr_violations() - && sym.get_st_bind() == elfcpp::STB_WEAK - && to->binding() == elfcpp::STB_WEAK + && (sym.get_st_bind() == elfcpp::STB_WEAK + || to->binding() == elfcpp::STB_WEAK) && orig_st_shndx != elfcpp::SHN_UNDEF && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF && to_is_ordinary -- 2.30.2