]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
gold/
authorRoland McGrath <roland@gnu.org>
Fri, 10 May 2013 22:35:30 +0000 (22:35 +0000)
committerRoland McGrath <roland@gnu.org>
Fri, 10 May 2013 22:35:30 +0000 (22:35 +0000)
* options.h (General_options): Add --rosegment-gap option.
* options.cc (finalize): --rosegment-gap implies --rosegment.
* layout.cc (set_segment_offsets): Let user option override
target->rosegment_gap().

gold/ChangeLog
gold/layout.cc
gold/options.cc
gold/options.h

index 1e21f577142144d6673ae81b27363682febe51f0..45633468a0c85de5478e34000ea99d849fc3ce94 100644 (file)
@@ -1,3 +1,10 @@
+2013-05-10  Roland McGrath  <mcgrathr@google.com>
+
+       * options.h (General_options): Add --rosegment-gap option.
+       * options.cc (finalize): --rosegment-gap implies --rosegment.
+       * layout.cc (set_segment_offsets): Let user option override
+       target->rosegment_gap().
+
 2012-12-06  Roland McGrath  <mcgrathr@google.com>
 
        * configure.ac (HAVE_ZLIB): Use AM_ZLIB instead of AC_SEARCH_LIBS.
index ad667ab875b8ecb2f12079044eecd88f2f6017fb..5ff08fdd2c0e5e63879392ded9e7045dfcc07209 100644 (file)
@@ -1,6 +1,6 @@
 // layout.cc -- lay out output file sections for gold
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 // Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
@@ -3255,7 +3255,10 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
 
                  // If the target wants a fixed minimum distance from the
                  // text segment to the read-only segment, move up now.
-                 uint64_t min_addr = start_addr + target->rosegment_gap();
+                 uint64_t min_addr =
+                   start_addr + (parameters->options().user_set_rosegment_gap()
+                                 ? parameters->options().rosegment_gap()
+                                 : target->rosegment_gap());
                  if (addr < min_addr)
                    addr = min_addr;
 
index fe9a00e023d372b44e66bb54d71e85d3c9a596ab..e44a2feea0bbbd4c3f90c3383c28542ca7638832 100644 (file)
@@ -1,6 +1,7 @@
 // options.c -- handle command line options for gold
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013
+// Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -101,11 +102,11 @@ One_option::print() const
     {
       len += printf("-%c", this->shortname);
       if (this->helparg)
-        {
-          // -z takes long-names only.
-          gold_assert(this->dashes != DASH_Z);
-          len += printf(" %s", gettext(this->helparg));
-        }
+       {
+         // -z takes long-names only.
+         gold_assert(this->dashes != DASH_Z);
+         len += printf(" %s", gettext(this->helparg));
+       }
       comma = true;
     }
   if (!this->longname.empty()
@@ -113,29 +114,29 @@ One_option::print() const
           && this->longname[1] == '\0'))
     {
       if (comma)
-        len += printf(", ");
+       len += printf(", ");
       switch (this->dashes)
-        {
-        case options::ONE_DASH: case options::EXACTLY_ONE_DASH:
-          len += printf("-");
-          break;
-        case options::TWO_DASHES: case options::EXACTLY_TWO_DASHES:
-          len += printf("--");
-          break;
-        case options::DASH_Z:
-          len += printf("-z ");
-          break;
-        default:
-          gold_unreachable();
-        }
+       {
+       case options::ONE_DASH: case options::EXACTLY_ONE_DASH:
+         len += printf("-");
+         break;
+       case options::TWO_DASHES: case options::EXACTLY_TWO_DASHES:
+         len += printf("--");
+         break;
+       case options::DASH_Z:
+         len += printf("-z ");
+         break;
+       default:
+         gold_unreachable();
+       }
       len += printf("%s", this->longname.c_str());
       if (this->helparg)
-        {
-          // For most options, we print "--frob FOO".  But for -z
-          // we print "-z frob=FOO".
-          len += printf("%c%s", this->dashes == options::DASH_Z ? '=' : ' ',
-                        gettext(this->helparg));
-        }
+       {
+         // For most options, we print "--frob FOO".  But for -z
+         // we print "-z frob=FOO".
+         len += printf("%c%s", this->dashes == options::DASH_Z ? '=' : ' ',
+                       gettext(this->helparg));
+       }
     }
 
   if (len >= 30)
@@ -200,7 +201,7 @@ parse_uint(const char* option_name, const char* arg, int* retval)
   *retval = strtol(arg, &endptr, 0);
   if (*endptr != '\0' || *retval < 0)
     gold_fatal(_("%s: invalid option value (expected an integer): %s"),
-               option_name, arg);
+              option_name, arg);
 }
 
 void
@@ -210,7 +211,7 @@ parse_int(const char* option_name, const char* arg, int* retval)
   *retval = strtol(arg, &endptr, 0);
   if (*endptr != '\0')
     gold_fatal(_("%s: invalid option value (expected an integer): %s"),
-               option_name, arg);
+              option_name, arg);
 }
 
 void
@@ -220,7 +221,7 @@ parse_uint64(const char* option_name, const char* arg, uint64_t* retval)
   *retval = strtoull(arg, &endptr, 0);
   if (*endptr != '\0')
     gold_fatal(_("%s: invalid option value (expected an integer): %s"),
-               option_name, arg);
+              option_name, arg);
 }
 
 void
@@ -273,13 +274,13 @@ parse_set(const char*, const char* arg, String_set* retval)
 
 void
 parse_choices(const char* option_name, const char* arg, const char** retval,
-              const char* choices[], int num_choices)
+             const char* choices[], int num_choices)
 {
   for (int i = 0; i < num_choices; i++)
     if (strcmp(choices[i], arg) == 0)
       {
-        *retval = arg;
-        return;
+       *retval = arg;
+       return;
       }
 
   // If we get here, the user did not enter a valid choice, so we die.
@@ -288,10 +289,10 @@ parse_choices(const char* option_name, const char* arg, const char** retval,
     {
       choices_list += choices[i];
       if (i != num_choices - 1)
-        choices_list += ", ";
+       choices_list += ", ";
     }
   gold_fatal(_("%s: must take one of the following arguments: %s"),
-             option_name, choices_list.c_str());
+            option_name, choices_list.c_str());
 }
 
 } // End namespace options.
@@ -340,21 +341,21 @@ General_options::parse_V(const char*, const char*, Command_line*)
 
 void
 General_options::parse_defsym(const char*, const char* arg,
-                              Command_line* cmdline)
+                             Command_line* cmdline)
 {
   cmdline->script_options().define_symbol(arg);
 }
 
 void
 General_options::parse_incremental(const char*, const char*,
-                                   Command_line*)
+                                  Command_line*)
 {
   this->incremental_mode_ = INCREMENTAL_AUTO;
 }
 
 void
 General_options::parse_no_incremental(const char*, const char*,
-                                      Command_line*)
+                                     Command_line*)
 {
   this->incremental_mode_ = INCREMENTAL_OFF;
 }
