merge from gcc

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

diff --git a/gold/parameters.h b/gold/parameters.h
index 3b10228706fa03cd6589cc621a2f242bacd9dd7d..921a990efa46e13be2255d93e3c867378f25303c 100644 (file)
--- a/gold/parameters.h
+++ b/gold/parameters.h
@@ -1,6 +1,6 @@
 // parameters.h -- general parameters for a link using gold  -*- C++ -*-
 
-// 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.
@@ -103,6 +103,10 @@ class Parameters
   const Target&
   default_target() const;
 
+  // Return true if TARGET is compatible with the current target.
+  bool
+  is_compatible_target(const Target*) const;
+
   bool
   doing_static_link() const
   {
@@ -116,7 +120,9 @@ class Parameters
   int
   debug() const
   {
-    gold_assert(this->options_valid());
+    // This can be called before the options are set up.
+    if (!this->options_valid())
+      return 0;
     return debug_;
   }