From: Matthias Klose <doko@debian.org>
Date: Thu, 26 Jul 2018 10:23:07 +0000 (+0100)
Subject: _gold_dummy_zoption
X-Git-Tag: archive/raspbian/2.31.1-2+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3860d3f4a25fbac4dd11b426cdc409a4ae773d34;p=binutils.git

_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 d9e204b66..d18f790d0 100644
--- 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 98d6be800..7b756d3c5 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -1386,6 +1386,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 "