OSDN Git Service

PR 10980
[pf3gnuchains/pf3gnuchains3x.git] / gold / options.h
index 7f5a561..8f26208 100644 (file)
@@ -1,6 +1,6 @@
 // options.h -- handle command line options for gold  -*- C++ -*-
 
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -37,6 +37,7 @@
 #define GOLD_OPTIONS_H
 
 #include <cstdlib>
+#include <cstring>
 #include <list>
 #include <string>
 #include <vector>
@@ -53,6 +54,19 @@ class Search_directory;
 class Input_file_group;
 class Position_dependent_options;
 class Target;
+class Plugin_manager;
+
+// Incremental build action for a specific file, as selected by the user.
+
+enum Incremental_disposition
+{
+  // Determine the status from the timestamp (default).
+  INCREMENTAL_CHECK,
+  // Assume the file changed from the previous build.
+  INCREMENTAL_CHANGED,
+  // Assume the file didn't change from the previous build.
+  INCREMENTAL_UNCHANGED
+};
 
 // The nested namespace is to contain all the global variables and
 // structs that need to be defined in the .h file, but do not need to
@@ -60,6 +74,7 @@ class Target;
 namespace options
 {
 typedef std::vector<Search_directory> Dir_list;
+typedef Unordered_set<std::string> String_set;
 
 // These routines convert from a string option to various types.
 // Each gives a fatal error if it cannot parse the argument.
@@ -68,18 +83,31 @@ extern void
 parse_bool(const char* option_name, const char* arg, bool* retval);
 
 extern void
+parse_int(const char* option_name, const char* arg, int* retval);
+
+extern void
 parse_uint(const char* option_name, const char* arg, int* retval);
 
 extern void
-parse_uint64(const char* option_name, const char* arg, uint64_t *retval);
+parse_uint64(const char* option_name, const char* arg, uint64_t* retval);
+
+extern void
+parse_double(const char* option_name, const char* arg, double* retval);
 
 extern void
 parse_string(const char* option_name, const char* arg, const char** retval);
 
 extern void
+parse_optional_string(const char* option_name, const char* arg,
+                     const char** retval);
+
+extern void
 parse_dirlist(const char* option_name, const char* arg, Dir_list* retval);
 
 extern void
+parse_set(const char* option_name, const char* arg, String_set* retval);
+
+extern void
 parse_choices(const char* option_name, const char* arg, const char** retval,
               const char* choices[], int num_choices);
 
@@ -110,6 +138,9 @@ enum Dashes
 // HELPARG is how you define the argument to the option.
 //    --help output is "-shortname HELPARG, --longname HELPARG: HELPSTRING"
 //    HELPARG should be NULL iff the option is a bool and takes no arg.
+// OPTIONAL_ARG is true if this option takes an optional argument.  An
+//    optional argument must be specifid as --OPTION=VALUE, not
+//    --OPTION VALUE.
 // READER provides parse_to_value, which is a function that will convert
 //    a char* argument into the proper type and store it in some variable.
 // A One_option struct initializes itself with the global list of options
@@ -122,12 +153,13 @@ struct One_option
   const char* default_value;
   const char* helpstring;
   const char* helparg;
+  bool optional_arg;
   Struct_var* reader;
 
   One_option(const char* ln, Dashes d, char sn, const char* dv,
-             const char* hs, const char* ha, Struct_var* r)
+             const char* hs, const char* ha, bool oa, Struct_var* r)
     : longname(ln), dashes(d), shortname(sn), default_value(dv ? dv : ""),
-      helpstring(hs), helparg(ha), reader(r)
+      helpstring(hs), helparg(ha), optional_arg(oa), reader(r)
   {
     // In longname, we convert all underscores to dashes, since GNU
     // style uses dashes in option names.  longname is likely to have
@@ -149,6 +181,11 @@ struct One_option
   takes_argument() const
   { return this->helparg != NULL; }
 
+  // Whether the argument is optional.
+  bool
+  takes_optional_argument() const
+  { return this->optional_arg; }
+
   // Register this option with the global list of options.
   void
   register_option();
@@ -186,7 +223,7 @@ struct Struct_special : public Struct_var
   Struct_special(const char* varname, Dashes dashes, char shortname,
                  Parse_function parse_function,
                  const char* helpstring, const char* helparg)
-    : option(varname, dashes, shortname, "", helpstring, helparg, this),
+    : option(varname, dashes, shortname, "", helpstring, helparg, false, this),
       parse(parse_function)
   { }
 
@@ -208,7 +245,7 @@ struct Struct_special : public Struct_var
 // type__ for built-in types, and "const type__ &" otherwise.
 #define DEFINE_var(varname__, dashes__, shortname__, default_value__,        \
                    default_value_as_string__, helpstring__, helparg__,       \
-                   type__, param_type__, parse_fn__)                         \
+                   optional_arg__, type__, param_type__, parse_fn__)        \
  public:                                                                     \
   param_type__                                                               \
   varname__() const                                                          \
@@ -218,12 +255,16 @@ struct Struct_special : public Struct_var
   user_set_##varname__() const                                               \
   { return this->varname__##_.user_set_via_option; }                         \
                                                                              \
+  void                                                                      \
+  set_user_set_##varname__()                                                \
+  { this->varname__##_.user_set_via_option = true; }                        \
+                                                                            \
  private:                                                                    \
   struct Struct_##varname__ : public options::Struct_var                     \
   {                                                                          \
     Struct_##varname__()                                                     \
       : option(#varname__, dashes__, shortname__, default_value_as_string__, \
-               helpstring__, helparg__, this),                               \
+               helpstring__, helparg__, optional_arg__, this),              \
         user_set_via_option(false), value(default_value__)                   \
     { }                                                                      \
                                                                              \
@@ -247,17 +288,21 @@ struct Struct_special : public Struct_var
 // These macros allow for easy addition of a new commandline option.
 
 // If no_helpstring__ is not NULL, then in addition to creating
-// VARNAME, we also create an option called no-VARNAME.
+// VARNAME, we also create an option called no-VARNAME (or, for a -z
+// option, noVARNAME).
 #define DEFINE_bool(varname__, dashes__, shortname__, default_value__,   \
                     helpstring__, no_helpstring__)                       \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
              default_value__ ? "true" : "false", helpstring__, NULL,     \
-             bool, bool, options::parse_bool)                            \
+             false, bool, bool, options::parse_bool)                    \
   struct Struct_no_##varname__ : public options::Struct_var              \
   {                                                                      \
-    Struct_no_##varname__() : option("no-" #varname__, dashes__, '\0',   \
+    Struct_no_##varname__() : option((dashes__ == options::DASH_Z       \
+                                     ? "no" #varname__                  \
+                                     : "no-" #varname__),               \
+                                    dashes__, '\0',                     \
                                      default_value__ ? "false" : "true", \
-                                     no_helpstring__, NULL, this)        \
+                                     no_helpstring__, NULL, false, this) \
     { }                                                                  \
                                                                          \
     void                                                                 \
