* script.cc (Version_script_info::build_expression_list_lookup):
Change complaing about duplicate wildcard match from error to warning.
This commit is contained in:
parent
98e090bd1f
commit
d0a91bd8c7
2 changed files with 7 additions and 3 deletions
|
@ -1,5 +1,9 @@
|
||||||
2010-01-11 Ian Lance Taylor <iant@google.com>
|
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
|
* script.cc (class Lazy_demangler): Recreate--revert part of patch
|
||||||
of 2009-12-30.
|
of 2009-12-30.
|
||||||
(Version_script_info::Version_script_info): Initialize globs_,
|
(Version_script_info::Version_script_info): Initialize globs_,
|
||||||
|
|
|
@ -2145,9 +2145,9 @@ Version_script_info::build_expression_list_lookup(
|
||||||
{
|
{
|
||||||
if (this->default_version_ != NULL
|
if (this->default_version_ != NULL
|
||||||
&& this->default_version_->tag != v->tag)
|
&& this->default_version_->tag != v->tag)
|
||||||
gold_error(_("wildcard match appears in both version '%s' "
|
gold_warning(_("wildcard match appears in both version '%s' "
|
||||||
"and '%s' in script"),
|
"and '%s' in script"),
|
||||||
this->default_version_->tag.c_str(), v->tag.c_str());
|
this->default_version_->tag.c_str(), v->tag.c_str());
|
||||||
else if (this->default_version_ != NULL
|
else if (this->default_version_ != NULL
|
||||||
&& this->default_is_global_ != is_global)
|
&& this->default_is_global_ != is_global)
|
||||||
gold_error(_("wildcard match appears as both global and local "
|
gold_error(_("wildcard match appears as both global and local "
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue