diff options
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/options.h | 6 | ||||
| -rw-r--r-- | gold/resolve.cc | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index e176234..87c7af4 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,10 @@ 2010-01-05 Ian Lance Taylor <iant@google.com> + * 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. + PR 10980 * options.h (class General_options): Add --cref. * main.cc (main): Print cref table if --cref. Don't close mapfile diff --git a/gold/options.h b/gold/options.h index 907a8a3..85c81e4 100644 --- a/gold/options.h +++ b/gold/options.h @@ -584,9 +584,9 @@ class General_options N_("Not supported"), N_("Do not copy DT_NEEDED tags from shared libraries")); - DEFINE_bool(allow_multiple_definition, options::TWO_DASHES, '\0', false, - N_("Allow multiple definitions of symbols"), - N_("Do not allow multiple definitions")); + DEFINE_bool_alias(allow_multiple_definition, muldefs, options::TWO_DASHES, + '\0', N_("Allow multiple definitions of symbols"), + N_("Do not allow multiple definitions"), false); DEFINE_bool(allow_shlib_undefined, options::TWO_DASHES, '\0', false, N_("Allow unresolved references in shared libraries"), 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 <iant@google.com>. // 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); |