@@ -269,22 +314,56 @@ struct Struct_special : public Struct_var
   };                                                                     \
   Struct_no_##varname__ no_##varname__##_initializer_
 
+#define DEFINE_enable(varname__, dashes__, shortname__, default_value__, \
+                      helpstring__, no_helpstring__)                     \
+  DEFINE_var(enable_##varname__, dashes__, shortname__, default_value__, \
+             default_value__ ? "true" : "false", helpstring__, NULL,     \
+             false, bool, bool, options::parse_bool)                    \
+  struct Struct_disable_##varname__ : public options::Struct_var         \
+  {                                                                      \
+    Struct_disable_##varname__() : option("disable-" #varname__,         \
+                                     dashes__, '\0',                     \
+                                     default_value__ ? "false" : "true", \
+                                     no_helpstring__, NULL, false, this) \
+    { }                                                                  \
+                                                                         \
+    void                                                                 \
+    parse_to_value(const char*, const char*,                             \
+                   Command_line*, General_options* options)              \
+    { options->set_enable_##varname__(false); }                          \
+                                                                         \
+    options::One_option option;                                          \
+  };                                                                     \
+  Struct_disable_##varname__ disable_##varname__##_initializer_
+
+#define DEFINE_int(varname__, dashes__, shortname__, default_value__,   \
+                   helpstring__, helparg__)                             \
+  DEFINE_var(varname__, dashes__, shortname__, default_value__,         \
+             #default_value__, helpstring__, helparg__, false,         \
+             int, int, options::parse_int)
+
 #define DEFINE_uint(varname__, dashes__, shortname__, default_value__,  \
                    helpstring__, helparg__)                             \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,         \
-             #default_value__, helpstring__, helparg__,                 \
+             #default_value__, helpstring__, helparg__, false,         \
              int, int, options::parse_uint)
 
 #define DEFINE_uint64(varname__, dashes__, shortname__, default_value__, \
                       helpstring__, helparg__)                           \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             #default_value__, helpstring__, helparg__,                  \
+             #default_value__, helpstring__, helparg__, false,          \
              uint64_t, uint64_t, options::parse_uint64)
 
+#define DEFINE_double(varname__, dashes__, shortname__, default_value__, \
+                     helpstring__, helparg__)                           \
+  DEFINE_var(varname__, dashes__, shortname__, default_value__,                 \
+            #default_value__, helpstring__, helparg__, false,           \
+            double, double, options::parse_double)
+
 #define DEFINE_string(varname__, dashes__, shortname__, default_value__, \
                       helpstring__, helparg__)                           \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             default_value__, helpstring__, helparg__,                   \
+             default_value__, helpstring__, helparg__, false,           \
              const char*, const char*, options::parse_string)
 
 // This is like DEFINE_string, but we convert each occurrence to a
@@ -293,7 +372,7 @@ struct Struct_special : public Struct_var
 #define DEFINE_dirlist(varname__, dashes__, shortname__,                  \
                            helpstring__, helparg__)                       \
   DEFINE_var(varname__, dashes__, shortname__, ,                          \
-             "", helpstring__, helparg__, options::Dir_list,              \
+             "", helpstring__, helparg__, false, options::Dir_list,      \
              const options::Dir_list&, options::parse_dirlist)            \
   void                                                                    \
   add_to_##varname__(const char* new_value)                               \
@@ -302,13 +381,40 @@ struct Struct_special : public Struct_var
   add_search_directory_to_##varname__(const Search_directory& dir)        \
   { this->varname__##_.value.push_back(dir); }
 
+// This is like DEFINE_string, but we store a set of strings.
+#define DEFINE_set(varname__, dashes__, shortname__,                      \
+                   helpstring__, helparg__)                               \
+  DEFINE_var(varname__, dashes__, shortname__, ,                          \
+             "", helpstring__, helparg__, false, options::String_set,     \
+             const options::String_set&, options::parse_set)              \
+ public:                                                                  \
+  bool                                                                    \
+  any_##varname__() const                                                 \
+  { return !this->varname__##_.value.empty(); }                           \
+                                                                         \
+  bool                                                                    \
+  is_##varname__(const char* symbol) const                                \
+  {                                                                       \
+    return (!this->varname__##_.value.empty()                             \
+            && (this->varname__##_.value.find(std::string(symbol))        \
+                != this->varname__##_.value.end()));                      \
+  }                                                                      \
+                                                                         \
+  options::String_set::const_iterator                                    \
+  varname__##_begin() const                                              \
+  { return this->varname__##_.value.begin(); }                           \
+                                                                         \
+  options::String_set::const_iterator                                    \
+  varname__##_end() const                                                \
+  { return this->varname__##_.value.end(); }
+
 // When you have a list of possible values (expressed as string)
 // After helparg__ should come an initializer list, like
 //   {"foo", "bar", "baz"}
 #define DEFINE_enum(varname__, dashes__, shortname__, default_value__,   \
                     helpstring__, helparg__, ...)                        \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             default_value__, helpstring__, helparg__,                   \
+             default_value__, helpstring__, helparg__, false,           \
              const char*, const char*, parse_choices_##varname__)        \
  private:                                                                \
   static void parse_choices_##varname__(const char* option_name,         \
@@ -319,6 +425,53 @@ struct Struct_special : public Struct_var
                            choices, sizeof(choices) / sizeof(*choices)); \
   }
 
+// This is like DEFINE_bool, but VARNAME is the name of a different
+// option.  This option becomes an alias for that one.  INVERT is true
+// if this option is an inversion of the other one.
+#define DEFINE_bool_alias(option__, varname__, dashes__, shortname__,  \
+                         helpstring__, no_helpstring__, invert__)      \
+ private:                                                              \
+  struct Struct_##option__ : public options::Struct_var                        \
+  {                                                                    \
+    Struct_##option__()                                                        \
+      : option(#option__, dashes__, shortname__, "", helpstring__,     \
+              NULL, false, this)                                       \
+    { }                                                                        \
+                                                                       \
+    void                                                               \
+    parse_to_value(const char*, const char*,                           \
+                  Command_line*, General_options* options)             \
+    {                                                                  \
+      options->set_##varname__(!invert__);                             \
+      options->set_user_set_##varname__();                             \
+    }                                                                  \
+                                                                       \
+    options::One_option option;                                                \
+  };                                                                   \
+  Struct_##option__ option__##_;                                       \
+                                                                       \
+  struct Struct_no_##option__ : public options::Struct_var             \
+  {                                                                    \
+    Struct_no_##option__()                                             \
+      : option((dashes__ == options::DASH_Z                            \
+               ? "no" #option__                                        \
+               : "no-" #option__),                                     \
+              dashes__, '\0', "", no_helpstring__,                     \
+              NULL, false, this)                                       \
+    { }                                                                        \
+                                                                       \
+    void                                                               \
+    parse_to_value(const char*, const char*,                           \
+                  Command_line*, General_options* options)             \
+    {                                                                  \
+      options->set_##varname__(invert__);                              \
+      options->set_user_set_##varname__();                             \
+    }                                                                  \
+                                                                       \
+    options::One_option option;                                                \
+  };                                                                   \
+  Struct_no_##option__ no_##option__##_initializer_
+
 // This is used for non-standard flags.  It defines no functions; it
 // just calls General_options::parse_VARNAME whenever the flag is
 // seen.  We declare parse_VARNAME as a static member of
@@ -339,6 +492,15 @@ struct Struct_special : public Struct_var
   };                                                                    \
   Struct_##varname__ varname__##_initializer_
 
+// An option that takes an optional string argument.  If the option is
+// used with no argument, the value will be the default, and
+// user_set_via_option will be true.
+#define DEFINE_optional_string(varname__, dashes__, shortname__,       \
+                              default_value__,                         \
+                              helpstring__, helparg__)                 \
+  DEFINE_var(varname__, dashes__, shortname__, default_value__,                \
+             default_value__, helpstring__, helparg__, true,           \
+             const char*, const char*, options::parse_optional_string)
 
 // A directory to search.  For each directory we record whether it is
 // in the sysroot.  We need to know this so that, if a linker script
