* configure.tgt (powerpc64-*): Fix targ_obj.

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

diff --git a/gold/parameters.cc b/gold/parameters.cc
index db775ed0bfe06d3ce9b4a099d8358414afb4e160..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.
@@ -22,6 +22,7 @@
 
 #include "gold.h"
 
+#include "debug.h"
 #include "options.h"
 #include "target.h"
 #include "target-select.h"
@@ -41,8 +42,12 @@ Parameters::set_options(const General_options* options)
 {
   gold_assert(!this->options_valid());
   this->options_ = options;
-  // For speed, we make our own copy of the debug variable.
-  this->debug_ = this->options().debug();
+  // 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
@@ -72,15 +77,15 @@ const Target&
 Parameters::default_target() const
 {
   gold_assert(this->options_valid());
-  if (this->options().oformat_string() != NULL)
+  if (this->options().user_set_oformat())
     {
       const Target* target
-          = select_target_by_name(this->options().oformat_string());
+          = select_target_by_name(this->options().oformat());
       if (target != NULL)
        return *target;
 
       gold_error(_("unrecognized output format %s"),
-                this->options().oformat_string());
+                 this->options().oformat());
     }
 
   // The GOLD_DEFAULT_xx macros are defined by the configure script.