@@ -375,7 +376,7 @@ General_options::parse_incremental_update(const char*, const char*,
 
 void
 General_options::parse_incremental_changed(const char*, const char*,
-                                           Command_line*)
+                                          Command_line*)
 {
   this->implicit_incremental_ = true;
   this->incremental_disposition_ = INCREMENTAL_CHANGED;
@@ -383,7 +384,7 @@ General_options::parse_incremental_changed(const char*, const char*,
 
 void
 General_options::parse_incremental_unchanged(const char*, const char*,
-                                             Command_line*)
+                                            Command_line*)
 {
   this->implicit_incremental_ = true;
   this->incremental_disposition_ = INCREMENTAL_UNCHANGED;
@@ -391,7 +392,7 @@ General_options::parse_incremental_unchanged(const char*, const char*,
 
 void
 General_options::parse_incremental_unknown(const char*, const char*,
-                                           Command_line*)
+                                          Command_line*)
 {
   this->implicit_incremental_ = true;
   this->incremental_disposition_ = INCREMENTAL_CHECK;
@@ -407,7 +408,7 @@ General_options::parse_incremental_startup_unchanged(const char*, const char*,
 
 void
 General_options::parse_library(const char*, const char* arg,
-                               Command_line* cmdline)
+                              Command_line* cmdline)
 {
   Input_file_argument::Input_file_type type;
   const char* name;
@@ -428,7 +429,7 @@ General_options::parse_library(const char*, const char* arg,
 #ifdef ENABLE_PLUGINS
 void
 General_options::parse_plugin(const char*, const char* arg,
-                              Command_line*)
+                             Command_line*)
 {
   this->add_plugin(arg);
 }
@@ -437,7 +438,7 @@ General_options::parse_plugin(const char*, const char* arg,
 
 void
 General_options::parse_plugin_opt(const char*, const char* arg,
-                                  Command_line*)
+                                 Command_line*)
 {
   this->add_plugin_option(arg);
 }
@@ -445,7 +446,7 @@ General_options::parse_plugin_opt(const char*, const char* arg,
 
 void
 General_options::parse_R(const char* option, const char* arg,
-                         Command_line* cmdline)
+                        Command_line* cmdline)
 {
   struct stat s;
   if (::stat(arg, &s) != 0 || S_ISDIR(s.st_mode))
@@ -456,7 +457,7 @@ General_options::parse_R(const char* option, const char* arg,
 
 void
 General_options::parse_just_symbols(const char*, const char* arg,
-                                    Command_line* cmdline)
+                                   Command_line* cmdline)
 {
   Input_file_argument file(arg, Input_file_argument::INPUT_FILE_TYPE_FILE,
                           "", true, *this);
@@ -528,7 +529,7 @@ General_options::parse_static(const char*, const char*, Command_line*)
 
 void
 General_options::parse_script(const char*, const char* arg,
-                              Command_line* cmdline)
+                             Command_line* cmdline)
 {
   if (!read_commandline_script(arg, cmdline))
     gold::gold_fatal(_("unable to parse script file %s"), arg);
@@ -536,7 +537,7 @@ General_options::parse_script(const char*, const char* arg,
 
 void
 General_options::parse_version_script(const char*, const char* arg,
-                                      Command_line* cmdline)
+                                     Command_line* cmdline)
 {
   if (!read_version_script(arg, cmdline))
     gold::gold_fatal(_("unable to parse version script file %s"), arg);
@@ -544,7 +545,7 @@ General_options::parse_version_script(const char*, const char* arg,
 
 void
 General_options::parse_dynamic_list(const char*, const char* arg,
-                                    Command_line* cmdline)
+                                   Command_line* cmdline)
 {
   if (!read_dynamic_list(arg, cmdline, &this->dynamic_list_))
     gold::gold_fatal(_("unable to parse dynamic-list script file %s"), arg);
@@ -552,28 +553,28 @@ General_options::parse_dynamic_list(const char*, const char* arg,
 
 void
 General_options::parse_start_group(const char*, const char*,
-                                   Command_line* cmdline)
+                                  Command_line* cmdline)
 {
   cmdline->inputs().start_group();
 }
 
 void
 General_options::parse_end_group(const char*, const char*,
-                                 Command_line* cmdline)
+                                Command_line* cmdline)
 {
   cmdline->inputs().end_group();
 }
 
 void
 General_options::parse_start_lib(const char*, const char*,
-                                 Command_line* cmdline)
+                                Command_line* cmdline)
 {
   cmdline->inputs().start_lib(cmdline->position_dependent_options());
 }
 
 void
 General_options::parse_end_lib(const char*, const char*,
-                               Command_line* cmdline)
+                              Command_line* cmdline)
 {
   cmdline->inputs().end_lib();
 }
@@ -585,7 +586,7 @@ General_options::parse_end_lib(const char*, const char*,
 
 void
 General_options::parse_exclude_libs(const char*, const char* arg,
-                                    Command_line*)
+                                   Command_line*)
 {
   const char* p = arg;
 
@@ -659,15 +660,15 @@ General_options::string_to_object_format(const char* arg)
   else
     {
       gold::gold_error(_("format '%s' not supported; treating as elf "
-                         "(supported formats: elf, binary)"),
-                       arg);
+                        "(supported formats: elf, binary)"),
+                      arg);
       return gold::General_options::OBJECT_FORMAT_ELF;
     }
 }
 
 void
 General_options::parse_fix_v4bx(const char*, const char*,
-                                Command_line*)
+                               Command_line*)
 {
   this->fix_v4bx_ = FIX_V4BX_REPLACE;
 }
@@ -700,8 +701,8 @@ void
 usage()
 {
   fprintf(stderr,
-          _("%s: use the --help option for usage information\n"),
-          gold::program_name);
+         _("%s: use the --help option for usage information\n"),
+         gold::program_name);
   ::exit(EXIT_FAILURE);
 }
 
@@ -709,8 +710,8 @@ void
 usage(const char* msg, const char* opt)
 {
   fprintf(stderr,
-          _("%s: %s: %s\n"),
-          gold::program_name, opt, msg);
+         _("%s: %s: %s\n"),
+         gold::program_name, opt, msg);
   usage();
 }
 
@@ -721,12 +722,12 @@ static char*
 get_relative_sysroot(const char* from)
 {
   char* path = make_relative_prefix(gold::program_name, from,
-                                    TARGET_SYSTEM_ROOT);
+                                   TARGET_SYSTEM_ROOT);
   if (path != NULL)
     {
       struct stat s;
       if (::stat(path, &s) == 0 && S_ISDIR(s.st_mode))
-        return path;
+       return path;
       free(path);
     }
 
@@ -749,9 +750,9 @@ get_default_sysroot()
     {
       char* path = get_relative_sysroot(BINDIR);
       if (path == NULL)
-        path = get_relative_sysroot(TOOLBINDIR);
+       path = get_relative_sysroot(TOOLBINDIR);
       if (path != NULL)
-        return path;
+       return path;
     }
 
   return sysroot;
@@ -768,14 +769,14 @@ get_default_sysroot()
 // NOTE: it is safe for argv and arg to point to the same place.
 gold::options::One_option*
 parse_long_option(int argc, const char** argv, bool equals_only,
-                  const char** arg, int* i)
+                 const char** arg, int* i)
 {
   const char* const this_argv = argv[*i];
 
   const char* equals = strchr(this_argv, '=');
   const char* option_start = this_argv + strspn(this_argv, "-");
   std::string option(option_start,
-                     equals ? equals - option_start : strlen(option_start));
+                    equals ? equals - option_start : strlen(option_start));
 
   gold::options::Option_map::iterator it
       = gold::options::long_options->find(option);