@@ -381,9 +543,22 @@ class Search_directory
   is_in_sysroot() const
   { return this->is_in_sysroot_; }
 
+  // Return whether this is considered a system directory.
+  bool
+  is_system_directory() const
+  { return this->put_in_sysroot_ || this->is_in_sysroot_; }
+
  private:
+  // The directory name.
   std::string name_;
+  // True if the sysroot should be added as a prefix for this
+  // directory (if there is a sysroot).  This is true for system
+  // directories that we search by default.
   bool put_in_sysroot_;
+  // True if this directory is in the sysroot (if there is a sysroot).
+  // This is true if there is a sysroot and either 1) put_in_sysroot_
+  // is true, or 2) the directory happens to be in the sysroot based
+  // on a pathname comparison.
   bool is_in_sysroot_;
 };
 
@@ -393,196 +568,454 @@ class General_options
   // NOTE: For every option that you add here, also consider if you
   // should add it to Position_dependent_options.
   DEFINE_special(help, options::TWO_DASHES, '\0',
-                 _("Report usage information"), NULL);
+                 N_("Report usage information"), NULL);
   DEFINE_special(version, options::TWO_DASHES, 'v',
-                 _("Report version information"), NULL);
+                 N_("Report version information"), NULL);
+  DEFINE_special(V, options::EXACTLY_ONE_DASH, '\0',
+                 N_("Report version and target information"), NULL);
+
+  // These options are sorted approximately so that for each letter in
+  // the alphabet, we show the option whose shortname is that letter
+  // (if any) and then every longname that starts with that letter (in
+  // alphabetical order).  For both, lowercase sorts before uppercase.
+  // The -z options come last.
 
   DEFINE_bool(allow_shlib_undefined, options::TWO_DASHES, '\0', false,
-              _("Allow unresolved references in shared libraries"),
-              _("Do not allow unresolved references in shared libraries"));
+              N_("Allow unresolved references in shared libraries"),
+              N_("Do not allow unresolved references in shared libraries"));
 
   DEFINE_bool(as_needed, options::TWO_DASHES, '\0', false,
-              _("Only set DT_NEEDED for dynamic libs if used"),
-              _("Always DT_NEEDED for dynamic libs"));
+              N_("Only set DT_NEEDED for dynamic libs if used"),
+              N_("Always DT_NEEDED for dynamic libs"));
+
+  DEFINE_enum(assert, options::ONE_DASH, '\0', NULL,
+             N_("Ignored"), N_("[ignored]"),
+             {"definitions", "nodefinitions", "nosymbolic", "pure-text"});
+
+  // This should really be an "enum", but it's too easy for folks to
+  // forget to update the list as they add new targets.  So we just
+  // accept any string.  We'll fail later (when the string is parsed),
+  // if the target isn't actually supported.
+  DEFINE_string(format, options::TWO_DASHES, 'b', "elf",
+                N_("Set input format"), ("[elf,binary]"));
 
   DEFINE_bool(Bdynamic, options::ONE_DASH, '\0', true,
-              _("-l searches for shared libraries"), NULL);
-  // Bstatic affects the same variable as Bdynamic, so we have to use
-  // the "special" macro to make that happen.
-  DEFINE_special(Bstatic, options::ONE_DASH, '\0',
-                 _("-l does not search for shared libraries"), NULL);
+              N_("-l searches for shared libraries"), NULL);
+  DEFINE_bool_alias(Bstatic, Bdynamic, options::ONE_DASH, '\0',
+                   N_("-l does not search for shared libraries"), NULL,
+                   true);
 
   DEFINE_bool(Bsymbolic, options::ONE_DASH, '\0', false,
-              _("Bind defined symbols locally"), NULL);
+              N_("Bind defined symbols locally"), NULL);
+
+  DEFINE_bool(Bsymbolic_functions, options::ONE_DASH, '\0', false,
+             N_("Bind defined function symbols locally"), NULL);
 
-  DEFINE_enum(format, options::TWO_DASHES, 'b', "elf",
-              _("Set input format"), _("[elf,binary]"),
-              {"elf", "binary",
-               "elf32-i386", "elf32-little", "elf32-big",
-               "elf64-x86_64", "elf64-little", "elf64-big"});
+  DEFINE_optional_string(build_id, options::TWO_DASHES, '\0', "sha1",
+                        N_("Generate build ID note"),
+                        N_("[=STYLE]"));
+
+  DEFINE_bool(check_sections, options::TWO_DASHES, '\0', true,
+             N_("Check segment addresses for overlaps (default)"),
+             N_("Do not check segment addresses for overlaps"));
 
 #ifdef HAVE_ZLIB_H
   DEFINE_enum(compress_debug_sections, options::TWO_DASHES, '\0', "none",
-              _("Compress .debug_* sections in the output file"),
-              _("[none,zlib]"),
+              N_("Compress .debug_* sections in the output file"),
+              ("[none,zlib]"),
               {"none", "zlib"});
 #else
   DEFINE_enum(compress_debug_sections, options::TWO_DASHES, '\0', "none",
-              _("Compress .debug_* sections in the output file"),
-              _("[none]"),
+              N_("Compress .debug_* sections in the output file"),
+              N_("[none]"),
               {"none"});
 #endif
 
   DEFINE_bool(define_common, options::TWO_DASHES, 'd', false,
-              _("Define common symbols"),
-              _("Do not define common symbols"));
+              N_("Define common symbols"),
+              N_("Do not define common symbols"));
   DEFINE_bool(dc, options::ONE_DASH, '\0', false,
-              _("Alias for -d"), NULL);
+              N_("Alias for -d"), NULL);
   DEFINE_bool(dp, options::ONE_DASH, '\0', false,
-              _("Alias for -d"), NULL);
+              N_("Alias for -d"), NULL);
+
+  DEFINE_string(debug, options::TWO_DASHES, '\0', "",
+                N_("Turn on debugging"),
+                N_("[all,files,script,task][,...]"));
 
   DEFINE_special(defsym, options::TWO_DASHES, '\0',
-                 _("Define a symbol"), _("SYMBOL=EXPRESSION"));
+                 N_("Define a symbol"), N_("SYMBOL=EXPRESSION"));
+
+  DEFINE_optional_string(demangle, options::TWO_DASHES, '\0', NULL,
+                        N_("Demangle C++ symbols in log messages"),
+                        N_("[=STYLE]"));
 
