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 02c05543af75226f4f12b86c1dce66b0b98129ce..0d9e80a99adc20ee9240801315a66ea9297fa0c9 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gold/incremental.cc b/gold/incremental.cc
index 4af4ef30d9f0c7fc21c7a19bd12b7148e6239425..506c575e66f7500beab5efcc1e7afb40eec5b5a4 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 7e1c73bb54f0e3042fafa45d74426519813b2844..6631aa1e8495f856a73b4e48aa462385fa2402a7 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.