2009-01-20 Sriraman Tallam <tmsriram@google.com>

[deliverable/binutils-gdb.git] / gold / parameters.cc

diff --git a/gold/parameters.cc b/gold/parameters.cc
index f240c1d990c6151e6c8fa3979864eb3909cbb23f..729305116aad78086d58ac1cff81c0abb17a312d 100644 (file)
--- a/gold/parameters.cc
+++ b/gold/parameters.cc
@@ -1,6 +1,6 @@
 // parameters.cc -- general parameters for a link using gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -45,6 +45,9 @@ Parameters::set_options(const General_options* options)
   // For speed, we convert the options() debug var from a string to an
   // enum (from debug.h).
   this->debug_ = debug_string_to_enum(this->options().debug());
+  // If --verbose is set, it acts as "--debug=files".
+  if (options->verbose())
+    this->debug_ |= DEBUG_FILES;
 }
 
 void
@@ -74,7 +77,7 @@ const Target&
 Parameters::default_target() const
 {
   gold_assert(this->options_valid());
-  if (this->options().oformat() != NULL)
+  if (this->options().user_set_oformat())
     {
       const Target* target
           = select_target_by_name(this->options().oformat());