2010-03-22 Doug Kwan <dougkwan@google.com>

[binutils-gdb.git] / gold / script.cc

diff --git a/gold/script.cc b/gold/script.cc
index 839af3c53105f88b58cc755cea6fd94b04c3ee65..bef0cdbe30b6bee6967a27d452ca16751a479681 100644 (file)
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -1438,7 +1438,7 @@ read_input_script(Workqueue* workqueue, Symbol_table* symtab, Layout* layout,
        }
       workqueue->queue_soon(new Read_symbols(input_objects, symtab,
                                             layout, dirsearch, 0, mapfile, &*p,
-                                            input_group, this_blocker, nb));
+                                            input_group, NULL, this_blocker, nb));
       this_blocker = nb;
     }
 
@@ -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 "