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 795837b64ada94b54bb00bc635250105135aeaa5..0fc54ddf71e92fdd5a770c1ef0e4e40a9e3f8e71 100644 (file)
--- 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 576b2a3c536ea17d7594d1253cfd07bb01b1cd99..4a802cf41fef376bcd7a047bd93f274a85ce1ca6 100644 (file)
--- 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"));