X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=gold%2Flayout.cc;h=6cba3aa3c3b2d098de58718d767c4e9560de8a53;hb=caeff2718173e96f7422badb8124575e3b387e1f;hp=cea25b0193e2c13748a99cc941049d25100b548b;hpb=0ce373381a96f6af8e2023e3626b04a8d1ed7ce3;p=pf3gnuchains%2Fpf3gnuchains3x.git

diff --git a/gold/layout.cc b/gold/layout.cc
index cea25b0193..6cba3aa3c3 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -57,7 +57,7 @@ Layout_task_runner::run(Workqueue* workqueue, const Task* task)
   // Now we know the final size of the output file and we know where
   // each piece of information goes.
   Output_file* of = new Output_file(parameters->output_file_name());
-  if (this->options_.output_format() != General_options::OUTPUT_FORMAT_ELF)
+  if (this->options_.output_format() != General_options::OBJECT_FORMAT_ELF)
     of->set_is_temporary();
   of->open(file_size);
 
@@ -951,7 +951,7 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
   else
     load_seg = this->find_first_load_seg();
 
-  if (this->options_.output_format() != General_options::OUTPUT_FORMAT_ELF)
+  if (this->options_.output_format() != General_options::OBJECT_FORMAT_ELF)
     load_seg = NULL;
 
   gold_assert(phdr_seg == NULL || load_seg != NULL);
@@ -2502,7 +2502,7 @@ void
 Layout::write_binary(Output_file* in) const
 {
   gold_assert(this->options_.output_format()
-	      == General_options::OUTPUT_FORMAT_BINARY);
+	      == General_options::OBJECT_FORMAT_BINARY);
 
   // Get the size of the binary file.
   uint64_t max_load_address = 0;
@@ -2672,7 +2672,7 @@ void
 Close_task_runner::run(Workqueue*, const Task*)
 {
   // If we've been asked to create a binary file, we do so here.
-  if (this->options_->output_format() != General_options::OUTPUT_FORMAT_ELF)
+  if (this->options_->output_format() != General_options::OBJECT_FORMAT_ELF)
     this->layout_->write_binary(this->of_);
 
   this->of_->close();