Changed command line switch from --m32rx-enable-special to --hidden

Removed documentation about the switch.

3 files changed, 13 insertions, 29 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4ea6a03..e49c44a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -10,17 +10,6 @@ Mon May 18 09:31:43 1998  Michael Meissner  <meissner@cygnus.com>
 	* write.c (fixup_segment): Improve error message for sym1-sym2
 	errors when sym1 is in a different segment from sym2.
 
-start-sanitize-m32rx
-Thu May 14 13:49:39 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* config/tc-m32r.c: Chnage command line switch from
-	--enable-special to --m32rx-enable-special and add shorter
-	synonym: --m32rx-es.
-	* doc/c-m32r.texi (M32R-Opts): Document changes to command line
-	switch. 
-	* testsuite/gas/m32rx/m32rx.d: Change switch.
-	
-end-sanitize-m32rx
 Wed May 13 10:16:37 1998  Doug Evans  <devans@canuck.cygnus.com>
 
 	* config/tc-m32r.c (warn_unmatched_high): New static local.
@@ -39,14 +28,6 @@ Wed May 13 10:16:37 1998  Doug Evans  <devans@canuck.cygnus.com>
 	(stabs_generate_asm_lineno): Move file name handling into
 	generate_asm_file.
 
-start-sanitize-m32rx
-Tue May 12 13:34:12 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* config/tc-m32r.c: Add command line switch to support special
-	M32Rx instructions.
-	* doc/c-m32r.texi: Document new command line switch.
-	
-end-sanitize-m32rx	
 Tue May 12 12:03:44 1998  Richard Henderson  <rth@cygnus.com>
 
 	* config/tc-d30v.c (cur_mul32_p, prev_mul32_p): Make static.
diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 1e48e64..c5a8a9f 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -91,7 +91,7 @@ static int warn_unmatched_high = 0;
    extended M32RX instruction set should be enabled.  */
 static int enable_m32rx = 0;
 
-/* Non-zero if --m32rx-enable-special has been specified, in which case support for
+/* Non-zero if --m32rx --hidden has been specified, in which case support for
    the special M32RX instruction set should be enabled.  */
 static int enable_special = 0;
 
@@ -170,8 +170,7 @@ struct option md_longopts[] =
   {"no-warn-explicit-parallel-conflicts", no_argument, NULL, OPTION_NO_WARN_PARALLEL},
   {"Wnp", no_argument, NULL, OPTION_NO_WARN_PARALLEL},
 #define OPTION_SPECIAL	(OPTION_MD_BASE + 3)
-  {"m32rx-enable-special", no_argument, NULL, OPTION_SPECIAL},
-  {"m32rx-es", no_argument, NULL, OPTION_SPECIAL},
+  {"hidden", no_argument, NULL, OPTION_SPECIAL},
 /* end-sanitize-m32rx */
 
   /* Sigh.  I guess all warnings must now have both variants.  */
@@ -218,8 +217,16 @@ md_parse_option (c, arg)
       break;
 
     case OPTION_SPECIAL:
-      allow_m32rx (1);
-      enable_special = 1;
+      if (enable_m32rx)
+	enable_special = 1;
+      else
+	{
+	  extern char * myname;
+
+	  /* Pretend that we do not recognise this option.  */
+	  fprintf (stderr, _("%s: unrecognised option: --hidden\n"), myname);
+	  return 0;
+	}
       break;
 /* end-sanitize-m32rx */
 
@@ -256,10 +263,6 @@ md_show_usage (stream)
   fprintf (stream, _("\
 --m32rx			support the extended m32rx instruction set\n"));
   fprintf (stream, _("\
---m32rx-enable-special	support the special m32rx instructions\n"));
-  fprintf (stream, _("\
---m32rx-es		synonym for --m32rx-enable-special\n"));
-  fprintf (stream, _("\
 -O			try to combine instructions in parallel\n"));
 
   fprintf (stream, _("\
diff --git a/gas/testsuite/gas/m32r/m32rx.d b/gas/testsuite/gas/m32r/m32rx.d
index 919256c..ddd920d 100644
--- a/gas/testsuite/gas/m32r/m32rx.d
+++ b/gas/testsuite/gas/m32r/m32rx.d
@@ -1,4 +1,4 @@
-#as: -m32rx --no-warn-explicit-parallel-conflicts --m32rx-enable-special
+#as: -m32rx --no-warn-explicit-parallel-conflicts --hidden
 #objdump: -dr
 #name: m32rx