From: James Clarke <jrtc27@jrtc27.com>
Date: Fri, 4 Aug 2017 05:44:21 +0000 (-0700)
Subject: Add --no-relax option.
X-Git-Tag: users/ARM/embedded-binutils-master-2017q4~1469
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=223b97ba9d9d1aa61bf22058f637c779c7621e6f;p=external%2Fbinutils.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 c886cc1..950be70 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-08-01  Alan Modra  <amodra@gmail.com>
 
 	* ehframe.cc (Fde::operator==): New.
diff --git a/gold/options.h b/gold/options.h
index 7be15a5..6b45f64 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"));