From Craig Silverstein: rework handling of Script_options.
[binutils-gdb.git] / gold / options.h
index 47623dc8701b2f8e3ae3913cc449b48f9c941fa2..14e1629e52e2cf87f91655046bbb06161aa22dfa 100644 (file)
@@ -37,6 +37,7 @@
 #include <string>
 #include <vector>
 
+#include "elfcpp.h"
 #include "script.h"
 
 namespace gold
@@ -45,6 +46,7 @@ namespace gold
 class Command_line;
 class Input_file_group;
 class Position_dependent_options;
+class Target;
 
 namespace options
 {
@@ -73,7 +75,10 @@ class Search_directory
   // This is the usual constructor.
   Search_directory(const char* name, bool put_in_sysroot)
     : name_(name), put_in_sysroot_(put_in_sysroot), is_in_sysroot_(false)
-  { gold_assert(!this->name_.empty()); }
+  {
+    if (this->name_.empty())
+      this->name_ = ".";
+  }
 
   // This is called if we have a sysroot.  The sysroot is prefixed to
   // any entries for which put_in_sysroot_ is true.  is_in_sysroot_ is
@@ -106,12 +111,20 @@ class Search_directory
 class General_options
 {
  public:
-  General_options(Script_options*);
+  enum Object_format
+  {
+    // Ordinary ELF.
+    OBJECT_FORMAT_ELF,
+    // Straight binary format.
+    OBJECT_FORMAT_BINARY
+  };
+
+  General_options();
 
   // -e: set entry address.
   const char*
   entry() const
-  { return this->script_options_->entry(); }
+  { return this->entry_; }
 
   // -E: export dynamic symbols.
   bool
@@ -137,7 +150,7 @@ class General_options
 
   // -O: optimization level (0: don't try to optimize output size).
   int
-  optimization_level() const
+  optimize() const
   { return this->optimization_level_; }
 
   // -o: Output file name.
@@ -145,9 +158,18 @@ class General_options
   output_file_name() const
   { return this->output_file_name_; }
 
+  // --oformat: Output format.
+  Object_format
+  oformat() const
+  { return this->oformat_; }
+
+  // Return the default target.
+  Target*
+  default_target() const;
+
   // -r: Whether we are doing a relocatable link.
   bool
-  is_relocatable() const
+  relocatable() const
   { return this->is_relocatable_; }
 
   // -s: Strip all symbols.
@@ -174,7 +196,7 @@ class General_options
 
   // -Bsymbolic: bind defined symbols locally.
   bool
-  symbolic() const
+  Bsymbolic() const
   { return this->symbolic_; }
 
   // --compress-debug-sections: compress .debug_* sections in the
@@ -200,7 +222,7 @@ class General_options
 
   // --eh-frame-hdr: Whether to generate an exception frame header.
   bool
-  create_eh_frame_hdr() const
+  eh_frame_hdr() const
   { return this->create_eh_frame_hdr_; }
 
   // --rpath: The runtime search path.
@@ -215,7 +237,7 @@ class General_options
 
   // --shared: Whether generating a shared object.
   bool
-  is_shared() const
+  shared() const
   { return this->is_shared_; }
 
   // --static: Whether doing a static link.
@@ -233,19 +255,34 @@ class General_options
   sysroot() const
   { return this->sysroot_; }
 
-  // --version-script: The version script to apply if --shared is true.
-  const Version_script_info&
-  version_script() const
-  { return *this->script_options_->version_script_info(); }
+  // -Tbss: The address of the BSS segment
+  uint64_t
+  Tbss() const
+  { return this->bss_segment_address_; }
+
+  // Whether -Tbss was used.
+  bool
+  user_set_Tbss() const
+  { return this->bss_segment_address_ != -1U; }
+
+  // -Tdata: The address of the data segment
+  uint64_t
+  Tdata() const
+  { return this->data_segment_address_; }
+
+  // Whether -Tdata was used.
+  bool
+  user_set_Tdata() const
+  { return this->data_segment_address_ != -1U; }
 
   // -Ttext: The address of the .text section
   uint64_t
-  text_segment_address() const
+  Ttext() const
   { return this->text_segment_address_; }
 
   // Whether -Ttext was used.
   bool
-  user_set_text_segment_address() const
+  user_set_Ttext() const
   { return this->text_segment_address_ != -1U; }
 
   // --threads: Whether to use threads.
@@ -277,20 +314,21 @@ class General_options
   is_stack_executable() const
   { return this->execstack_ == EXECSTACK_YES; }
 
+  // -z max-page-size
+  uint64_t
+  max_page_size() const
+  { return this->max_page_size_; }
+
+  // -z common-page-size
+  uint64_t
+  common_page_size() const
+  { return this->common_page_size_; }
+
   // --debug
   unsigned int
   debug() const
   { return this->debug_; }
 
-  // Return the options which may be set from a linker script.
-  Script_options*
-  script_options()
-  { return this->script_options_; }
-
-  const Script_options*
-  script_options() const
-  { return this->script_options_; }
-
  private:
   // Don't copy this structure.
   General_options(const General_options&);
@@ -332,11 +370,11 @@ class General_options
 
   void
   set_entry(const char* arg)
-  { this->script_options_->set_entry(arg, strlen(arg)); }
+  { this->entry_ = arg; }
 
   void
-  set_export_dynamic()
-  { this->export_dynamic_ = true; }
+  set_export_dynamic(bool value)
+  { this->export_dynamic_ = value; }
 
   void
   set_soname(const char* arg)
@@ -355,7 +393,7 @@ class General_options
   { this->search_path_.push_back(Search_directory(arg, true)); }
 
   void
-  set_optimization_level(const char* arg)
+  set_optimize(const char* arg)
   {
     char* endptr;
     this->optimization_level_ = strtol(arg, &endptr, 0);
@@ -364,38 +402,41 @@ class General_options
   }
 
   void
-  set_output_file_name(const char* arg)
+  set_output(const char* arg)
   { this->output_file_name_ = arg; }
 
   void
-  set_relocatable()
-  { this->is_relocatable_ = true; }
+  set_oformat(const char*);
+
+  void
+  set_relocatable(bool value)
+  { this->is_relocatable_ = value; }
 
   void
-  set_strip_all()
+  set_strip_all(bool)
   { this->strip_ = STRIP_ALL; }
 
   // Note: normalize_options() depends on the fact that this turns off
   // STRIP_ALL if it were already set.
   void
-  set_strip_debug()
+  set_strip_debug(bool)
   { this->strip_ = STRIP_DEBUG; }
 
   void
-  set_strip_debug_gdb()
+  set_strip_debug_gdb(bool)
   { this->strip_ = STRIP_DEBUG_UNUSED_BY_GDB; }
 
   void
-  set_allow_shlib_undefined()
-  { this->allow_shlib_undefined_ = true; }
+  set_allow_shlib_undefined(bool value)
+  { this->allow_shlib_undefined_ = value; }
 
   void
-  set_no_allow_shlib_undefined()
-  { this->allow_shlib_undefined_ = false; }
+  set_no_allow_shlib_undefined(bool value)
+  { this->set_allow_shlib_undefined(!value); }
 
   void
-  set_symbolic()
-  { this->symbolic_ = true; }
+  set_Bsymbolic(bool value)
+  { this->symbolic_ = value; }
 
   void set_compress_debug_sections(const char* arg)
   {
@@ -411,23 +452,23 @@ class General_options
   }
 
   void
-  define_symbol(const char* arg);
+  add_to_defsym(const char* arg);
 
   void
-  set_demangle()
-  { this->demangle_ = true; }
+  set_demangle(bool value)
+  { this->demangle_ = value; }
 
   void
-  clear_demangle()
-  { this->demangle_ = false; }
+  set_no_demangle(bool value)
+  { this->set_demangle(!value); }
 
   void
-  set_detect_odr_violations()
-  { this->detect_odr_violations_ = true; }
+  set_detect_odr_violations(bool value)
+  { this->detect_odr_violations_ = value; }
 
   void
-  set_create_eh_frame_hdr()
-  { this->create_eh_frame_hdr_ = true; }
+  set_eh_frame_hdr(bool value)
+  { this->create_eh_frame_hdr_ = value; }
 
   void
   add_to_rpath(const char* arg)
@@ -438,31 +479,42 @@ class General_options
   { this->rpath_link_.push_back(Search_directory(arg, false)); }
 
   void
-  set_shared()
-  { this->is_shared_ = true; }
+  set_shared(bool value)
+  { this->is_shared_ = value; }
 
   void
-  set_static()
-  { this->is_static_ = true; }
+  set_static(bool value)
+  { this->is_static_ = value; }
 
   void
-  set_stats()
-  { this->print_stats_ = true; }
+  set_stats(bool value)
+  { this->print_stats_ = value; }
 
   void
   set_sysroot(const char* arg)
   { this->sysroot_ = arg; }
 
   void
-  set_text_segment_address(const char* arg)
+  set_segment_address(const char* name, const char* arg, uint64_t* val)
   {
     char* endptr;
-    this->text_segment_address_ = strtoull(arg, &endptr, 0);
-    if (*endptr != '\0'
-       || this->text_segment_address_ == -1U)
-      gold_fatal(_("invalid argument to -Ttext: %s"), arg);
+    *val = strtoull(arg, &endptr, 0);
+    if (*endptr != '\0' || *val == -1U)
+      gold_fatal(_("invalid argument to %s: %s"), name, arg);
   }
 
+  void
+  set_Tbss(const char* arg)
+  { this->set_segment_address("-Tbss", arg, &this->bss_segment_address_); }
+
+  void
+  set_Tdata(const char* arg)
+  { this->set_segment_address("-Tdata", arg, &this->data_segment_address_); }
+
+  void
+  set_Ttext(const char* arg)
+  { this->set_segment_address("-Ttext", arg, &this->text_segment_address_); }
+
   int
   parse_thread_count(const char* arg)
   {
@@ -474,17 +526,18 @@ class General_options
   }
 
   void
-  set_threads()
+  set_threads(bool value)
   {
 #ifndef ENABLE_THREADS
-    gold_fatal(_("--threads not supported"));
+    if (value)
+      gold_fatal(_("--threads not supported"));
 #endif
-    this->threads_ = true;
+    this->threads_ = value;
   }
 
   void
-  clear_threads()
-  { this->threads_ = false; }
+  set_no_threads(bool value)
+  { this->set_threads(!value); }
 
   void
   set_thread_count(const char* arg)
@@ -512,13 +565,31 @@ class General_options
   { }
 
   void
-  set_execstack()
+  set_execstack(bool)
   { this->execstack_ = EXECSTACK_YES; }
 
   void
-  set_noexecstack()
+  set_noexecstack(bool)
   { this->execstack_ = EXECSTACK_NO; }
 
+  void
+  set_max_page_size(const char* arg)
+  {
+    char* endptr;
+    this->max_page_size_ = strtoull(arg, &endptr, 0);
+    if (*endptr != '\0' || this->max_page_size_ == 0)
+      gold_fatal(_("invalid max-page-size: %s"), arg);
+  }
+
+  void
+  set_common_page_size(const char* arg)
+  {
+    char* endptr;
+    this->common_page_size_ = strtoull(arg, &endptr, 0);
+    if (*endptr != '\0' || this->common_page_size_ == 0)
+      gold_fatal(_("invalid common-page-size: %s"), arg);
+  }
+
   void
   set_debug(unsigned int flags)
   { this->debug_ = flags; }
@@ -535,12 +606,15 @@ class General_options
   void
   add_sysroot();
 
+  const char* entry_;
   bool export_dynamic_;
   const char* soname_;
   const char* dynamic_linker_;
   Dir_list search_path_;
   int optimization_level_;
   const char* output_file_name_;
+  Object_format oformat_;
+  const char* oformat_string_;
   bool is_relocatable_;
   Strip strip_;
   bool allow_shlib_undefined_;
@@ -555,16 +629,17 @@ class General_options
   bool is_static_;
   bool print_stats_;
   std::string sysroot_;
+  uint64_t bss_segment_address_;
+  uint64_t data_segment_address_;
   uint64_t text_segment_address_;
   bool threads_;
   int thread_count_initial_;
   int thread_count_middle_;
   int thread_count_final_;
   Execstack execstack_;
+  uint64_t max_page_size_;
+  uint64_t common_page_size_;
   unsigned int debug_;
-  // Some options can also be set from linker scripts.  Those are
-  // stored here.
-  Script_options* script_options_;
 };
 
 // The current state of the position dependent options.
@@ -572,12 +647,14 @@ class General_options
 class Position_dependent_options
 {
  public:
+  typedef General_options::Object_format Object_format;
+
   Position_dependent_options();
 
   // -Bdynamic/-Bstatic: Whether we are searching for a static archive
   // -rather than a shared object.
   bool
-  do_static_search() const
+  Bstatic() const
   { return this->do_static_search_; }
 
   // --as-needed: Whether to add a DT_NEEDED argument only if the
@@ -589,37 +666,46 @@ class Position_dependent_options
   // --whole-archive: Whether to include the entire contents of an
   // --archive.
   bool
-  include_whole_archive() const
+  whole_archive() const
   { return this->include_whole_archive_; }
 
+  // --format: The format of the input file.
+  Object_format
+  format() const
+  { return this->input_format_; }
+
   void
-  set_static_search()
-  { this->do_static_search_ = true; }
+  set_Bstatic(bool value)
+  { this->do_static_search_ = value; }
 
   void
-  set_dynamic_search()
-  { this->do_static_search_ = false; }
+  set_Bdynamic(bool value)
+  { this->set_Bstatic(!value); }
 
   void
-  set_as_needed()
-  { this->as_needed_ = true; }
+  set_as_needed(bool value)
+  { this->as_needed_ = value; }
 
   void
-  clear_as_needed()
-  { this->as_needed_ = false; }
+  set_no_as_needed(bool value)
+  { this->set_as_needed(!value); }
 
   void
-  set_whole_archive()
-  { this->include_whole_archive_ = true; }
+  set_whole_archive(bool value)
+  { this->include_whole_archive_ = value; }
 
   void
-  clear_whole_archive()
-  { this->include_whole_archive_ = false; }
+  set_no_whole_archive(bool value)
+  { this->set_whole_archive(!value); }
+
+  void
+  set_format(const char*);
 
  private:
   bool do_static_search_;
   bool as_needed_;
   bool include_whole_archive_;
+  Object_format input_format_;
 };
 
 // A single file or library argument from the command line.
@@ -633,17 +719,20 @@ class Input_file_argument
   // extra_search_path: an extra directory to look for the file, prior
   //         to checking the normal library search path.  If this is "",
   //         then no extra directory is added.
+  // just_symbols: whether this file only defines symbols.
   // options: The position dependent options at this point in the
   //         command line, such as --whole-archive.
   Input_file_argument()
-    : name_(), is_lib_(false), extra_search_path_(""), options_()
+    : name_(), is_lib_(false), extra_search_path_(""), just_symbols_(false),
+      options_()
   { }
 
   Input_file_argument(const char* name, bool is_lib,
                       const char* extra_search_path,
+                     bool just_symbols,
                      const Position_dependent_options& options)
     : name_(name), is_lib_(is_lib), extra_search_path_(extra_search_path),
-      options_(options)
+      just_symbols_(just_symbols), options_(options)
   { }
 
   const char*
@@ -666,6 +755,11 @@ class Input_file_argument
            : this->extra_search_path_.c_str());
   }
 