@@ -788,21 +789,21 @@ parse_long_option(int argc, const char** argv, bool equals_only,
   if (this_argv[0] != '-')  // no dashes at all: had better be "-z <longopt>"
     {
       if (retval->dashes != gold::options::DASH_Z)
-        return NULL;
+       return NULL;
     }
   else if (this_argv[1] != '-')   // one dash
     {
       if (retval->dashes != gold::options::ONE_DASH
-          && retval->dashes != gold::options::EXACTLY_ONE_DASH
-          && retval->dashes != gold::options::TWO_DASHES)
-        return NULL;
+         && retval->dashes != gold::options::EXACTLY_ONE_DASH
+         && retval->dashes != gold::options::TWO_DASHES)
+       return NULL;
     }
   else                            // two dashes (or more!)
     {
       if (retval->dashes != gold::options::TWO_DASHES
-          && retval->dashes != gold::options::EXACTLY_TWO_DASHES
-          && retval->dashes != gold::options::ONE_DASH)
-        return NULL;
+         && retval->dashes != gold::options::EXACTLY_TWO_DASHES
+         && retval->dashes != gold::options::ONE_DASH)
+       return NULL;
     }
 
   // Now that we know the option is good (or else bad in a way that
@@ -813,20 +814,20 @@ parse_long_option(int argc, const char** argv, bool equals_only,
   if (!retval->takes_argument())
     {
       if (equals)
-        usage(_("unexpected argument"), this_argv);
+       usage(_("unexpected argument"), this_argv);
       else
-        *arg = NULL;
+       *arg = NULL;
     }
   else
     {
       if (equals)
-        *arg = equals + 1;
+       *arg = equals + 1;
       else if (retval->takes_optional_argument())
        *arg = retval->default_value;
       else if (*i < argc && !equals_only)
-        *arg = argv[(*i)++];
+       *arg = argv[(*i)++];
       else
-        usage(_("missing argument"), this_argv);
+       usage(_("missing argument"), this_argv);
     }
 
   return retval;
@@ -844,7 +845,7 @@ parse_long_option(int argc, const char** argv, bool equals_only,
 // another short option in the same word.
 gold::options::One_option*
 parse_short_option(int argc, const char** argv, int pos_in_argv_i,
-                   const char** arg, int* i)
+                  const char** arg, int* i)
 {
   const char* const this_argv = argv[*i];
 
@@ -853,7 +854,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
 
   // We handle -z as a special case.
   static gold::options::One_option dash_z("", gold::options::DASH_Z,
-                                          'z', "", NULL, "Z-OPTION", false,
+                                         'z', "", NULL, "Z-OPTION", false,
                                          NULL);
   gold::options::One_option* retval = NULL;
   if (this_argv[pos_in_argv_i] == 'z')
@@ -862,7 +863,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
     {
       const int char_as_int = static_cast<int>(this_argv[pos_in_argv_i]);
       if (char_as_int > 0 && char_as_int < 128)
-        retval = gold::options::short_options[char_as_int];
+       retval = gold::options::short_options[char_as_int];
     }
 
   if (retval == NULL)
@@ -874,20 +875,20 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
       *arg = NULL;
       // We only advance past this argument if it's the only one in argv.
       if (this_argv[pos_in_argv_i + 1] == '\0')
-        ++(*i);
+       ++(*i);
     }
   else
     {
       // If we take an argument, we'll eat up this entire argv entry.
       ++(*i);
       if (this_argv[pos_in_argv_i + 1] != '\0')
-        *arg = this_argv + pos_in_argv_i + 1;
+       *arg = this_argv + pos_in_argv_i + 1;
       else if (retval->takes_optional_argument())
        *arg = retval->default_value;
       else if (*i < argc)
-        *arg = argv[(*i)++];
+       *arg = argv[(*i)++];
       else
-        usage(_("missing argument"), this_argv);
+       usage(_("missing argument"), this_argv);
     }
 
   // If we're a -z option, we need to parse our argument as a
@@ -898,7 +899,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
       const char* dash_z_arg = *arg;
       retval = parse_long_option(1, arg, true, arg, &dummy_i);
       if (retval == NULL)
-        usage(_("unknown -z option"), dash_z_arg);
+       usage(_("unknown -z option"), dash_z_arg);
     }
 
   return retval;
@@ -952,7 +953,7 @@ General_options::add_sysroot()
     {
       this->set_sysroot(get_default_sysroot());
       if (this->sysroot() == NULL || this->sysroot()[0] == '\0')
-        return;
+       return;
     }
 
   char* canonical_sysroot = lrealpath(this->sysroot());
@@ -1117,8 +1118,8 @@ General_options::finalize()
   if (this->thread_count() > 0 || this->thread_count_initial() > 0
       || this->thread_count_middle() > 0 || this->thread_count_final() > 0)
     gold_warning(_("ignoring --thread-count: "
-                   "%s was compiled without thread support"),
-                 program_name);
+                  "%s was compiled without thread support"),
+                program_name);
 #endif
 
   std::string libpath;
@@ -1170,17 +1171,17 @@ General_options::finalize()
       std::ifstream in;
       in.open(this->retain_symbols_file());
       if (!in)
-        gold_fatal(_("unable to open -retain-symbols-file file %s: %s"),
-                   this->retain_symbols_file(), strerror(errno));
+       gold_fatal(_("unable to open -retain-symbols-file file %s: %s"),
+                  this->retain_symbols_file(), strerror(errno));
       std::string line;
       std::getline(in, line);   // this chops off the trailing \n, if any
       while (in)
-        {
-          if (!line.empty() && line[line.length() - 1] == '\r')   // Windows
-            line.resize(line.length() - 1);
-          this->symbols_to_retain_.insert(line);
-          std::getline(in, line);
-        }
+       {
+         if (!line.empty() && line[line.length() - 1] == '\r')   // Windows
+           line.resize(line.length() - 1);
+         this->symbols_to_retain_.insert(line);
+         std::getline(in, line);
+       }
     }
 
   // -Bgroup implies --unresolved-symbols=report-all.
@@ -1239,7 +1240,7 @@ General_options::finalize()
 
   if (this->implicit_incremental_ && this->incremental_mode_ == INCREMENTAL_OFF)
     gold_fatal(_("Options --incremental-changed, --incremental-unchanged, "
-                 "--incremental-unknown require the use of --incremental"));
+                "--incremental-unknown require the use of --incremental"));
 
   // Check for options that are not compatible with incremental linking.
   // Where an option can be disabled without seriously changing the semantics
@@ -1272,6 +1273,10 @@ General_options::finalize()
        }
     }
 
+  // --rosegment-gap implies --rosegment.
+  if (this->user_set_rosegment_gap())
+    this->set_rosegment(true);
+
   // FIXME: we can/should be doing a lot more sanity checking here.
 }
 
@@ -1282,14 +1287,14 @@ General_options::finalize()
 
 void
 Search_directory::add_sysroot(const char* sysroot,
-                              const char* canonical_sysroot)
+                             const char* canonical_sysroot)
 {
   gold_assert(*sysroot != '\0');
   if (this->put_in_sysroot_)
     {
       if (!IS_DIR_SEPARATOR(this->name_[0])
-          && !IS_DIR_SEPARATOR(sysroot[strlen(sysroot) - 1]))
-        this->name_ = '/' + this->name_;
+         && !IS_DIR_SEPARATOR(sysroot[strlen(sysroot) - 1]))
+       this->name_ = '/' + this->name_;
       this->name_ = sysroot + this->name_;
       this->is_in_sysroot_ = true;
     }
