From: James Clarke <jrtc27@jrtc27.com>
Date: Fri, 4 Aug 2017 05:44:21 +0000 (-0700)
Subject: Add --no-relax option.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13d7031e342b76e68dff74120a8f2a4c4e70a142;p=thirdparty%2Fbinutils-gdb.git

Add --no-relax option.

gold/
	* options.h (General_options): Set a non-NULL second help string
	argument for relax to allow --no-relax.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 795837b64ad..0fc54ddf71e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-03  James Clarke  <jrtc27@jrtc27.com>
+
+	* options.h (General_options): Set a non-NULL second help string
+	argument for relax to allow --no-relax.
+
 2017-09-20  Alan Modra  <amodra@gmail.com>
 
 	* powerpc.cc (Target_powerpc::Branch_info::make_stub): Put
diff --git a/gold/options.h b/gold/options.h
index 576b2a3c536..4a802cf41fe 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -1164,7 +1164,8 @@ class General_options
 	      N_("Generate relocatable output"), NULL);
 
   DEFINE_bool(relax, options::TWO_DASHES, '\0', false,
-	      N_("Relax branches on certain targets"), NULL);
+	      N_("Relax branches on certain targets"),
+	      N_("Do not relax branches"));
 
   DEFINE_string(retain_symbols_file, options::TWO_DASHES, '\0', NULL,
 		N_("keep only symbols listed in this file"), N_("FILE"));