Fix buglet in last patch.

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

diff --git a/gold/parameters.h b/gold/parameters.h
index ee60b10b4a0de868100903b88ec86f337c7b4c1d..2467295c857f634dcc4f0f2bf0f067095f7eda6a 100644 (file)
--- a/gold/parameters.h
+++ b/gold/parameters.h
@@ -28,6 +28,7 @@ namespace gold
 
 class General_options;
 class Errors;
+class Target;
 
 // Here we define the Parameters class which simply holds simple
 // general parameters which apply to the entire link.  We use a global
@@ -47,6 +48,20 @@ class Parameters
   errors() const
   { return this->errors_; }
 
+  // Whether the options are valid.  This should not normally be
+  // called, but it is needed by gold_exit.
+  bool
+  options_valid() const
+  { return this->options_valid_; }
+
+  // Whether to use threads.
+  bool
+  threads() const
+  {
+    gold_assert(this->options_valid_);
+    return this->threads_;
+  }
+
   // Return the output file name.
   const char*
   output_file_name() const
@@ -112,6 +127,14 @@ class Parameters
     return this->strip_ == STRIP_ALL || this->strip_ == STRIP_DEBUG;
   }
 
+  // Whether to strip debugging information that's not used by gdb.
+  bool
+  strip_debug_gdb() const
+  {
+    gold_assert(this->strip_ != STRIP_INVALID);
+    return this->strip_debug() || this->strip_ == STRIP_DEBUG_UNUSED_BY_GDB;
+  }
+
   // Whether to permit unresolved references from shared libraries.
   bool
   allow_shlib_undefined() const
@@ -129,6 +152,11 @@ class Parameters
     return this->symbolic_;
   }
 
+  // Whether we should demangle C++ symbols in our log messages.
+  bool
+  demangle() const
+  { return this->demangle_; }
+
   // Whether we should try to detect violations of the One Definition Rule.
   bool
   detect_odr_violations() const
@@ -153,6 +181,15 @@ class Parameters
     return this->export_dynamic_;
   }
 
+  // Return the debug flags.  These are the flags for which we should
+  // report internal debugging information.
+  unsigned int
+  debug() const
+  {
+    gold_assert(this->options_valid_);
+    return this->debug_;
+  }
+
   // Whether we are doing a static link--a link in which none of the
   // input files are shared libraries.  This is only known after we
   // have seen all the input files.
@@ -163,12 +200,20 @@ class Parameters
     return this->doing_static_link_;
   }
 
+  // The target of the output file we are generating.
+  Target*
+  target() const
+  {
+    gold_assert(this->is_target_valid_);
+    return this->target_;
+  }
+
   // The size of the output file we are generating.  This should
   // return 32 or 64.
   int
   get_size() const
   {
-    gold_assert(this->is_size_and_endian_valid_);
+    gold_assert(this->is_target_valid_);
     return this->size_;
   }
 
@@ -176,7 +221,7 @@ class Parameters
   bool
   is_big_endian() const
   {
-    gold_assert(this->is_size_and_endian_valid_);
+    gold_assert(this->is_target_valid_);
     return this->is_big_endian_;
   }
 
@@ -188,9 +233,9 @@ class Parameters
   void
   set_doing_static_link(bool doing_static_link);
 
-  // Set the size and endianness.
+  // Set the target.
   void
-  set_size_and_endianness(int size, bool is_big_endian);
+  set_target(Target* target);
 
  private:
   // The types of output files.
@@ -216,7 +261,9 @@ class Parameters
     // Strip all symbols.
     STRIP_ALL,
     // Strip debugging information.
-    STRIP_DEBUG
+    STRIP_DEBUG,
+    // Strip debugging information that's not used by gdb (at least <= 6.7)
+    STRIP_DEBUG_UNUSED_BY_GDB
   };
 
   // A pointer to the error handling object.
@@ -224,6 +271,8 @@ class Parameters
 
   // Whether the fields set from the options are valid.
   bool options_valid_;
+  // Whether to use threads.
+  bool threads_;
   // The output file name.
   const char* output_file_name_;
   // The type of the output file.
@@ -236,19 +285,25 @@ class Parameters
   bool allow_shlib_undefined_;
   // Whether we are doing a symbolic link.
   bool symbolic_;
+  // Whether we should demangle C++ symbols in our log messages.
+  bool demangle_;
   // Whether we try to detect One Definition Rule violations.
   bool detect_odr_violations_;
   // The optimization level.
   int optimization_level_;
   // Whether the -E/--export-dynamic flag is set.
   bool export_dynamic_;
+  // The debug flags.
+  unsigned int debug_;
 
   // Whether the doing_static_link_ field is valid.
   bool is_doing_static_link_valid_;
   // Whether we are doing a static link.
   bool doing_static_link_;
-  // Whether the size_ and is_big_endian_ fields are valid.
-  bool is_size_and_endian_valid_;
+  // Whether the target_ field is valid.
+  bool is_target_valid_;
+  // The target.
+  Target* target_;
   // The size of the output file--32 or 64.
   int size_;
   // Whether the output file is big endian.
@@ -264,12 +319,19 @@ extern void initialize_parameters(Errors*);
 // Set the options.
 extern void set_parameters_from_options(const General_options*);
 
-// Set the size and endianness of the global parameters variable.
-extern void set_parameters_size_and_endianness(int size, bool is_big_endian);
+// Set the target recorded in the global parameters variable.
+extern void set_parameters_target(Target* target);
 
 // Set whether we are doing a static link.
 extern void set_parameters_doing_static_link(bool doing_static_link);
 
+// Return whether we are doing a particular debugging type.  The
+// argument is one of the flags from debug.h.
+
+inline bool
+is_debugging_enabled(unsigned int type)
+{ return (parameters->debug() & type) != 0; }
+
 } // End namespace gold.
 
 #endif // !defined(GOLD_PARAMETERS_H)