@@ -1302,12 +1307,12 @@ Search_directory::add_sysroot(const char* sysroot,
       int canonical_name_len = strlen(canonical_name);
       int canonical_sysroot_len = strlen(canonical_sysroot);
       if (canonical_name_len > canonical_sysroot_len
-          && IS_DIR_SEPARATOR(canonical_name[canonical_sysroot_len]))
-        {
-          canonical_name[canonical_sysroot_len] = '\0';
-          if (FILENAME_CMP(canonical_name, canonical_sysroot) == 0)
-            this->is_in_sysroot_ = true;
-        }
+         && IS_DIR_SEPARATOR(canonical_name[canonical_sysroot_len]))
+       {
+         canonical_name[canonical_sysroot_len] = '\0';
+         if (FILENAME_CMP(canonical_name, canonical_sysroot) == 0)
+           this->is_in_sysroot_ = true;
+       }
       free(canonical_name);
     }
 }
@@ -1406,7 +1411,7 @@ Command_line::Pre_options::Pre_options()
 
 int
 Command_line::process_one_option(int argc, const char** argv, int i,
-                                 bool* no_more_options)
+                                bool* no_more_options)
 {
   gold_assert(argv[i][0] == '-' && !(*no_more_options));
 
@@ -1437,7 +1442,7 @@ Command_line::process_one_option(int argc, const char** argv, int i,
     {
       option = parse_short_option(argc, argv, pos_in_argv_i, &arg, &new_i);
       if (!option)
-        break;
+       break;
       option->reader->parse_to_value(argv[i], arg, this, &this->options_);
       ++pos_in_argv_i;
     }
@@ -1459,15 +1464,15 @@ Command_line::process(int argc, const char** argv)
     {
       this->position_options_.copy_from_options(this->options());
       if (no_more_options || argv[i][0] != '-')
-        {
+       {
          Input_file_argument file(argv[i],
                                   Input_file_argument::INPUT_FILE_TYPE_FILE,
                                   "", false, this->position_options_);
-          this->inputs_.add_file(file);
-          ++i;
-        }
+         this->inputs_.add_file(file);
+         ++i;
+       }
       else
-        i = process_one_option(argc, argv, i, &no_more_options);
+       i = process_one_option(argc, argv, i, &no_more_options);
     }
 
   if (this->inputs_.in_group())
index 50762a5446d81229f3960d721adabd2b8735d007..e1b6fc8f4cecefe275594e93e1ff87f3793c29bb 100644 (file)
@@ -1,6 +1,7 @@
 // options.h -- handle command line options for gold  -*- C++ -*-
 
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013
+// Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -120,7 +121,7 @@ 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);
+             const char* choices[], int num_choices);
 
 struct Struct_var;
 
@@ -168,7 +169,7 @@ struct One_option
   Struct_var* reader;
 
   One_option(const char* ln, Dashes d, char sn, const char* dv,
-             const char* hs, const char* ha, bool oa, 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), optional_arg(oa), reader(r)
   {
@@ -219,7 +220,7 @@ struct Struct_var
   // OPTIONS: the global General_options object.  Used by DEFINE_special.
   virtual void
   parse_to_value(const char* option, const char* arg,
-                 Command_line* cmdline, General_options* options) = 0;
+                Command_line* cmdline, General_options* options) = 0;
   virtual
   ~Struct_var()  // To make gcc happy.
   { }
@@ -230,16 +231,16 @@ struct Struct_special : public Struct_var
 {
   // If you change this, change the parse-fn in DEFINE_special as well.
   typedef void (General_options::*Parse_function)(const char*, const char*,
-                                                  Command_line*);
+                                                 Command_line*);
   Struct_special(const char* varname, Dashes dashes, char shortname,
-                 Parse_function parse_function,
-                 const char* helpstring, const char* helparg)
+                Parse_function parse_function,
+                const char* helpstring, const char* helparg)
     : option(varname, dashes, shortname, "", helpstring, helparg, false, this),
       parse(parse_function)
   { }
 
   void parse_to_value(const char* option, const char* arg,
-                      Command_line* cmdline, General_options* options)
+                     Command_line* cmdline, General_options* options)
   { (options->*(this->parse))(option, arg, cmdline); }
 
   One_option option;
@@ -261,17 +262,17 @@ struct Struct_special : public Struct_var
 // avoid unintended macro substitution of "assert()", we need to enclose
 // varname__ with parenthese.
 #define DEFINE_var(varname__, dashes__, shortname__, default_value__,        \
-                   default_value_as_string__, helpstring__, helparg__,       \
-                   optional_arg__, type__, param_type__, parse_fn__)        \
+                  default_value_as_string__, helpstring__, helparg__,       \
+                  optional_arg__, type__, param_type__, parse_fn__)         \
  public:                                                                     \
   param_type__                                                               \
   (varname__)() const                                                        \
   { return this->varname__##_.value; }                                       \
-                                                                             \
+                                                                            \
   bool                                                                       \
   user_set_##varname__() const                                               \
   { return this->varname__##_.user_set_via_option; }                         \
-                                                                             \
+                                                                            \
   void                                                                      \
   set_user_set_##varname__()                                                \
   { this->varname__##_.user_set_via_option = true; }                        \
@@ -281,18 +282,18 @@ struct Struct_special : public Struct_var
   {                                                                          \
     Struct_##varname__()                                                     \
       : option(#varname__, dashes__, shortname__, default_value_as_string__, \
-               helpstring__, helparg__, optional_arg__, this),              \
-        user_set_via_option(false), value(default_value__)                   \
+              helpstring__, helparg__, optional_arg__, this),               \
+       user_set_via_option(false), value(default_value__)                   \
     { }                                                                      \
-                                                                             \
+                                                                            \
     void                                                                     \
     parse_to_value(const char* option_name, const char* arg,                 \
-                   Command_line*, General_options*)                          \
+                  Command_line*, General_options*)                          \
     {                                                                        \
       parse_fn__(option_name, arg, &this->value);                            \
       this->user_set_via_option = true;                                      \
     }                                                                        \
-                                                                             \
+                                                                            \
     options::One_option option;                                              \
     bool user_set_via_option;                                                \
     type__ value;                                                            \
@@ -308,71 +309,71 @@ struct Struct_special : public Struct_var
 // 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__)                       \
+                   helpstring__, no_helpstring__)                       \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             default_value__ ? "true" : "false", helpstring__, NULL,     \
-             false, bool, bool, options::parse_bool)                    \
+            default_value__ ? "true" : "false", helpstring__, NULL,     \
+            false, bool, bool, options::parse_bool)                     \
   struct Struct_no_##varname__ : public options::Struct_var              \
   {                                                                      \
     Struct_no_##varname__() : option((dashes__ == options::DASH_Z       \
                                      ? "no" #varname__                  \
                                      : "no-" #varname__),               \
                                     dashes__, '\0',                     \
-                                     default_value__ ? "false" : "true", \
-                                     no_helpstring__, NULL, false, this) \
+                                    default_value__ ? "false" : "true", \
+                                    no_helpstring__, NULL, false, this) \
     { }                                                                  \
-                                                                         \
+                                                                        \
     void                                                                 \
     parse_to_value(const char*, const char*,                             \
-                   Command_line*, General_options* options)              \
+                  Command_line*, General_options* options)              \
     {                                                                    \
       options->set_##varname__(false);                                   \
       options->set_user_set_##varname__();                               \
     }                                                                    \
-                                                                         \
+                                                                        \
     options::One_option option;                                          \
   };                                                                     \
   Struct_no_##varname__ no_##varname__##_initializer_
 
 #define DEFINE_enable(varname__, dashes__, shortname__, default_value__, \
-                      helpstring__, no_helpstring__)                     \
+                     helpstring__, no_helpstring__)                     \
   DEFINE_var(enable_##varname__, dashes__, shortname__, default_value__, \
-             default_value__ ? "true" : "false", helpstring__, NULL,     \
-             false, bool, bool, options::parse_bool)                    \
+            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) \
+                                    dashes__, '\0',                     \
+                                    default_value__ ? "false" : "true", \
+                                    no_helpstring__, NULL, false, this) \
     { }                                                                  \
