diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 4 | ||||
| -rw-r--r-- | gold/script.cc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index ea7dc35..faec2f9 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,9 @@ 2010-01-11 Ian Lance Taylor <iant@google.com> + * script.cc (Version_script_info::build_expression_list_lookup): + Change complaing about duplicate wildcard match from error to + warning. + * script.cc (class Lazy_demangler): Recreate--revert part of patch of 2009-12-30. (Version_script_info::Version_script_info): Initialize globs_, diff --git a/gold/script.cc b/gold/script.cc index 839af3c..a11672c 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -2145,9 +2145,9 @@ Version_script_info::build_expression_list_lookup( { if (this->default_version_ != NULL && this->default_version_->tag != v->tag) - gold_error(_("wildcard match appears in both version '%s' " - "and '%s' in script"), - this->default_version_->tag.c_str(), v->tag.c_str()); + gold_warning(_("wildcard match appears in both version '%s' " + "and '%s' in script"), + this->default_version_->tag.c_str(), v->tag.c_str()); else if (this->default_version_ != NULL && this->default_is_global_ != is_global) gold_error(_("wildcard match appears as both global and local " |