diff options
| author | Ian Lance Taylor <ian@airs.com> | 2010-01-05 22:55:08 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2010-01-05 22:55:08 +0000 |
| commit | 9c4ae15620bfe4744f6254203295f0f2d9271ee6 (patch) | |
| tree | 5b68b38b649e11b96af919880e8244e40225f781 /gold/resolve.cc | |
| parent | dde3f402cfe649f271730fa5de983ee663743ea3 (diff) | |
| download | binutils-9c4ae15620bfe4744f6254203295f0f2d9271ee6.zip binutils-9c4ae15620bfe4744f6254203295f0f2d9271ee6.tar.gz binutils-9c4ae15620bfe4744f6254203295f0f2d9271ee6.tar.bz2 | |
* 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.
Diffstat (limited to 'gold/resolve.cc')
| -rw-r--r-- | gold/resolve.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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); |