-                                                                         \
+                                                                        \
     void                                                                 \
     parse_to_value(const char*, const char*,                             \
-                   Command_line*, General_options* options)              \
+                  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__)                             \
+                  helpstring__, helparg__)                             \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,         \
-             #default_value__, helpstring__, helparg__, false,         \
-             int, int, options::parse_int)
+            #default_value__, helpstring__, helparg__, false,          \
+            int, int, options::parse_int)
 
 #define DEFINE_uint(varname__, dashes__, shortname__, default_value__,  \
-                   helpstring__, helparg__)                             \
+                  helpstring__, helparg__)                             \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,         \
-             #default_value__, helpstring__, helparg__, false,         \
-             int, int, options::parse_uint)
+            #default_value__, helpstring__, helparg__, false,          \
+            int, int, options::parse_uint)
 
 #define DEFINE_uint64(varname__, dashes__, shortname__, default_value__, \
-                      helpstring__, helparg__)                           \
+                     helpstring__, helparg__)                           \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             #default_value__, helpstring__, helparg__, false,          \
-             uint64_t, uint64_t, options::parse_uint64)
+            #default_value__, helpstring__, helparg__, false,           \
+            uint64_t, uint64_t, options::parse_uint64)
 
 #define DEFINE_double(varname__, dashes__, shortname__, default_value__, \
                      helpstring__, helparg__)                           \
@@ -387,19 +388,19 @@ struct Struct_special : public Struct_var
             double, double, options::parse_percent)
 
 #define DEFINE_string(varname__, dashes__, shortname__, default_value__, \
-                      helpstring__, helparg__)                           \
+                     helpstring__, helparg__)                           \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             default_value__, helpstring__, helparg__, false,           \
-             const char*, const char*, options::parse_string)
+            default_value__, helpstring__, helparg__, false,            \
+            const char*, const char*, options::parse_string)
 
 // This is like DEFINE_string, but we convert each occurrence to a
 // Search_directory and store it in a vector.  Thus we also have the
 // add_to_VARNAME() method, to append to the vector.
 #define DEFINE_dirlist(varname__, dashes__, shortname__,                  \
-                           helpstring__, helparg__)                       \
+                          helpstring__, helparg__)                       \
   DEFINE_var(varname__, dashes__, shortname__, ,                          \
-             "", helpstring__, helparg__, false, options::Dir_list,      \
-             const options::Dir_list&, options::parse_dirlist)            \
+            "", helpstring__, helparg__, false, options::Dir_list,       \
+            const options::Dir_list&, options::parse_dirlist)            \
   void                                                                    \
   add_to_##varname__(const char* new_value)                               \
   { options::parse_dirlist(NULL, new_value, &this->varname__##_.value); } \
@@ -409,10 +410,10 @@ struct Struct_special : public Struct_var
 
 // This is like DEFINE_string, but we store a set of strings.
 #define DEFINE_set(varname__, dashes__, shortname__,                      \
-                   helpstring__, helparg__)                               \
+                  helpstring__, helparg__)                               \
   DEFINE_var(varname__, dashes__, shortname__, ,                          \
-             "", helpstring__, helparg__, false, options::String_set,     \
-             const options::String_set&, options::parse_set)              \
+            "", helpstring__, helparg__, false, options::String_set,     \
+            const options::String_set&, options::parse_set)              \
  public:                                                                  \
   bool                                                                    \
   any_##varname__() const                                                 \
@@ -422,8 +423,8 @@ struct Struct_special : public Struct_var
   is_##varname__(const char* symbol) const                                \
   {                                                                       \
     return (!this->varname__##_.value.empty()                             \
-            && (this->varname__##_.value.find(std::string(symbol))        \
-                != this->varname__##_.value.end()));                      \
+           && (this->varname__##_.value.find(std::string(symbol))        \
+               != this->varname__##_.value.end()));                      \
   }                                                                      \
                                                                          \
   options::String_set::const_iterator                                    \
@@ -438,17 +439,17 @@ struct Struct_special : public Struct_var
 // After helparg__ should come an initializer list, like
 //   {"foo", "bar", "baz"}
 #define DEFINE_enum(varname__, dashes__, shortname__, default_value__,   \
-                    helpstring__, helparg__, ...)                        \
+                   helpstring__, helparg__, ...)                        \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,          \
-             default_value__, helpstring__, helparg__, false,           \
-             const char*, const char*, parse_choices_##varname__)        \
+            default_value__, helpstring__, helparg__, false,            \
+            const char*, const char*, parse_choices_##varname__)        \
  private:                                                                \
   static void parse_choices_##varname__(const char* option_name,         \
-                                        const char* arg,                 \
-                                        const char** retval) {           \
+                                       const char* arg,                 \
+                                       const char** retval) {           \
     const char* choices[] = __VA_ARGS__;                                 \
     options::parse_choices(option_name, arg, retval,                     \
-                           choices, sizeof(choices) / sizeof(*choices)); \
+                          choices, sizeof(choices) / sizeof(*choices)); \
   }
 
 // This is like DEFINE_bool, but VARNAME is the name of a different
@@ -504,16 +505,16 @@ struct Struct_special : public Struct_var
 // General_options; you are responsible for defining it there.
 // helparg__ should be NULL iff this special-option is a boolean.
 #define DEFINE_special(varname__, dashes__, shortname__,                \
-                       helpstring__, helparg__)                         \
+                      helpstring__, helparg__)                         \
  private:                                                               \
   void parse_##varname__(const char* option, const char* arg,           \
-                         Command_line* inputs);                         \
+                        Command_line* inputs);                         \
   struct Struct_##varname__ : public options::Struct_special            \
   {                                                                     \
     Struct_##varname__()                                                \
       : options::Struct_special(#varname__, dashes__, shortname__,      \
-                                &General_options::parse_##varname__,    \
-                                helpstring__, helparg__)                \
+                               &General_options::parse_##varname__,    \
+                               helpstring__, helparg__)                \
     { }                                                                 \
   };                                                                    \
   Struct_##varname__ varname__##_initializer_
