2009-12-02 Rafael Avila de Espindola <espindola@google.com>

	* incremental.cc (make_sized_incremental_binary): Set the target.
	Error if it is incompatible.
	* output.h (Output_file): Add filename method.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 02c0554..0d9e80a 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-02  Rafael Avila de Espindola  <espindola@google.com>
 
+       * 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  <espindola@google.com>
+
        * incremental.cc (Incremental_inputs_entry): Remove unused argument
        from the get_* methods.
 

diff --git a/gold/incremental.cc b/gold/incremental.cc
index 4af4ef3..506c575 100644 (file)
--- 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 != &parameters->target())
+    gold_error(_("%s: incompatible target"), file->filename());
+
   return new Sized_incremental_binary<size, big_endian>(file, ehdr, target);
 }
 

diff --git a/gold/output.h b/gold/output.h
index 7e1c73b..6631aa1 100644 (file)
--- 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.