Change -mz command line option to -my for the MSP430 port of GAS.

	* config/tc-msp430.c (OPTION_WARN_INTR_NOPS): Use y instead of z.
	(OPTION_NO_WARN_INTR_NOPS): Use Y instead of Z.
	* doc/c-msp430.texi: Update command line option description.

	* gas/msp430/bad.d: Use -my not -mz.

5 files changed, 20 insertions, 10 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 98186d3..040e5d8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-msp430.c (OPTION_WARN_INTR_NOPS): Use y instead of z.
+	(OPTION_NO_WARN_INTR_NOPS): Use Y instead of Z.
+	* doc/c-msp430.texi: Update command line option description.
+
 2014-05-22  Alan Modra  <amodra@gmail.com>
 
 	* listing.c (listing_warning, listing_error): Add space after colon.
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index 2db0fc0..1398b8c 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -673,8 +673,8 @@ static bfd_boolean large_model = FALSE;
 #define OPTION_NO_INTR_NOPS 'N'
 #define OPTION_INTR_NOPS 'n'
 static bfd_boolean gen_interrupt_nops = FALSE;
-#define OPTION_WARN_INTR_NOPS 'z'
-#define OPTION_NO_WARN_INTR_NOPS 'Z'
+#define OPTION_WARN_INTR_NOPS 'y'
+#define OPTION_NO_WARN_INTR_NOPS 'Y'
 static bfd_boolean warn_interrupt_nops = TRUE;
 #define OPTION_MCPU 'c'
 #define OPTION_MOVE_DATA 'd'
@@ -919,7 +919,7 @@ const pseudo_typeS md_pseudo_table[] =
   {NULL, NULL, 0}
 };
 
-const char *md_shortopts = "mm:,mP,mQ,ml,mN,mn,mz,mZ";
+const char *md_shortopts = "mm:,mP,mQ,ml,mN,mn,my,mY";
 
 struct option md_longopts[] =
 {
@@ -930,8 +930,8 @@ struct option md_longopts[] =
   {"ml", no_argument, NULL, OPTION_LARGE},
   {"mN", no_argument, NULL, OPTION_NO_INTR_NOPS},
   {"mn", no_argument, NULL, OPTION_INTR_NOPS},
-  {"mZ", no_argument, NULL, OPTION_NO_WARN_INTR_NOPS},
-  {"mz", no_argument, NULL, OPTION_WARN_INTR_NOPS},
+  {"mY", no_argument, NULL, OPTION_NO_WARN_INTR_NOPS},
+  {"my", no_argument, NULL, OPTION_WARN_INTR_NOPS},
   {"md", no_argument, NULL, OPTION_MOVE_DATA},
   {NULL, no_argument, NULL, 0}
 };
@@ -955,9 +955,9 @@ md_show_usage (FILE * stream)
   fprintf (stream,
 	   _("  -mn - insert a NOP after changing interrupts\n"));
   fprintf (stream,
-	   _("  -mZ - do not warn about missing NOPs after changing interrupts\n"));
+	   _("  -mY - do not warn about missing NOPs after changing interrupts\n"));
   fprintf (stream,
-	   _("  -mz - warn about missing NOPs after changing interrupts (default)\n"));
+	   _("  -my - warn about missing NOPs after changing interrupts (default)\n"));
   fprintf (stream,
 	   _("  -md - Force copying of data from ROM to RAM at startup\n"));
 }
diff --git a/gas/doc/c-msp430.texi b/gas/doc/c-msp430.texi
index c539946..cae3d8a 100644
--- a/gas/doc/c-msp430.texi
+++ b/gas/doc/c-msp430.texi
@@ -61,7 +61,7 @@ disables the generation of a NOP instruction following any instruction
 that might change the interrupts enabled/disabled state.  This is the
 default behaviour.
 
-@item -mz
+@item -my
 tells the assembler to generate a warning message if a NOP does not
 immediately forllow an instruction that enables or disables
 interrupts.  This is the default.
@@ -70,7 +70,7 @@ Note that this option can be stacked with the @option{-mn} option so
 that the assembler will both warn about missing NOP instructions and
 then insert them automatically.
 
-@item -mZ
+@item -mY
 disables warnings about missing NOP instructions.
 
 @item -md
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 855add8..bc6ba36 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* gas/msp430/bad.d: Use -my not -mz.
+
 2014-05-22  Alan Modra  <amodra@gmail.com>
 
 	* gas/d30v/bittest.l: Update for changed whitespace.
diff --git a/gas/testsuite/gas/msp430/bad.d b/gas/testsuite/gas/msp430/bad.d
index 1a067b5..749759e 100644
--- a/gas/testsuite/gas/msp430/bad.d
+++ b/gas/testsuite/gas/msp430/bad.d
@@ -1,4 +1,4 @@
 #name: Diagnostics Quality
 #source: bad.s
-#as: -mz
+#as: -my
 #error-output: bad.l