@@ -525,8 +526,8 @@ struct Struct_special : public Struct_var
                               default_value__,                         \
                               helpstring__, helparg__)                 \
   DEFINE_var(varname__, dashes__, shortname__, default_value__,                \
-             default_value__, helpstring__, helparg__, true,           \
-             const char*, const char*, options::parse_optional_string)
+            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
@@ -594,11 +595,11 @@ 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',
-                 N_("Report usage information"), NULL);
+                N_("Report usage information"), NULL);
   DEFINE_special(version, options::TWO_DASHES, 'v',
-                 N_("Report version information"), NULL);
+                N_("Report version information"), NULL);
   DEFINE_special(V, options::EXACTLY_ONE_DASH, '\0',
-                 N_("Report version and target information"), NULL);
+                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
@@ -615,12 +616,12 @@ class General_options
                    N_("Do not allow multiple definitions"), false);
 
   DEFINE_bool(allow_shlib_undefined, options::TWO_DASHES, '\0', false,
-              N_("Allow unresolved references in shared libraries"),
-              N_("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,
-              N_("Only set DT_NEEDED for shared libraries if used"),
-              N_("Always DT_NEEDED for shared libraries"));
+             N_("Only set DT_NEEDED for shared libraries if used"),
+             N_("Always DT_NEEDED for shared libraries"));
 
   DEFINE_enum(assert, options::ONE_DASH, '\0', NULL,
              N_("Ignored"), N_("[ignored]"),
@@ -631,10 +632,10 @@ class General_options
   // 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]"));
+               N_("Set input format"), ("[elf,binary]"));
 
   DEFINE_bool(Bdynamic, options::ONE_DASH, '\0', true,
-              N_("-l searches 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);
@@ -647,7 +648,7 @@ class General_options
              N_("Use group name lookup rules for shared library"), NULL);
 
   DEFINE_bool(Bsymbolic, options::ONE_DASH, '\0', false,
-              N_("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);
@@ -662,14 +663,14 @@ class General_options
 
 #ifdef HAVE_ZLIB_H
   DEFINE_enum(compress_debug_sections, options::TWO_DASHES, '\0', "none",
-              N_("Compress .debug_* sections in the output file"),
-              ("[none,zlib]"),
-              {"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",
-              N_("Compress .debug_* sections in the output file"),
-              N_("[none]"),
-              {"none"});
+             N_("Compress .debug_* sections in the output file"),
+             N_("[none]"),
+             {"none"});
 #endif
 
   DEFINE_bool(copy_dt_needed_entries, options::TWO_DASHES, '\0', false,
@@ -685,19 +686,19 @@ class General_options
              N_("Handle constructors as directed by compiler"));
 
   DEFINE_bool(define_common, options::TWO_DASHES, 'd', false,
-              N_("Define common symbols"),
-              N_("Do not define common symbols"));
+             N_("Define common symbols"),
+             N_("Do not define common symbols"));
   DEFINE_bool(dc, options::ONE_DASH, '\0', false,
-              N_("Alias for -d"), NULL);
+             N_("Alias for -d"), NULL);
   DEFINE_bool(dp, options::ONE_DASH, '\0', false,
-              N_("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][,...]"));
+               N_("Turn on debugging"),
+               N_("[all,files,script,task][,...]"));
 
   DEFINE_special(defsym, options::TWO_DASHES, '\0',
-                 N_("Define a symbol"), N_("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"),
@@ -708,35 +709,35 @@ class General_options
              NULL);
 
   DEFINE_bool(detect_odr_violations, options::TWO_DASHES, '\0', false,
-              N_("Look for violations of the C++ One Definition Rule"),
+             N_("Look for violations of the C++ One Definition Rule"),
              N_("Do not look for violations of the C++ One Definition Rule"));
 
   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);
+             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);
+             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);
+             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);
+             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"));
+                N_("Read a list of dynamic symbols"), N_("FILE"));
 
   DEFINE_string(entry, options::TWO_DASHES, 'e', NULL,
-                N_("Set program start address"), N_("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,
-              N_("Export all dynamic symbols"),
+             N_("Export all dynamic symbols"),
              N_("Do not export all dynamic symbols (default)"));
 
   DEFINE_set(export_dynamic_symbol, options::TWO_DASHES, '\0',
@@ -749,7 +750,7 @@ class General_options
                 N_("Link little-endian objects."), NULL);
 
   DEFINE_bool(eh_frame_hdr, options::TWO_DASHES, '\0', false,
-              N_("Create exception frame header"), NULL);
+             N_("Create exception frame header"), NULL);
 
   DEFINE_bool(enum_size_warning, options::TWO_DASHES, '\0', true, NULL,
              N_("(ARM only) Do not warn about objects with incompatible "
@@ -768,7 +769,7 @@ class General_options
              N_("Do not treat warnings as errors"));
 
   DEFINE_string(fini, options::ONE_DASH, '\0', "_fini",
-                N_("Call SYMBOL at unload-time"), N_("SYMBOL"));
+               N_("Call SYMBOL at unload-time"), N_("SYMBOL"));
 
   DEFINE_bool(fix_cortex_a8, options::TWO_DASHES, '\0', false,
              N_("(ARM only) Fix binaries for Cortex-A8 erratum."),
@@ -783,13 +784,13 @@ class General_options
              N_("(ARM only) Do not merge exidx entries in debuginfo."));
 
   DEFINE_special(fix_v4bx, options::TWO_DASHES, '\0',
-                 N_("(ARM only) Rewrite BX rn as MOV pc, rn for ARMv4"),
-                 NULL);
+                N_("(ARM only) Rewrite BX rn as MOV pc, rn for ARMv4"),
+                NULL);
 
   DEFINE_special(fix_v4bx_interworking, options::TWO_DASHES, '\0',
-                 N_("(ARM only) Rewrite BX rn branch to ARMv4 interworking "
-                    "veneer"),
-                 NULL);
+                N_("(ARM only) Rewrite BX rn branch to ARMv4 interworking "
+                   "veneer"),
+                NULL);
 
   DEFINE_bool(g, options::EXACTLY_ONE_DASH, '\0', false,
              N_("Ignored"), NULL);
@@ -803,7 +804,7 @@ class General_options
              N_("Disable STB_GNU_UNIQUE symbol binding"));
 
   DEFINE_string(soname, options::ONE_DASH, 'h', NULL,
-                N_("Set shared library name"), N_("FILENAME"));
+               N_("Set shared library name"), N_("FILENAME"));
 
   DEFINE_double(hash_bucket_empty_fraction, options::TWO_DASHES, '\0', 0.0,
                N_("Min fraction of empty buckets in dynamic hash"),
@@ -814,7 +815,7 @@ class General_options
              {"sysv", "gnu", "both"});
 
   DEFINE_string(dynamic_linker, options::TWO_DASHES, 'I', NULL,
-                N_("Set dynamic linker path"), N_("PROGRAM"));
+               N_("Set dynamic linker path"), N_("PROGRAM"));
 
   DEFINE_special(incremental, options::TWO_DASHES, '\0',
                 N_("Do an incremental link if possible; "
@@ -832,21 +833,21 @@ class General_options
                 N_("Do an incremental link; exit if not possible"), NULL);
 
   DEFINE_string(incremental_base, options::TWO_DASHES, '\0', NULL,
-                N_("Set base file for incremental linking"
-                   " (default is output file)"),
-                N_("FILE"));
+               N_("Set base file for incremental linking"
+                  " (default is output file)"),
+               N_("FILE"));
 
   DEFINE_special(incremental_changed, options::TWO_DASHES, '\0',
-                 N_("Assume files changed"), NULL);
+                N_("Assume files changed"), NULL);
 
   DEFINE_special(incremental_unchanged, options::TWO_DASHES, '\0',
-                 N_("Assume files didn't change"), NULL);
+                N_("Assume files didn't change"), NULL);
 
   DEFINE_special(incremental_unknown, options::TWO_DASHES, '\0',
-                 N_("Use timestamps to check files (default)"), NULL);
+                N_("Use timestamps to check files (default)"), NULL);
 
   DEFINE_special(incremental_startup_unchanged, options::TWO_DASHES, '\0',
-                 N_("Assume startup files unchanged "
+                N_("Assume startup files unchanged "
                    "(files preceding this option)"), NULL);
 
   DEFINE_percent(incremental_patch, options::TWO_DASHES, '\0', 10,
@@ -854,44 +855,48 @@ class General_options
                 N_("PERCENT"));
 
   DEFINE_string(init, options::ONE_DASH, '\0', "_init",
-                N_("Call SYMBOL at load-time"), N_("SYMBOL"));
+               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"));
+                N_("Read only symbol values from FILE"), N_("FILE"));
 
   DEFINE_bool(map_whole_files, 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)"));
