OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* gold/gold.cc (queue_initial_tasks): Move option checks ... 

* gold/options.cc (General_options::finalize): ... to here. Disable
	some options; make others fatal.
This commit is contained in:
Cary Coutant 2011-09-26 23:42:06 +00:00
parent 139d7133b8
commit 403a3331af
3 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
2011-09-26 Cary Coutant <ccoutant@google.com>
* gold/gold.cc (queue_initial_tasks): Move option checks ...
* gold/options.cc (General_options::finalize): ... to here. Disable
some options; make others fatal.
2011-09-26 Cary Coutant <ccoutant@google.com>
gcc PR lto/47247

53
gold/gold.cc
View File

@ -197,46 +197,29 @@ queue_initial_tasks(const General_options& options,
// For incremental links, the base output file.
Incremental_binary* ibase = NULL;
if (parameters->incremental())
if (parameters->incremental_update())
{
if (options.relocatable())
gold_error(_("incremental linking is incompatible with -r"));
if (options.emit_relocs())
gold_error(_("incremental linking is incompatible with --emit-relocs"));
if (options.gc_sections())
gold_error(_("incremental linking is incompatible with --gc-sections"));
if (options.icf_enabled())
gold_error(_("incremental linking is incompatible with --icf"));
if (options.has_plugins())
gold_error(_("incremental linking is incompatible with --plugin"));
if (strcmp(options.compress_debug_sections(), "none") != 0)
gold_error(_("incremental linking is incompatible with "
"--compress-debug-sections"));
if (parameters->incremental_update())
Output_file* of = new Output_file(options.output_file_name());
if (of->open_base_file(options.incremental_base(), true))
{
Output_file* of = new Output_file(options.output_file_name());
if (of->open_base_file(options.incremental_base(), true))
ibase = open_incremental_binary(of);
if (ibase != NULL
&& ibase->check_inputs(cmdline, layout->incremental_inputs()))
ibase->init_layout(layout);
else
{
ibase = open_incremental_binary(of);
if (ibase != NULL
&& ibase->check_inputs(cmdline, layout->incremental_inputs()))
ibase->init_layout(layout);
else
{
delete ibase;
ibase = NULL;
of->close();
}
}
if (ibase == NULL)
{
if (set_parameters_incremental_full())
gold_info(_("linking with --incremental-full"));
else
gold_fallback(_("restart link with --incremental-full"));
delete ibase;
ibase = NULL;
of->close();
}
}
if (ibase == NULL)
{
if (set_parameters_incremental_full())
gold_info(_("linking with --incremental-full"));
else
gold_fallback(_("restart link with --incremental-full"));
}
}
// Read the input files. We have to add the symbols to the symbol

31
gold/options.cc
View File

@ -1224,6 +1224,37 @@ General_options::finalize()
gold_fatal(_("Options --incremental-changed, --incremental-unchanged, "
"--incremental-unknown require the use of --incremental"));
// Check for options that are not compatible with incremental linking.
// Where an option can be disabled without seriously changing the semantics
// of the link, we turn the option off; otherwise, we issue a fatal error.
if (this->incremental_mode_ != INCREMENTAL_OFF)
{
if (this->relocatable())
gold_fatal(_("incremental linking is not compatible with -r"));
if (this->emit_relocs())
gold_fatal(_("incremental linking is not compatible with "
"--emit-relocs"));
if (this->has_plugins())
gold_fatal(_("incremental linking is not compatible with --plugin"));
if (this->gc_sections())
{
gold_warning(_("ignoring --gc-sections for an incremental link"));
this->set_gc_sections(false);
}
if (this->icf_enabled())
{
gold_warning(_("ignoring --icf for an incremental link"));
this->set_icf_status(ICF_NONE);
}
if (strcmp(this->compress_debug_sections(), "none") != 0)
{
gold_warning(_("ignoring --compress-debug-sections for an "
"incremental link"));
this->set_compress_debug_sections("none");
}
}
// FIXME: we can/should be doing a lot more sanity checking here.
}