* options.h (class General_options): Add
	--allow-multiple-definition and -z muldefs.
	* resolve.cc (Symbol_table::should_override): Don't warn about a
	multiple symbol definition if --allow-multiple-definition or -z
	muldefs.
This commit is contained in:
Ian Lance Taylor
2010-01-05 05:56:28 +00:00
parent a0f1928042
commit 30bc8c4670
3 changed files with 21 additions and 3 deletions

View File

@ -584,6 +584,10 @@ 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(allow_shlib_undefined, options::TWO_DASHES, '\0', false,
N_("Allow unresolved references in shared libraries"),
N_("Do not allow unresolved references in shared libraries"));
@ -998,6 +1002,11 @@ class General_options
NULL);
DEFINE_uint64(max_page_size, options::DASH_Z, '\0', 0,
N_("Set maximum page size to SIZE"), N_("SIZE"));
DEFINE_bool(muldefs, options::DASH_Z, '\0', false,
N_("Allow multiple definitions of symbols"),
NULL);
// copyreloc is here in the list because there is only -z
// nocopyreloc, not -z copyreloc.
DEFINE_bool(copyreloc, options::DASH_Z, '\0', true,
NULL,
N_("Do not create copy relocs"));