From: Matthias Klose <doko@debian.org>
Date: Sun, 8 Apr 2018 20:55:34 +0000 (+0100)
Subject: _gold_dummy_zoption
X-Git-Tag: archive/raspbian/2.30-15+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91c9c49db0bec24bf5380888d3d3418b7d31d016;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 5a12e5320..a7cab3f1c 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -967,6 +967,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 b39d5ff7b..042cccbef 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -1376,6 +1376,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 "