From Craig Silverstein: rename some option functions in preparation

for reworking option handling.
This commit is contained in:
Ian Lance Taylor
2008-03-04 18:21:43 +00:00
parent 95ece42831
commit 7cc619c3b1
8 changed files with 27 additions and 23 deletions

View File

@@ -58,7 +58,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->options().output_file_name());
if (this->options_.oformat() != General_options::OBJECT_FORMAT_ELF)
if (this->options_.oformat_enum() != General_options::OBJECT_FORMAT_ELF)
of->set_is_temporary();
of->open(file_size);
@@ -987,7 +987,7 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
else
load_seg = this->find_first_load_seg();
if (this->options_.oformat() != General_options::OBJECT_FORMAT_ELF)
if (this->options_.oformat_enum() != General_options::OBJECT_FORMAT_ELF)
load_seg = NULL;
gold_assert(phdr_seg == NULL || load_seg != NULL);
@@ -2561,7 +2561,7 @@ Layout::write_sections_after_input_sections(Output_file* of)
void
Layout::write_binary(Output_file* in) const
{
gold_assert(this->options_.oformat()
gold_assert(this->options_.oformat_enum()
== General_options::OBJECT_FORMAT_BINARY);
// Get the size of the binary file.
@@ -2732,7 +2732,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_->oformat() != General_options::OBJECT_FORMAT_ELF)
if (this->options_->oformat_enum() != General_options::OBJECT_FORMAT_ELF)
this->layout_->write_binary(this->of_);
this->of_->close();