-  DEFINE_bool(demangle, options::TWO_DASHES, '\0',
-              getenv("COLLECT_NO_DEMANGLE") == NULL,
-              _("Demangle C++ symbols in log messages"),
-              _("Do not demangle C++ symbols in log messages"));
+  DEFINE_bool(no_demangle, options::TWO_DASHES, '\0', false,
+             N_("Do not demangle C++ symbols in log messages"),
+             NULL);
 
   DEFINE_bool(detect_odr_violations, options::TWO_DASHES, '\0', false,
-              _("Try to detect violations of the One Definition Rule"),
+              N_("Try to detect violations of the One Definition Rule"),
               NULL);
 
+  DEFINE_bool(discard_all, options::TWO_DASHES, 'x', false,
+             N_("Delete all local symbols"), NULL);
+  DEFINE_bool(discard_locals, options::TWO_DASHES, 'X', false,
+              N_("Delete all temporary local symbols"), NULL);
+
+  DEFINE_bool(dynamic_list_data, options::TWO_DASHES, '\0', false,
+              N_("Add data symbols to dynamic symbols"), NULL);
+
+  DEFINE_bool(dynamic_list_cpp_new, options::TWO_DASHES, '\0', false,
+              N_("Add C++ operator new/delete to dynamic symbols"), NULL);
+
+  DEFINE_bool(dynamic_list_cpp_typeinfo, options::TWO_DASHES, '\0', false,
+              N_("Add C++ typeinfo to dynamic symbols"), NULL);
+
+  DEFINE_special(dynamic_list, options::TWO_DASHES, '\0',
+                 N_("Read a list of dynamic symbols"), N_("FILE"));
+
   DEFINE_string(entry, options::TWO_DASHES, 'e', NULL,
-                _("Set program start address"), _("ADDRESS"));
+                N_("Set program start address"), N_("ADDRESS"));
+
+  DEFINE_special(exclude_libs, options::TWO_DASHES, '\0',
+                N_("Exclude libraries from automatic export"),
+                N_(("lib,lib ...")));
 
   DEFINE_bool(export_dynamic, options::TWO_DASHES, 'E', false,
-              _("Export all dynamic symbols"), NULL);
+              N_("Export all dynamic symbols"),
+             N_("Do not export all dynamic symbols (default)"));
 
   DEFINE_bool(eh_frame_hdr, options::TWO_DASHES, '\0', false,
-              _("Create exception frame header"), NULL);
+              N_("Create exception frame header"), NULL);
+
+  DEFINE_bool(fatal_warnings, options::TWO_DASHES, '\0', false,
+             N_("Treat warnings as errors"),
+             N_("Do not treat warnings as errors"));
+
+  DEFINE_string(fini, options::ONE_DASH, '\0', "_fini",
+                N_("Call SYMBOL at unload-time"), N_("SYMBOL"));
+
+  DEFINE_bool(g, options::EXACTLY_ONE_DASH, '\0', false,
+             N_("Ignored"), NULL);
 
   DEFINE_string(soname, options::ONE_DASH, 'h', NULL,
-                _("Set shared library name"), _("FILENAME"));
+                N_("Set shared library name"), N_("FILENAME"));
+
+  DEFINE_bool(i, options::EXACTLY_ONE_DASH, '\0', false,
+             N_("Ignored"), NULL);
+
+  DEFINE_double(hash_bucket_empty_fraction, options::TWO_DASHES, '\0', 0.0,
+               N_("Min fraction of empty buckets in dynamic hash"),
+               N_("FRACTION"));
 
   DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "sysv",
-             _("Dynamic hash style"), _("[sysv,gnu,both]"),
+             N_("Dynamic hash style"), N_("[sysv,gnu,both]"),
              {"sysv", "gnu", "both"});
 
   DEFINE_string(dynamic_linker, options::TWO_DASHES, 'I', NULL,
-                _("Set dynamic linker path"), _("PROGRAM"));
+                N_("Set dynamic linker path"), N_("PROGRAM"));
+
+  DEFINE_bool(incremental, options::TWO_DASHES, '\0', false,
+              N_("Work in progress; do not use"),
+              N_("Do a full build"));
+
+  DEFINE_special(incremental_changed, options::TWO_DASHES, '\0',
+                 N_("Assume files changed"), NULL);
+
+  DEFINE_special(incremental_unchanged, options::TWO_DASHES, '\0',
+                 N_("Assume files didn't change"), NULL);
+
+  DEFINE_special(incremental_unknown, options::TWO_DASHES, '\0',
+                 N_("Use timestamps to check files (default)"), NULL);
+
+  DEFINE_string(init, options::ONE_DASH, '\0', "_init",
+                N_("Call SYMBOL at load-time"), N_("SYMBOL"));
+
+  DEFINE_special(just_symbols, options::TWO_DASHES, '\0',
+                 N_("Read only symbol values from FILE"), N_("FILE"));
+
+  DEFINE_bool(keep_files_mapped, options::TWO_DASHES, '\0',
+             sizeof(void*) >= 8,
+              N_("Map whole files to memory (default on 64-bit hosts)"),
+              N_("Map relevant file parts to memory (default on 32-bit "
+                 "hosts)"));
 
   DEFINE_special(library, options::TWO_DASHES, 'l',
-                 _("Search for library LIBNAME"), _("LIBNAME"));
+                 N_("Search for library LIBNAME"), N_("LIBNAME"));
 
   DEFINE_dirlist(library_path, options::TWO_DASHES, 'L',
-                 _("Add directory to search path"), _("DIR"));
+                 N_("Add directory to search path"), N_("DIR"));
 
   DEFINE_string(m, options::EXACTLY_ONE_DASH, 'm', "",
-                _("Ignored for compatibility"), _("EMULATION"));
+                N_("Ignored for compatibility"), N_("EMULATION"));
+
+  DEFINE_bool(print_map, options::TWO_DASHES, 'M', false,
+             N_("Write map file on standard output"), NULL);
+  DEFINE_string(Map, options::ONE_DASH, '\0', NULL, N_("Write map file"),
+               N_("MAPFILENAME"));
+
+  DEFINE_bool(nmagic, options::TWO_DASHES, 'n', false,
+             N_("Do not page align data"), NULL);
+  DEFINE_bool(omagic, options::EXACTLY_TWO_DASHES, 'N', false,
+             N_("Do not page align data, do not make text readonly"),
+             N_("Page align data, make text readonly"));
+
+  DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
+               N_("Enable use of DT_RUNPATH and DT_FLAGS"),
+               N_("Disable use of DT_RUNPATH and DT_FLAGS"));
+
+  DEFINE_bool(noinhibit_exec, options::TWO_DASHES, '\0', false,
+             N_("Create an output file even if errors occur"), NULL);
+
+  DEFINE_bool_alias(no_undefined, defs, options::TWO_DASHES, '\0',
+                   N_("Report undefined symbols (even with --shared)"),
+                   NULL, false);
 
   DEFINE_string(output, options::TWO_DASHES, 'o', "a.out",
-                _("Set output file name"), _("FILE"));
+                N_("Set output file name"), N_("FILE"));
 
   DEFINE_uint(optimize, options::EXACTLY_ONE_DASH, 'O', 0,
-              _("Optimize output file size"), _("LEVEL"));
+              N_("Optimize output file size"), N_("LEVEL"));
+
+  DEFINE_string(oformat, options::EXACTLY_TWO_DASHES, '\0', "elf",
+               N_("Set output format"), N_("[binary]"));
+
+  DEFINE_bool(pie, options::ONE_DASH, '\0', false,
+             N_("Create a position independent executable"), NULL);
+  DEFINE_bool_alias(pic_executable, pie, options::TWO_DASHES, '\0',
+                   N_("Create a position independent executable"), NULL,
+                   false);
+
+#ifdef ENABLE_PLUGINS
+  DEFINE_special(plugin, options::TWO_DASHES, '\0',
+                 N_("Load a plugin library"), N_("PLUGIN"));
+  DEFINE_special(plugin_opt, options::TWO_DASHES, '\0',
+                 N_("Pass an option to the plugin"), N_("OPTION"));
+#endif
+
+  DEFINE_bool(preread_archive_symbols, options::TWO_DASHES, '\0', false,
+              N_("Preread archive symbols when multi-threaded"), NULL);
+
+  DEFINE_string(print_symbol_counts, options::TWO_DASHES, '\0', NULL,
+               N_("Print symbols defined and used for each input"),
+               N_("FILENAME"));
 
