summaryrefslogtreecommitdiff
path: root/gold/fileread.cc
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2008-03-04 18:21:43 +0000
committerIan Lance Taylor <iant@google.com>2008-03-04 18:21:43 +0000
commit7cc619c3b1e037f50afd7c932d8c5409a6db5cb5 (patch)
tree10c46db6dcc8e2d41e93e851fb95ea06a816ed71 /gold/fileread.cc
parent95ece4283165eaa6beeb4a3497d12b8726e8bdc8 (diff)
downloadbinutils-gdb-7cc619c3b1e037f50afd7c932d8c5409a6db5cb5.tar.gz
From Craig Silverstein: rename some option functions in preparation
for reworking option handling.
Diffstat (limited to 'gold/fileread.cc')
-rw-r--r--gold/fileread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/fileread.cc b/gold/fileread.cc
index 901c52802d2..2931d433aa6 100644
--- a/gold/fileread.cc
+++ b/gold/fileread.cc
@@ -643,7 +643,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath,
n1 += this->input_argument_->name();
std::string n2;
if (options.is_static()
- || this->input_argument_->options().Bstatic())
+ || !this->input_argument_->options().Bdynamic())
n1 += ".a";
else
{
@@ -691,7 +691,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath,
// Now that we've figured out where the file lives, try to open it.
General_options::Object_format format =
- this->input_argument_->options().format();
+ this->input_argument_->options().format_enum();
bool ok;
if (format == General_options::OBJECT_FORMAT_ELF)
ok = this->file_.open(task, name);