From b5d92ab1a147c77edebac22866e5c9244984ff52 Mon Sep 17 00:00:00 2001 From: espindola Date: Thu, 3 Dec 2009 04:26:01 +0000 Subject: [PATCH] 2009-12-02 Rafael Avila de Espindola * incremental.cc (make_sized_incremental_binary): Set the target. Error if it is incompatible. * output.h (Output_file): Add filename method. --- gold/ChangeLog | 6 ++++++ gold/incremental.cc | 5 +++++ gold/output.h | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index 02c05543a..0d9e80a99 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,11 @@ 2009-12-02 Rafael Avila de Espindola + * incremental.cc (make_sized_incremental_binary): Set the target. + Error if it is incompatible. + * output.h (Output_file): Add filename method. + +2009-12-02 Rafael Avila de Espindola + * incremental.cc (Incremental_inputs_entry): Remove unused argument from the get_* methods. diff --git a/gold/incremental.cc b/gold/incremental.cc index 4af4ef30d..506c575e6 100644 --- a/gold/incremental.cc +++ b/gold/incremental.cc @@ -333,6 +333,11 @@ make_sized_incremental_binary(Output_file* file, return NULL; } + if (!parameters->target_valid()) + set_parameters_target(target); + else if (target != ¶meters->target()) + gold_error(_("%s: incompatible target"), file->filename()); + return new Sized_incremental_binary(file, ehdr, target); } diff --git a/gold/output.h b/gold/output.h index 7e1c73bb5..6631aa1e8 100644 --- a/gold/output.h +++ b/gold/output.h @@ -3653,6 +3653,11 @@ class Output_file filesize() { return this->file_size_; } + // Return the name of this file. + const char* + filename() + { return this->name_; } + // We currently always use mmap which makes the view handling quite // simple. In the future we may support other approaches. -- 2.11.4.GIT