+             N_("Map whole files to memory (default on 64-bit hosts)"),
+             N_("Map relevant file parts to memory (default on 32-bit "
+                "hosts)"));
   DEFINE_bool(keep_files_mapped, options::TWO_DASHES, '\0', true,
-              N_("Keep files mapped across passes (default)"),
-              N_("Release mapped files after each pass"));
+             N_("Keep files mapped across passes (default)"),
+             N_("Release mapped files after each pass"));
 
   DEFINE_bool(ld_generated_unwind_info, options::TWO_DASHES, '\0', true,
              N_("Generate unwind information for PLT (default)"),
              N_("Do not generate unwind information for PLT"));
 
   DEFINE_special(library, options::TWO_DASHES, 'l',
-                 N_("Search for library LIBNAME"), N_("LIBNAME"));
+                N_("Search for library LIBNAME"), N_("LIBNAME"));
 
   DEFINE_dirlist(library_path, options::TWO_DASHES, 'L',
-                 N_("Add directory to search path"), N_("DIR"));
+                N_("Add directory to search path"), N_("DIR"));
 
   DEFINE_bool(nostdlib, options::ONE_DASH, '\0', false,
-              N_(" Only search directories specified on the command line."),
-              NULL);
+             N_(" Only search directories specified on the command line."),
+             NULL);
 
   DEFINE_bool(rosegment, options::TWO_DASHES, '\0', false,
-              N_(" Put read-only non-executable sections in their own segment"),
-              NULL);
+             N_(" Put read-only non-executable sections in their own segment"),
+             NULL);
+
+  DEFINE_uint64(rosegment_gap, options::TWO_DASHES, '\0', -1U,
+               N_("Set offset between executable and read-only segments"),
+               N_("OFFSET"));
 
   DEFINE_string(m, options::EXACTLY_ONE_DASH, 'm', "",
-                N_("Set GNU linker emulation; obsolete"), N_("EMULATION"));
+               N_("Set GNU linker emulation; obsolete"), N_("EMULATION"));
 
   DEFINE_bool(mmap_output_file, options::TWO_DASHES, '\0', true,
-              N_("Map the output file for writing (default)."),
-              N_("Do not map the output file for writing."));
+             N_("Map the output file for writing (default)."),
+             N_("Do not map the output file for writing."));
 
   DEFINE_bool(print_map, options::TWO_DASHES, 'M', false,
              N_("Write map file on standard output"), NULL);
@@ -916,10 +921,10 @@ class General_options
                    NULL, false);
 
   DEFINE_string(output, options::TWO_DASHES, 'o', "a.out",
-                N_("Set output file name"), N_("FILE"));
+               N_("Set output file name"), N_("FILE"));
 
   DEFINE_uint(optimize, options::EXACTLY_ONE_DASH, 'O', 0,
-              N_("Optimize output file size"), N_("LEVEL"));
+             N_("Optimize output file size"), N_("LEVEL"));
 
   DEFINE_string(oformat, options::EXACTLY_TWO_DASHES, '\0', "elf",
                N_("Set output format"), N_("[binary]"));
@@ -938,18 +943,18 @@ class General_options
 
 #ifdef ENABLE_PLUGINS
   DEFINE_special(plugin, options::TWO_DASHES, '\0',
-                 N_("Load a plugin library"), N_("PLUGIN"));
+                N_("Load a plugin library"), N_("PLUGIN"));
   DEFINE_special(plugin_opt, options::TWO_DASHES, '\0',
-                 N_("Pass an option to the plugin"), N_("OPTION"));
+                N_("Pass an option to the plugin"), N_("OPTION"));
 #endif
 
   DEFINE_bool(posix_fallocate, options::TWO_DASHES, '\0', true,
-              N_("Use posix_fallocate to reserve space in the output file"
+             N_("Use posix_fallocate to reserve space in the output file"
                 " (default)."),
-              N_("Use fallocate or ftruncate to reserve space."));
+             N_("Use fallocate or ftruncate to reserve space."));
 
   DEFINE_bool(preread_archive_symbols, options::TWO_DASHES, '\0', false,
-              N_("Preread archive symbols when multi-threaded"), NULL);
+             N_("Preread archive symbols when multi-threaded"), NULL);
 
   DEFINE_bool(print_output_format, options::TWO_DASHES, '\0', false,
              N_("Print default output format"), NULL);
@@ -962,10 +967,10 @@ class General_options
              N_("Ignored for SVR4 compatibility"), NULL);
 
   DEFINE_bool(emit_relocs, options::TWO_DASHES, 'q', false,
-              N_("Generate relocations in output"), NULL);
+             N_("Generate relocations in output"), NULL);
 
   DEFINE_bool(relocatable, options::EXACTLY_ONE_DASH, 'r', false,
-              N_("Generate relocatable output"), NULL);
+             N_("Generate relocatable output"), NULL);
   DEFINE_bool_alias(i, relocatable, options::EXACTLY_ONE_DASH, '\0',
                    N_("Synonym for -r"), NULL, false);
 
@@ -973,20 +978,20 @@ class General_options
              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"));
+               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',
-                 N_("Add DIR to runtime search path"), N_("DIR"));
+                N_("Add DIR to runtime search path"), N_("DIR"));
 
   DEFINE_dirlist(rpath, options::ONE_DASH, '\0',
-                 N_("Add DIR to runtime search path"), N_("DIR"));
+                N_("Add DIR to runtime search path"), N_("DIR"));
 
   DEFINE_dirlist(rpath_link, options::TWO_DASHES, '\0',
-                 N_("Add DIR to link time shared library search path"),
-                 N_("DIR"));
+                N_("Add DIR to link time shared library search path"),
+                N_("DIR"));
 
   DEFINE_string(section_ordering_file, options::TWO_DASHES, '\0', NULL,
                N_("Layout sections in the order specified."),
@@ -1004,32 +1009,32 @@ class General_options
              N_("COUNT"));
 
   DEFINE_bool(strip_all, options::TWO_DASHES, 's', false,
-              N_("Strip all symbols"), NULL);
+             N_("Strip all symbols"), NULL);
   DEFINE_bool(strip_debug, options::TWO_DASHES, 'S', false,
-              N_("Strip debugging information"), NULL);
+             N_("Strip debugging information"), NULL);
   DEFINE_bool(strip_debug_non_line, options::TWO_DASHES, '\0', false,
-              N_("Emit only debug line number information"), NULL);
+             N_("Emit only debug line number information"), NULL);
   DEFINE_bool(strip_debug_gdb, options::TWO_DASHES, '\0', false,
-              N_("Strip debug symbols that are unused by gdb "
-                 "(at least versions <= 7.4)"), NULL);
+             N_("Strip debug symbols that are unused by gdb "
+                "(at least versions <= 7.4)"), NULL);
   DEFINE_bool(strip_lto_sections, options::TWO_DASHES, '\0', true,
-              N_("Strip LTO intermediate code sections"), NULL);
+             N_("Strip LTO intermediate code sections"), NULL);
 
   DEFINE_int(stub_group_size, options::TWO_DASHES , '\0', 1,
-             N_("(ARM only) The maximum distance from instructions in a group "
+            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);
+             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);
+             N_("Generate shared library"), NULL);
 
   DEFINE_bool(Bshareable, options::ONE_DASH, '\0', false,
-              N_("Generate shared library"), NULL);
+             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"),
@@ -1038,63 +1043,63 @@ class General_options
   // 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',
