diff options
| author | Cary Coutant <ccoutant@google.com> | 2011-05-24 23:31:07 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2011-05-24 23:31:07 +0000 |
| commit | aa92d6edc48569b34bddc50f537fde8330151a80 (patch) | |
| tree | eea97dd3a2f081619f253dd6fe91f531d84da09e /gold/gold.cc | |
| parent | 2eedd7063f48940af7716e95c65083a3411b8608 (diff) | |
| download | fsf-binutils-gdb-aa92d6edc48569b34bddc50f537fde8330151a80.zip fsf-binutils-gdb-aa92d6edc48569b34bddc50f537fde8330151a80.tar.gz fsf-binutils-gdb-aa92d6edc48569b34bddc50f537fde8330151a80.tar.bz2 | |
* gold.cc (queue_initial_tasks): Pass incremental base filename
to Output_file::open_base_file; don't print error message.
* incremental-dump.cc (main): Adjust call to
Output_file::open_for_modification.
* incremental-dump.cc (main): Likewise.
* incremental.cc (Incremental_inputs::report_command_line):
Ignore --incremental-base option when comparing command lines.
Ignore parameter when given as separate argument.
* options.h (class General_options): Add --incremental-base.
* output.cc (Output_file::Output_file):
(Output_file::open_base_file): Add base_name and writable parameters;
read base file into new file; print error message here.
(Output_file::map_no_anonymous): Add writable parameter; adjust all
callers.
* output.h (Output_file::open_for_modification): Rename to...
(Output_file::open_base_file): ...this; add base_name and
writable parameters; adjust all callers.
(Output_file::map_no_anonymous): Add writable parameter; adjust all
callers.
* testsuite/Makefile.am (incremental_test_4): Test
--incremental-base.
* testsuite/Makefile.in: Regenerate.
Diffstat (limited to 'gold/gold.cc')
| -rw-r--r-- | gold/gold.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gold/gold.cc b/gold/gold.cc index bf5ac89..4f1f871 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -204,11 +204,7 @@ queue_initial_tasks(const General_options& options, if (parameters->incremental_update()) { Output_file* of = new Output_file(options.output_file_name()); - if (!of->open_for_modification()) - gold_info(_("incremental update not possible: " - "cannot open %s"), - options.output_file_name()); - else + if (of->open_base_file(options.incremental_base(), true)) { ibase = open_incremental_binary(of); if (ibase != NULL |