-  DEFINE_enum(oformat, options::EXACTLY_TWO_DASHES, '\0', "elf",
-              _("Set output format"), _("[binary]"),
-              {"elf", "binary"});
+  DEFINE_bool(Qy, options::EXACTLY_ONE_DASH, '\0', false,
+             N_("Ignored for SVR4 compatibility"), NULL);
 
   DEFINE_bool(emit_relocs, options::TWO_DASHES, 'q', false,
-              _("Generate relocations in output"), NULL);
+              N_("Generate relocations in output"), NULL);
 
   DEFINE_bool(relocatable, options::EXACTLY_ONE_DASH, 'r', false,
-              _("Generate relocatable output"), NULL);
+              N_("Generate relocatable output"), NULL);
+
+  DEFINE_bool(relax, options::TWO_DASHES, '\0', false,
+             N_("Relax branches on certain targets"), NULL);
+
+  DEFINE_string(retain_symbols_file, options::TWO_DASHES, '\0', NULL,
+                N_("keep only symbols listed in this file"), N_("FILE"));
 
   // -R really means -rpath, but can mean --just-symbols for
   // compatibility with GNU ld.  -rpath is always -rpath, so we list
   // it separately.
   DEFINE_special(R, options::EXACTLY_ONE_DASH, 'R',
-                 _("Add DIR to runtime search path"), _("DIR"));
+                 N_("Add DIR to runtime search path"), N_("DIR"));
 
   DEFINE_dirlist(rpath, options::ONE_DASH, '\0',
-                 _("Add DIR to runtime search path"), _("DIR"));
-
-  DEFINE_special(just_symbols, options::TWO_DASHES, '\0',
-                 _("Read only symbol values from FILE"), _("FILE"));
+                 N_("Add DIR to runtime search path"), N_("DIR"));
 
   DEFINE_dirlist(rpath_link, options::TWO_DASHES, '\0',
-                 _("Add DIR to link time shared library search path"),
-                 _("DIR"));
+                 N_("Add DIR to link time shared library search path"),
+                 N_("DIR"));
+
+  DEFINE_optional_string(sort_common, options::TWO_DASHES, '\0', NULL,
+                        N_("Sort common symbols by alignment"),
+                        N_("[={ascending,descending}]"));
 
   DEFINE_bool(strip_all, options::TWO_DASHES, 's', false,
-              _("Strip all symbols"), NULL);
+              N_("Strip all symbols"), NULL);
+  DEFINE_bool(strip_debug, options::TWO_DASHES, 'S', false,
+              N_("Strip debugging information"), NULL);
+  DEFINE_bool(strip_debug_non_line, options::TWO_DASHES, '\0', false,
+              N_("Emit only debug line number information"), NULL);
   DEFINE_bool(strip_debug_gdb, options::TWO_DASHES, '\0', false,
-              _("Strip debug symbols that are unused by gdb "
+              N_("Strip debug symbols that are unused by gdb "
                  "(at least versions <= 6.7)"), NULL);
-  DEFINE_bool(strip_debug, options::TWO_DASHES, 'S', false,
-              _("Strip debugging information"), NULL);
+  DEFINE_bool(strip_lto_sections, options::TWO_DASHES, '\0', true,
+              N_("Strip LTO intermediate code sections"), NULL);
 
-  DEFINE_bool(shared, options::ONE_DASH, '\0', false,
-              _("Generate shared library"), NULL);
+  DEFINE_int(stub_group_size, options::TWO_DASHES , '\0', 1,
+             N_("(ARM only) The maximum distance from instructions in a group "
+               "of sections to their stubs.  Negative values mean stubs "
+               "are always after the group. 1 means using default size.\n"),
+            N_("SIZE"));
+
+  DEFINE_bool(no_keep_memory, options::TWO_DASHES, '\0', false,
+              N_("Use less memory and more disk I/O "
+                 "(included only for compatibility with GNU ld)"), NULL);
+
+  DEFINE_bool(shared, options::ONE_DASH, 'G', false,
+              N_("Generate shared library"), NULL);
+
+  DEFINE_bool(Bshareable, options::ONE_DASH, '\0', false,
+              N_("Generate shared library"), NULL);
+
+  DEFINE_uint(split_stack_adjust_size, options::TWO_DASHES, '\0', 0x4000,
+             N_("Stack size when -fsplit-stack function calls non-split"),
+             N_("SIZE"));
 
   // This is not actually special in any way, but I need to give it
   // a non-standard accessor-function name because 'static' is a keyword.
   DEFINE_special(static, options::ONE_DASH, '\0',
-                 _("Do not link against shared libraries"), NULL);
+                 N_("Do not link against shared libraries"), NULL);
+
+  DEFINE_enum(icf, options::TWO_DASHES, '\0', "none",
+              N_("Identical Code Folding. "
+                 "\'--icf=safe\' folds only ctors and dtors."),
+             ("[none,all,safe]"),      
+              {"none", "all", "safe"});
+
+  DEFINE_uint(icf_iterations, options::TWO_DASHES , '\0', 0,
+              N_("Number of iterations of ICF (default 2)"), N_("COUNT"));
+
+  DEFINE_bool(print_icf_sections, options::TWO_DASHES, '\0', false,
+              N_("List folded identical sections on stderr"),
+              N_("Do not list folded identical sections"));
+
+  DEFINE_set(keep_unique, options::TWO_DASHES, '\0',
+            N_("Do not fold this symbol during ICF"), N_("SYMBOL"));
+
+  DEFINE_bool(gc_sections, options::TWO_DASHES, '\0', false,
+              N_("Remove unused sections"),
+              N_("Don't remove unused sections (default)"));
+
+  DEFINE_bool(print_gc_sections, options::TWO_DASHES, '\0', false,
+              N_("List removed unused sections on stderr"),
+              N_("Do not list removed unused sections"));
 
   DEFINE_bool(stats, options::TWO_DASHES, '\0', false,
-              _("Print resource usage statistics"), NULL);
+              N_("Print resource usage statistics"), NULL);
 
   DEFINE_string(sysroot, options::TWO_DASHES, '\0', "",
-                _("Set target system root directory"), _("DIR"));
+                N_("Set target system root directory"), N_("DIR"));
 
