* 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.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index e1762340c227817be318e042f16ef4c8e1b81334..87c7af4115466a85075ea3aac1c968291296e4b0 100644 (file)
--- 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 907a8a3481b6d5eebf887b02f72cb5dfb75cc898..85c81e4c23db4199e99ec04f11e47da66cd38792 100644 (file)
--- 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 24b80a8a57504b8b878c412f052a7f39e9064264..ca71264d4df429db454080ed75754db2d8195103 100644 (file)
--- 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);