From Andrew Chatham and Craig Silverstein: Add support for version

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

diff --git a/gold/parameters.cc b/gold/parameters.cc
index 817268b1624d0e69caeee172a3936cd1b7a88d64..e6b96825353c4a443bc72f858b760a4af08673f7 100644 (file)
--- a/gold/parameters.cc
+++ b/gold/parameters.cc
@@ -23,6 +23,7 @@
 #include "gold.h"
 
 #include "options.h"
+#include "target.h"
 #include "parameters.h"
 
 namespace gold
@@ -30,13 +31,33 @@ namespace gold
 
 // Initialize the parameters from the options.
 
-Parameters::Parameters(const General_options* options, Errors* errors)
-  : errors_(errors), output_file_name_(options->output_file_name()),
-    sysroot_(options->sysroot()),
+Parameters::Parameters(Errors* errors)
+  : errors_(errors), threads_(false), output_file_name_(NULL),
+    output_file_type_(OUTPUT_INVALID), sysroot_(),
+    strip_(STRIP_INVALID), allow_shlib_undefined_(false),
+    symbolic_(false), demangle_(false), detect_odr_violations_(false),
+    optimization_level_(0), export_dynamic_(false), debug_(0),
     is_doing_static_link_valid_(false), doing_static_link_(false),
-    is_size_and_endian_valid_(false), size_(0), is_big_endian_(false),
-    optimization_level_(options->optimization_level())
+    is_target_valid_(false), target_(NULL)
 {
+}
+
+// Set fields from the command line options.
+
+void
+Parameters::set_from_options(const General_options* options)
+{
+  this->threads_ = options->threads();
+  this->output_file_name_ = options->output_file_name();
+  this->sysroot_ = options->sysroot();
+  this->allow_shlib_undefined_ = options->allow_shlib_undefined();
+  this->symbolic_ = options->symbolic();
+  this->demangle_ = options->demangle();
+  this->detect_odr_violations_ = options->detect_odr_violations();
+  this->optimization_level_ = options->optimization_level();
+  this->export_dynamic_ = options->export_dynamic();
+  this->debug_ = options->debug();
+
   if (options->is_shared())
     this->output_file_type_ = OUTPUT_SHARED;
   else if (options->is_relocatable())
@@ -48,8 +69,12 @@ Parameters::Parameters(const General_options* options, Errors* errors)
     this->strip_ = STRIP_ALL;
   else if (options->strip_debug())
     this->strip_ = STRIP_DEBUG;
+  else if (options->strip_debug_gdb())
+    this->strip_ = STRIP_DEBUG_UNUSED_BY_GDB;
   else
     this->strip_ = STRIP_NONE;
+
+  this->options_valid_ = true;
 }
 
 // Set whether we are doing a static link.
@@ -61,22 +86,20 @@ Parameters::set_doing_static_link(bool doing_static_link)
   this->is_doing_static_link_valid_ = true;
 }
 
-// Set the size and endianness.
+// Set the target.
 
 void
-Parameters::set_size_and_endianness(int size, bool is_big_endian)
+Parameters::set_target(Target* target)
 {
-  if (!this->is_size_and_endian_valid_)
+  if (!this->is_target_valid_)
     {
-      this->size_ = size;
-      this->is_big_endian_ = is_big_endian;
-      this->is_size_and_endian_valid_ = true;
+      this->target_ = target;
+      this->size_ = target->get_size();
+      this->is_big_endian_ = target->is_big_endian();
+      this->is_target_valid_ = true;
     }
   else
-    {
-      gold_assert(size == this->size_);
-      gold_assert(is_big_endian == this->is_big_endian_);
-    }
+    gold_assert(target == this->target_);
 }
 
 // Our local version of the variable, which is not const.
@@ -90,9 +113,17 @@ const Parameters* parameters;
 // Initialize the global variable.
 
 void
-initialize_parameters(const General_options* options, Errors* errors)
+initialize_parameters(Errors* errors)
+{
+  parameters = static_parameters = new Parameters(errors);
+}
+
+// Set values from the options.
+
+void
+set_parameters_from_options(const General_options* options)
 {
-  parameters = static_parameters = new Parameters(options, errors);
+  static_parameters->set_from_options(options);
 }
 
 // Set whether we are doing a static link.
@@ -103,12 +134,12 @@ set_parameters_doing_static_link(bool doing_static_link)
   static_parameters->set_doing_static_link(doing_static_link);
 }
 
-// Set the size and endianness.
+// Set the target.
 
 void
-set_parameters_size_and_endianness(int size, bool is_big_endian)
+set_parameters_target(Target* target)
 {
-  static_parameters->set_size_and_endianness(size, is_big_endian);
+  static_parameters->set_target(target);
 }
 
 } // End namespace gold.