-  DEFINE_uint64(Tbss, options::ONE_DASH, '\0', -1U,
-                _("Set the address of the bss segment"), _("ADDRESS"));
-  DEFINE_uint64(Tdata, options::ONE_DASH, '\0', -1U,
-                _("Set the address of the data segment"), _("ADDRESS"));
-  DEFINE_uint64(Ttext, options::ONE_DASH, '\0', -1U,
-                _("Set the address of the text segment"), _("ADDRESS"));
+  DEFINE_bool(trace, options::TWO_DASHES, 't', false,
+              N_("Print the name of each input file"), NULL);
 
   DEFINE_special(script, options::TWO_DASHES, 'T',
-                 _("Read linker script"), _("FILE"));
-  DEFINE_special(version_script, options::TWO_DASHES, '\0',
-                 _("Read version script"), _("FILE"));
+                 N_("Read linker script"), N_("FILE"));
 
   DEFINE_bool(threads, options::TWO_DASHES, '\0', false,
-              _("Run the linker multi-threaded"),
-              _("Do not run the linker multi-threaded"));
+              N_("Run the linker multi-threaded"),
+              N_("Do not run the linker multi-threaded"));
   DEFINE_uint(thread_count, options::TWO_DASHES, '\0', 0,
-              _("Number of threads to use"), _("COUNT"));
+              N_("Number of threads to use"), N_("COUNT"));
   DEFINE_uint(thread_count_initial, options::TWO_DASHES, '\0', 0,
-              _("Number of threads to use in initial pass"), _("COUNT"));
+              N_("Number of threads to use in initial pass"), N_("COUNT"));
   DEFINE_uint(thread_count_middle, options::TWO_DASHES, '\0', 0,
-              _("Number of threads to use in middle pass"), _("COUNT"));
+              N_("Number of threads to use in middle pass"), N_("COUNT"));
   DEFINE_uint(thread_count_final, options::TWO_DASHES, '\0', 0,
-              _("Number of threads to use in final pass"), _("COUNT"));
+              N_("Number of threads to use in final pass"), N_("COUNT"));
+
+  DEFINE_uint64(Tbss, options::ONE_DASH, '\0', -1U,
+                N_("Set the address of the bss segment"), N_("ADDRESS"));
+  DEFINE_uint64(Tdata, options::ONE_DASH, '\0', -1U,
+                N_("Set the address of the data segment"), N_("ADDRESS"));
+  DEFINE_uint64(Ttext, options::ONE_DASH, '\0', -1U,
+                N_("Set the address of the text segment"), N_("ADDRESS"));
+
+  DEFINE_set(undefined, options::TWO_DASHES, 'u',
+            N_("Create undefined reference to SYMBOL"), N_("SYMBOL"));
+
+  DEFINE_bool(verbose, options::TWO_DASHES, '\0', false,
+              N_("Synonym for --debug=files"), NULL);
+
+  DEFINE_special(version_script, options::TWO_DASHES, '\0',
+                 N_("Read version script"), N_("FILE"));
+
+  DEFINE_bool(warn_common, options::TWO_DASHES, '\0', false,
+             N_("Warn about duplicate common symbols"),
+             N_("Do not warn about duplicate common symbols (default)"));
+
+  DEFINE_bool(warn_constructors, options::TWO_DASHES, '\0', false,
+             N_("Ignored"), N_("Ignored"));
+
+  DEFINE_bool(warn_search_mismatch, options::TWO_DASHES, '\0', true,
+             N_("Warn when skipping an incompatible library"),
+             N_("Don't warn when skipping an incompatible library"));
 
   DEFINE_bool(whole_archive, options::TWO_DASHES, '\0', false,
-              _("Include all archive contents"),
-              _("Include only needed archive contents"));
+              N_("Include all archive contents"),
+              N_("Include only needed archive contents"));
+
+  DEFINE_set(wrap, options::TWO_DASHES, '\0',
+            N_("Use wrapper functions for SYMBOL"), N_("SYMBOL"));
+
+  DEFINE_set(trace_symbol, options::TWO_DASHES, 'y',
+             N_("Trace references to symbol"), N_("SYMBOL"));
+
+  DEFINE_string(Y, options::EXACTLY_ONE_DASH, 'Y', "",
+               N_("Default search path for Solaris compatibility"),
+               N_("PATH"));
 
   DEFINE_special(start_group, options::TWO_DASHES, '(',
-                 _("Start a library search group"), NULL);
+                 N_("Start a library search group"), NULL);
   DEFINE_special(end_group, options::TWO_DASHES, ')',
-                 _("End a library search group"), NULL);
+                 N_("End a library search group"), NULL);
 
-  DEFINE_string(debug, options::TWO_DASHES, '\0', "",
-                _("Turn on debugging"), _("[task,script,all][,...]"));
+  // The -z options.
 
