From 9c4ae15620bfe4744f6254203295f0f2d9271ee6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 5 Jan 2010 22:55:08 +0000 Subject: * options.h (class General_options): Use DEFINE_bool_alias for allow_multiple_definition. * resolve.cc (Symbol_table::should_override): Don't test allow_multiple_definition. --- gold/resolve.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gold/resolve.cc') diff --git a/gold/resolve.cc b/gold/resolve.cc index 24b80a8..ca71264 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -1,6 +1,6 @@ // resolve.cc -- symbol resolution for gold -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -440,8 +440,7 @@ Symbol_table::should_override(const Symbol* to, unsigned int frombits, || (object != NULL && object->just_symbols())) return false; - if (!parameters->options().allow_multiple_definition() - && !parameters->options().muldefs()) + if (!parameters->options().muldefs()) Symbol_table::report_resolve_problem(true, _("multiple definition of '%s'"), to, defined, object); -- cgit v1.1