-                 N_("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 ctors, dtors and functions whose"
-                 " pointers are definitely not taken."),
-             ("[none,all,safe]"),      
-              {"none", "all", "safe"});
+             N_("Identical Code Folding. "
+                "\'--icf=safe\' Folds ctors, dtors and functions whose"
+                " pointers are definitely not taken."),
+             ("[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"));
+             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"));
+             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)"));
+             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"));
+             N_("List removed unused sections on stderr"),
+             N_("Do not list removed unused sections"));
 
   DEFINE_bool(stats, options::TWO_DASHES, '\0', false,
-              N_("Print resource usage statistics"), NULL);
+             N_("Print resource usage statistics"), NULL);
 
   DEFINE_string(sysroot, options::TWO_DASHES, '\0', "",
-                N_("Set target system root directory"), N_("DIR"));
+               N_("Set target system root directory"), N_("DIR"));
 
   DEFINE_bool(trace, options::TWO_DASHES, 't', false,
-              N_("Print the name of each input file"), NULL);
+             N_("Print the name of each input file"), NULL);
 
   DEFINE_special(script, options::TWO_DASHES, 'T',
-                 N_("Read linker script"), N_("FILE"));
+                N_("Read linker script"), N_("FILE"));
 
   DEFINE_bool(threads, options::TWO_DASHES, '\0', false,
-              N_("Run the linker multi-threaded"),
-              N_("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,
-              N_("Number of threads to use"), N_("COUNT"));
+             N_("Number of threads to use"), N_("COUNT"));
   DEFINE_uint(thread_count_initial, options::TWO_DASHES, '\0', 0,
-              N_("Number of threads to use in initial pass"), N_("COUNT"));
+             N_("Number of threads to use in initial pass"), N_("COUNT"));
   DEFINE_uint(thread_count_middle, options::TWO_DASHES, '\0', 0,
-              N_("Number of threads to use in middle pass"), N_("COUNT"));
+             N_("Number of threads to use in middle pass"), N_("COUNT"));
   DEFINE_uint(thread_count_final, options::TWO_DASHES, '\0', 0,
-              N_("Number of threads to use in final pass"), N_("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"));
+               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"));
+               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"));
+               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"));
@@ -1107,10 +1112,10 @@ class General_options
                  "ignore-in-shared-libs"});
 
   DEFINE_bool(verbose, options::TWO_DASHES, '\0', false,
-              N_("Synonym for --debug=files"), NULL);
+             N_("Synonym for --debug=files"), NULL);
 
   DEFINE_special(version_script, options::TWO_DASHES, '\0',
-                 N_("Read version script"), N_("FILE"));
+                N_("Read version script"), N_("FILE"));
 
   DEFINE_bool(warn_common, options::TWO_DASHES, '\0', false,
              N_("Warn about duplicate common symbols"),
@@ -1150,14 +1155,14 @@ class General_options
                 "wchar_t sizes"));
 
   DEFINE_bool(whole_archive, options::TWO_DASHES, '\0', false,
-              N_("Include all archive contents"),
-              N_("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"));
+            N_("Trace references to symbol"), N_("SYMBOL"));
 
   DEFINE_bool(undefined_version, options::TWO_DASHES, '\0', true,
              N_("Allow unused version in script (default)"),
@@ -1168,15 +1173,15 @@ class General_options
                N_("PATH"));
 
   DEFINE_special(start_group, options::TWO_DASHES, '(',
-                 N_("Start a library search group"), NULL);
+                N_("Start a library search group"), NULL);
   DEFINE_special(end_group, options::TWO_DASHES, ')',
-                 N_("End a library search group"), NULL);
+                N_("End a library search group"), NULL);
 
 
   DEFINE_special(start_lib, options::TWO_DASHES, '\0',
-                 N_("Start a library"), NULL);
+                N_("Start a library"), NULL);
   DEFINE_special(end_lib, options::TWO_DASHES, '\0',
-                 N_("End a library "), NULL);
+                N_("End a library "), NULL);
 
   // The -z options.
 
@@ -1184,12 +1189,12 @@ class General_options
              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"));
+               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);
+             N_("Report undefined symbols (even with --shared)"),
+             NULL);
   DEFINE_bool(execstack, options::DASH_Z, '\0', false,
-              N_("Mark output as 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);
@@ -1203,7 +1208,7 @@ class General_options
              N_("Mark object requiring immediate process"),
              NULL);
   DEFINE_uint64(max_page_size, options::DASH_Z, '\0', 0,
-                N_("Set maximum page size to SIZE"), N_("SIZE"));
+               N_("Set maximum page size to SIZE"), N_("SIZE"));
   DEFINE_bool(muldefs, options::DASH_Z, '\0', false,
              N_("Allow multiple definitions of symbols"),
              NULL);
@@ -1225,13 +1230,13 @@ class General_options
              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);
+             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);
+                "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"));
@@ -1313,7 +1318,7 @@ class General_options
   should_retain_symbol(const char* symbol_name) const
     {
       if (symbols_to_retain_.empty())    // means flag wasn't specified
-        return true;
+       return true;
       return symbols_to_retain_.find(symbol_name) != symbols_to_retain_.end();
     }
 
@@ -1456,7 +1461,7 @@ class General_options
     // Do not fold any functions (Default or --icf=none).
     ICF_NONE,
     // All functions are candidates for folding. (--icf=all).
-    ICF_ALL,   
+    ICF_ALL,
     // Only ctors and dtors are candidates for folding. (--icf=safe).
     ICF_SAFE
   };
@@ -1549,7 +1554,7 @@ class General_options
   type__                                        \
   varname__() const                             \
   { return this->varname__##_; }                \
-                                                \
+                                               \
   void                                          \
   set_##varname__(type__ value)                 \
   { this->varname__##_ = value; }               \
@@ -1560,7 +1565,7 @@ class Position_dependent_options
 {
  public:
   Position_dependent_options(const General_options& options
-                             = Position_dependent_options::default_options_)
+                            = Position_dependent_options::default_options_)
   { copy_from_options(options); }
 
   void copy_from_options(const General_options& options)
@@ -1617,9 +1622,9 @@ class Input_file_argument
   { }
 
   Input_file_argument(const char* name, Input_file_type type,
-                      const char* extra_search_path,
-                      bool just_symbols,
-                      const Position_dependent_options& options)
+                     const char* extra_search_path,
+                     bool just_symbols,
+                     const Position_dependent_options& options)
     : name_(name), type_(type), extra_search_path_(extra_search_path),
       just_symbols_(just_symbols), options_(options), arg_serial_(0)
   { }
@@ -1629,9 +1634,9 @@ class Input_file_argument
   // position-independent vars from the General_options and only store
   // those.
   Input_file_argument(const char* name, Input_file_type type,
-                      const char* extra_search_path,
-                      bool just_symbols,
-                      const General_options& options)
+                     const char* extra_search_path,
+                     bool just_symbols,
+                     const General_options& options)
     : name_(name), type_(type), extra_search_path_(extra_search_path),
       just_symbols_(just_symbols), options_(options), arg_serial_(0)
   { }
@@ -1656,8 +1661,8 @@ class Input_file_argument
   extra_search_path() const
   {
     return (this->extra_search_path_.empty()
-            ? NULL
-            : this->extra_search_path_.c_str());
+           ? NULL
+           : this->extra_search_path_.c_str());
   }
 
   // Return whether we should only read symbols from this file.
@@ -1970,7 +1975,7 @@ class Command_line
   // is set to true if argv[i] is "--".
   int
   process_one_option(int argc, const char** argv, int i,
-                     bool* no_more_options);
+                    bool* no_more_options);
 
   // Get the general options.
   const General_options&