-  // The -z flags.
-
-  // Both execstack and noexecstack differ from the default execstack_
-  // value, so we need to use different variables for them.
+  DEFINE_bool(combreloc, options::DASH_Z, '\0', true,
+             N_("Sort dynamic relocs"),
+             N_("Do not sort dynamic relocs"));
+  DEFINE_uint64(common_page_size, options::DASH_Z, '\0', 0,
+                N_("Set common page size to SIZE"), N_("SIZE"));
+  DEFINE_bool(defs, options::DASH_Z, '\0', false,
+              N_("Report undefined symbols (even with --shared)"),
+              NULL);
   DEFINE_bool(execstack, options::DASH_Z, '\0', false,
-              _("Mark output as requiring executable stack"), NULL);
-  DEFINE_bool(noexecstack, options::DASH_Z, '\0', false,
-              _("Mark output as not requiring executable stack"), NULL);
+              N_("Mark output as requiring executable stack"), NULL);
+  DEFINE_bool(initfirst, options::DASH_Z, '\0', false,
+             N_("Mark DSO to be initialized first at runtime"),
+             NULL);
+  DEFINE_bool(interpose, options::DASH_Z, '\0', false,
+             N_("Mark object to interpose all DSOs but executable"),
+             NULL);
+  DEFINE_bool(lazy, options::DASH_Z, '\0', false,
+             N_("Mark object for lazy runtime binding (default)"),
+             NULL);
+  DEFINE_bool(loadfltr, options::DASH_Z, '\0', false,
+             N_("Mark object requiring immediate process"),
+             NULL);
   DEFINE_uint64(max_page_size, options::DASH_Z, '\0', 0,
-                _("Set maximum page size to SIZE"), _("SIZE"));
-  DEFINE_uint64(common_page_size, options::DASH_Z, '\0', 0,
-                _("Set common page size to SIZE"), _("SIZE"));
+                N_("Set maximum page size to SIZE"), N_("SIZE"));
+  DEFINE_bool(copyreloc, options::DASH_Z, '\0', true,
+             NULL,
+             N_("Do not create copy relocs"));
+  DEFINE_bool(nodefaultlib, options::DASH_Z, '\0', false,
+             N_("Mark object not to use default search paths"),
+             NULL);
+  DEFINE_bool(nodelete, options::DASH_Z, '\0', false,
+             N_("Mark DSO non-deletable at runtime"),
+             NULL);
+  DEFINE_bool(nodlopen, options::DASH_Z, '\0', false,
+             N_("Mark DSO not available to dlopen"),
+             NULL);
+  DEFINE_bool(nodump, options::DASH_Z, '\0', false,
+             N_("Mark DSO not available to dldump"),
+             NULL);
+  DEFINE_bool(noexecstack, options::DASH_Z, '\0', false,
+              N_("Mark output as not requiring executable stack"), NULL);
+  DEFINE_bool(now, options::DASH_Z, '\0', false,
+             N_("Mark object for immediate function binding"),
+             NULL);
+  DEFINE_bool(origin, options::DASH_Z, '\0', false,
+             N_("Mark DSO to indicate that needs immediate $ORIGIN "
+                 "processing at runtime"), NULL);
+  DEFINE_bool(relro, options::DASH_Z, '\0', false,
+             N_("Where possible mark variables read-only after relocation"),
+             N_("Don't mark variables read-only after relocation"));
 
  public:
   typedef options::Dir_list Dir_list;
@@ -596,6 +1029,11 @@ class General_options
   // any problems.
   void finalize();
 
+  // True if we printed the version information.
+  bool
+  printed_version() const
+  { return this->printed_version_; }
+
   // The macro defines output() (based on --output), but that's a
   // generic name.  Provide this alternative name, which is clearer.
   const char*
@@ -606,7 +1044,15 @@ class General_options
   // the output is position-independent or not.
   bool
   output_is_position_independent() const
-  { return this->shared(); }
+  { return this->shared() || this->pie(); }
+
+  // Return true if the output is something that can be exec()ed, such
+  // as a static executable, or a position-dependent or
+  // position-independent executable, but not a dynamic library or an
+  // object file.
+  bool
+  output_is_executable() const
+  { return !this->shared() && !this->relocatable(); }
 
   // This would normally be static(), and defined automatically, but
   // since static is a keyword, we need to come up with our own name.
@@ -624,10 +1070,28 @@ class General_options
     OBJECT_FORMAT_BINARY
   };
 
+  // Convert a string to an Object_format.  Gives an error if the
+  // string is not recognized.
+  static Object_format
+  string_to_object_format(const char* arg);
+
   // Note: these functions are not very fast.
   Object_format format_enum() const;
   Object_format oformat_enum() const;
 
+  // Return whether FILENAME is in a system directory.
+  bool
+  is_in_system_directory(const std::string& name) const;
+
+  // RETURN whether SYMBOL_NAME should be kept, according to symbols_to_retain_.
+  bool
+  should_retain_symbol(const char* symbol_name) const
+    {
+      if (symbols_to_retain_.empty())    // means flag wasn't specified
+        return true;
+      return symbols_to_retain_.find(symbol_name) != symbols_to_retain_.end();
+    }
+
   // These are the best way to get access to the execstack state,
   // not execstack() and noexecstack() which are hard to use properly.
   bool
@@ -638,6 +1102,53 @@ class General_options
   is_stack_executable() const
   { return this->execstack_status_ == EXECSTACK_YES; }
 
+  bool
+  icf_enabled() const
+  { return this->icf_status_ != ICF_NONE; }
+
+  bool
+  icf_safe_folding() const
+  { return this->icf_status_ == ICF_SAFE; }
+
+  // The --demangle option takes an optional string, and there is also
+  // a --no-demangle option.  This is the best way to decide whether
+  // to demangle or not.
+  bool
+  do_demangle() const
+  { return this->do_demangle_; }
+
+  // Returns TRUE if any plugin libraries have been loaded.
+  bool
+  has_plugins() const
+  { return this->plugins_ != NULL; }
+
+  // Return a pointer to the plugin manager.
+  Plugin_manager*
+  plugins() const
+  { return this->plugins_; }
+
+  // True iff SYMBOL was found in the file specified by dynamic-list.
+  bool
+  in_dynamic_list(const char* symbol) const
+  { return this->dynamic_list_.version_script_info()->symbol_is_local(symbol); }
+
+  // Finalize the dynamic list.
+  void
+  finalize_dynamic_list()
+  { this->dynamic_list_.version_script_info()->finalize(); }
+
+  // The disposition given by the --incremental-changed,
+  // --incremental-unchanged or --incremental-unknown option.  The
+  // value may change as we proceed parsing the command line flags.
+  Incremental_disposition
+  incremental_disposition() const
+  { return this->incremental_disposition_; }
+
+  // Return true if S is the name of a library excluded from automatic
+  // symbol export.
+  bool
+  check_excluded_libs (const std::string &s) const;
+
  private:
   // Don't copy this structure.
   General_options(const General_options&);
@@ -654,12 +1165,28 @@ class General_options
     EXECSTACK_NO
   };
 
-  Execstack execstack_status_;
+  enum Icf_status
+  {
+    // Do not fold any functions (Default or --icf=none).
+    ICF_NONE,
+    // All functions are candidates for folding. (--icf=all).
+    ICF_ALL,   
+    // Only ctors and dtors are candidates for folding. (--icf=safe).
+    ICF_SAFE
+  };
+
+  void
+  set_icf_status(Icf_status value)
+  { this->icf_status_ = value; }
+
   void
   set_execstack_status(Execstack value)
-  { execstack_status_ = value; }
+  { this->execstack_status_ = value; }
+
+  void
+  set_do_demangle(bool value)
+  { this->do_demangle_ = value; }
 
-  bool static_;
   void
   set_static(bool value)
   { static_ = value; }
@@ -672,6 +1199,43 @@ class General_options
   // Apply any sysroot to the directory lists.
   void
   add_sysroot();