+  // Return whether we should only read symbols from this file.
+  bool
+  just_symbols() const
+  { return this->just_symbols_; }
+
   // Return whether this file may require a search using the -L
   // options.
   bool
@@ -679,6 +773,7 @@ class Input_file_argument
   std::string name_;
   bool is_lib_;
   std::string extra_search_path_;
+  bool just_symbols_;
   Position_dependent_options options_;
 };
 
@@ -829,7 +924,7 @@ class Command_line
  public:
   typedef Input_arguments::const_iterator const_iterator;
 
-  Command_line(Script_options*);
+  Command_line();
 
   // Process the command line options.  This will exit with an
   // appropriate error message if an unrecognized option is seen.
@@ -845,6 +940,19 @@ class Command_line
   int
   process_l_option(int, char**, char*, bool);
 
+  // Handle a -R option when it means --rpath.
+  void
+  add_to_rpath(const char* arg)
+  { this->options_.add_to_rpath(arg); }
+
+  // Add a file for which we just read the symbols.
+  void
+  add_just_symbols_file(const char* arg)
+  {
+    this->inputs_.add_file(Input_file_argument(arg, false, "", true,
+                                              this->position_options_));
+  }
+
   // Handle a --start-group option.
   void
   start_group(const char* arg);
@@ -869,14 +977,15 @@ class Command_line
   position_dependent_options() const
   { return this->position_options_; }
 
-  // Get the options which may be set from a linker script.
-  Script_options*
+  // Get the linker-script options.
+  Script_options&
   script_options()
-  { return this->options_.script_options(); }
+  { return this->script_options_; }
 
-  const Script_options*
-  script_options() const
-  { return this->options_.script_options(); }
+  // Get the version-script options: a convenience routine.
+  const Version_script_info&
+  version_script() const
+  { return *this->script_options_.version_script_info(); }
 
   // The number of input files.
   int
@@ -920,6 +1029,7 @@ class Command_line
 
   General_options options_;
   Position_dependent_options position_options_;
+  Script_options script_options_;
   Input_arguments inputs_;
 };