* options.c (General_options::finalize): Add check for -static and

-shared.
	* gold.cc (queue_middle_tasks): Assert that list of dynamic objects
	is not empty.
This commit is contained in:
Cary Coutant 2008-10-07 23:40:21 +00:00
parent c289427b7d
commit 4e1e25e084
3 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2008-10-07 Cary Coutant <ccoutant@google.com>
* options.c (General_options::finalize): Add check for -static and
-shared.
* gold.cc (queue_middle_tasks): Assert that list of dynamic objects
is not empty.
2008-10-02 Cary Coutant <ccoutant@google.com>
* plugin.cc (make_sized_plugin_object): Fix conditional

View File

@ -203,6 +203,7 @@ queue_middle_tasks(const General_options& options,
if (!doing_static_link && options.is_static())
{
// We print out just the first .so we see; there may be others.
gold_assert(input_objects->dynobj_begin() != input_objects->dynobj_end());
gold_error(_("cannot mix -static with dynamic object %s"),
(*input_objects->dynobj_begin())->name().c_str());
}

View File

@ -792,6 +792,9 @@ General_options::finalize()
this->add_sysroot();
// Now that we've normalized the options, check for contradictory ones.
if (this->shared() && this->is_static())
gold_fatal(_("-shared and -static are incompatible"));
if (this->shared() && this->relocatable())
gold_fatal(_("-shared and -r are incompatible"));