_gold_dummy_zoption

# DP: let gold accept a dummy -z buildd-<random-string> option.

Gbp-Pq: Name 161_gold_dummy_zoption.diff

diff --git a/gold/options.cc b/gold/options.cc
index d9e204b66ff05e4874d5da11c310584aa0f62967..d18f790d078ac558e303f79bf7e6b29c56e4f377 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -965,6 +965,8 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
     {
       int dummy_i = 0;
       const char* dash_z_arg = *arg;
+      if (strncmp(dash_z_arg, "buildd", strlen("buildd")) == 0)
+         *arg = "buildd";
       retval = parse_long_option(1, arg, true, arg, &dummy_i);
       if (retval == NULL)
        usage(_("unknown -z option"), dash_z_arg);

diff --git a/gold/options.h b/gold/options.h
index 11054981c9ab6a153fa4ed47cbf4c70bbbc97720..51f989d0e2bc120d2ff92988082161a20209928a 100644 (file)
--- a/gold/options.h
+++ b/gold/options.h
@@ -1390,6 +1390,9 @@ class General_options
                    options::TWO_DASHES, '\0',
                    N_("Report unresolved symbols as errors"),
                    NULL, true);
+  DEFINE_bool(buildd, options::DASH_Z, '\0', false,
+             N_("Dummy z option"),
+             NULL);
 
   DEFINE_bool(wchar_size_warning, options::TWO_DASHES, '\0', true, NULL,
              N_("(ARM only) Do not warn about objects with incompatible "