+
+  // Add a plugin and its arguments to the list of plugins.
+  void
+  add_plugin(const char *filename);
+
+  // Add a plugin option.
+  void
+  add_plugin_option(const char* opt);
+
+  // Whether we printed version information.
+  bool printed_version_;
+  // Whether to mark the stack as executable.
+  Execstack execstack_status_;
+  // Whether to do code folding.
+  Icf_status icf_status_;
+  // Whether to do a static link.
+  bool static_;
+  // Whether to do demangling.
+  bool do_demangle_;
+  // List of plugin libraries.
+  Plugin_manager* plugins_;
+  // The parsed output of --dynamic-list files.  For convenience in
+  // script.cc, we store this as a Script_options object, even though
+  // we only use a single Version_tree from it.
+  Script_options dynamic_list_;
+  // The disposition given by the --incremental-changed,
+  // --incremental-unchanged or --incremental-unknown option.  The
+  // value may change as we proceed parsing the command line flags.
+  Incremental_disposition incremental_disposition_;
+  // Whether we have seen one of the options that require incremental
+  // build (--incremental-changed, --incremental-unchanged or
+  // --incremental-unknown)
+  bool implicit_incremental_;
+  // Libraries excluded from automatic export, via --exclude-libs.
+  Unordered_set<std::string> excluded_libs_;
+  // List of symbol-names to keep, via -retain-symbol-info.
+  Unordered_set<std::string> symbols_to_retain_;
 };
 
 // The position-dependent options.  We use this to store the state of
@@ -708,12 +1272,14 @@ class Position_dependent_options
     this->set_Bdynamic(options.Bdynamic());
     this->set_format_enum(options.format_enum());
     this->set_whole_archive(options.whole_archive());
+    this->set_incremental_disposition(options.incremental_disposition());
   }
 
   DEFINE_posdep(as_needed, bool);
   DEFINE_posdep(Bdynamic, bool);
   DEFINE_posdep(format_enum, General_options::Object_format);
   DEFINE_posdep(whole_archive, bool);
+  DEFINE_posdep(incremental_disposition, Incremental_disposition);
 
  private:
   // This is a General_options with everything set to its default
@@ -728,9 +1294,20 @@ class Position_dependent_options
 class Input_file_argument
 {
  public:
+  enum Input_file_type
+  {
+    // A regular file, name used as-is, not searched.
+    INPUT_FILE_TYPE_FILE,
+    // A library name.  When used, "lib" will be prepended and ".so" or
+    // ".a" appended to make a filename, and that filename will be searched
+    // for using the -L paths.
+    INPUT_FILE_TYPE_LIBRARY,
+    // A regular file, name used as-is, but searched using the -L paths.
+    INPUT_FILE_TYPE_SEARCHED_FILE
+  };
+
   // name: file name or library name
-  // is_lib: true if name is a library name: that is, emits the leading
-  //         "lib" and trailing ".so"/".a" from the name
+  // type: the type of this input file.
   // 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.
@@ -738,15 +1315,15 @@ class Input_file_argument
   // 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_(""), just_symbols_(false),
-      options_()
+    : name_(), type_(INPUT_FILE_TYPE_FILE), extra_search_path_(""),
+      just_symbols_(false), options_()
   { }
 
-  Input_file_argument(const char* name, bool is_lib,
+  Input_file_argument(const char* name, Input_file_type type,
                       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),
+    : name_(name), type_(type), extra_search_path_(extra_search_path),
       just_symbols_(just_symbols), options_(options)
   { }
 
@@ -754,11 +1331,11 @@ class Input_file_argument
   // Position_dependent_options.  In that case, we extract the
   // position-independent vars from the General_options and only store
   // those.
-  Input_file_argument(const char* name, bool is_lib,
+  Input_file_argument(const char* name, Input_file_type type,
                       const char* extra_search_path,
                       bool just_symbols,
                       const General_options& options)
-    : name_(name), is_lib_(is_lib), extra_search_path_(extra_search_path),
+    : name_(name), type_(type), extra_search_path_(extra_search_path),
       just_symbols_(just_symbols), options_(options)
   { }
 
@@ -772,7 +1349,11 @@ class Input_file_argument
 
   bool
   is_lib() const
-  { return this->is_lib_; }
+  { return type_ == INPUT_FILE_TYPE_LIBRARY; }
+
+  bool
+  is_searched_file() const
+  { return type_ == INPUT_FILE_TYPE_SEARCHED_FILE; }
 
   const char*
   extra_search_path() const
@@ -791,14 +1372,18 @@ class Input_file_argument
   // options.
   bool
   may_need_search() const
-  { return this->is_lib_ || !this->extra_search_path_.empty(); }
+  {
+    return (this->is_lib()
+           || this->is_searched_file()
+           || !this->extra_search_path_.empty());
+  }
 
  private:
   // We use std::string, not const char*, here for convenience when
   // using script files, so that we do not have to preserve the string
   // in that case.
   std::string name_;
-  bool is_lib_;
+  Input_file_type type_;
   std::string extra_search_path_;
   bool just_symbols_;
   Position_dependent_options options_;
@@ -858,14 +1443,15 @@ class Input_argument
   Input_file_group* group_;
 };
 
+typedef std::vector<Input_argument> Input_argument_list;
+
 // A group from the command line.  This is a set of arguments within
 // --start-group ... --end-group.
 
 class Input_file_group
 {
  public:
-  typedef std::vector<Input_argument> Files;
-  typedef Files::const_iterator const_iterator;
+  typedef Input_argument_list::const_iterator const_iterator;
 
   Input_file_group()
     : files_()
@@ -887,7 +1473,7 @@ class Input_file_group
   { return this->files_.end(); }
 
  private:
-  Files files_;
+  Input_argument_list files_;
 };
 
 // A list of files from the command line or a script.
@@ -895,7 +1481,6 @@ class Input_file_group
 class Input_arguments
 {
  public:
-  typedef std::vector<Input_argument> Input_argument_list;
   typedef Input_argument_list::const_iterator const_iterator;
 
   Input_arguments()
@@ -986,10 +1571,9 @@ class Command_line
   script_options()
   { return this->script_options_; }
 
-  // Get the version-script options: a convenience routine.
+  // Finalize the version-script options and return them.
   const Version_script_info&
-  version_script() const
-  { return *this->script_options_.version_script_info(); }
+  version_script();
 
   // Get the input files.
   Input_arguments&
@@ -1015,6 +1599,16 @@ class Command_line
   Command_line(const Command_line&);
   Command_line& operator=(const Command_line&);
 
+  // This is a dummy class to provide a constructor that runs before
+  // the constructor for the General_options.  The Pre_options constructor
+  // is used as a hook to set the flag enabling the options to register
+  // themselves.
+  struct Pre_options {
+    Pre_options();
+  };
+
+  // This must come before options_!
+  Pre_options pre_options_;
   General_options options_;
   Position_dependent_options position_options_;
   Script_options script_options_;