2001-06-11 H.J. Lu <hjl@gnu.org>

	* NEWS: Updated for the new -n option for the MIPS assembler.

	* config/tc-mips.c (md_show_usage): Add -n.

	* doc/as.texinfo: Document the new -n option.
	* doc/c-mips.texi: Likewise.
	* doc/as.1: Regenerated.

6 files changed, 31 insertions, 4 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 886a99b..a110b2a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-11  H.J. Lu  <hjl@gnu.org>
+
+	* NEWS: Updated for the new -n option for the MIPS assembler.
+
+	* config/tc-mips.c (md_show_usage): Add -n.
+
+	* doc/as.texinfo: Document the new -n option.
+	* doc/c-mips.texi: Likewise.
+	* doc/as.1: Regenerated.
+
 2001-06-10  Alan Modra  <amodra@bigpond.net.au>
 
 	* config/obj-coff.c (obj_coff_section): Formatting fix.
diff --git a/gas/NEWS b/gas/NEWS
index 6c3439d..a5479f3 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,9 @@
 -*- text -*-
 
+The MIPS assembler no longer issues a warning by default when it
+generates a nop instruction from a macro. The new command line option
+-n will turn on the warning.
+
 Changes in 2.11:
 
 x86 gas now supports the full Pentium4 instruction set.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index ea5fe48..828b37d 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -9331,6 +9331,7 @@ MIPS options:\n\
   fprintf (stream, _("\
 -O0			remove unneeded NOPs, do not swap branches\n\
 -O			remove unneeded NOPs and swap branches\n\
+-n			warn about NOPs generated from macros\n\
 --[no-]construct-floats [dis]allow floating point values to be constructed\n\
 --trap, --no-break	trap exception on div by 0 and mult overflow\n\
 --break, --no-trap	break exception on div by 0 and mult overflow\n"));
diff --git a/gas/doc/as.1 b/gas/doc/as.1
index 51036ea..a53d53a 100644
--- a/gas/doc/as.1
+++ b/gas/doc/as.1
@@ -1,5 +1,5 @@
 .\" Automatically generated by Pod::Man version 1.02
-.\" Fri Apr 13 11:27:39 2001
+.\" Mon Jun 11 09:28:09 2001
 .\"
 .\" Standard preamble:
 .\" ======================================================================
@@ -137,7 +137,7 @@
 .\" ======================================================================
 .\"
 .IX Title "AS 1"
-.TH AS 1 "binutils-2.11.90" "2001-04-13" "GNU"
+.TH AS 1 "binutils-2.11.90" "2001-06-11" "GNU"
 .UC
 .SH "NAME"
 \&\s-1AS\s0 \- the portable \s-1GNU\s0 assembler.
@@ -192,7 +192,7 @@ as [ \-a[cdhlns][=file] ] [ \-D ]  [ \-\-defsym \fIsym\fR=\fIval\fR ]
  [ \-mips1 ] [ \-mips2 ] [ \-mips3 ] [ \-mips4 ] [ \-mips5 ]
  [ \-mips32 ] [ \-mips64 ]
  [ \-m4650 ] [ \-no-m4650 ]
- [ \-\-trap ] [ \-\-break ]
+ [ \-\-trap ] [ \-\-break ] [ \-n ]
  [ \-\-emulation=\fIname\fR ]
  [ \*(-- | \fIfiles\fR ... ]
 .SH "DESCRIPTION"
@@ -677,6 +677,10 @@ Control how to deal with multiplication overflow and division by zero.
 (and only work for Instruction Set Architecture level 2 and higher);
 \&\fB\*(--break\fR or \fB\*(--no-trap\fR (also synonyms, and the default) take a
 break exception.
+.Ip "\f(CW\*(C`\-n\*(C'\fR" 4
+.IX Item "-n"
+When this option is used, \f(CW\*(C`as\*(C'\fR will issue a warning every
+time it generates a nop instruction from a macro.
 .PP
 The following options are available when as is configured for
 an MCore processor.
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 04be74d..825fb38 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -332,7 +332,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
  [ -mips1 ] [ -mips2 ] [ -mips3 ] [ -mips4 ] [ -mips5 ]
  [ -mips32 ] [ -mips64 ]
  [ -m4650 ] [ -no-m4650 ]
- [ --trap ] [ --break ]
+ [ --trap ] [ --break ] [ -n ]
  [ --emulation=@var{name} ]
 @end ifset
  [ -- | @var{files} @dots{} ]
@@ -829,6 +829,10 @@ Control how to deal with multiplication overflow and division by zero.
 (and only work for Instruction Set Architecture level 2 and higher);
 @samp{--break} or @samp{--no-trap} (also synonyms, and the default) take a
 break exception.
+
+@item -n
+When this option is used, @code{@value{AS}} will issue a warning every
+time it generates a nop instruction from a macro.
 @end table
 @end ifset
 
diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index de5f221..64b7882 100644
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -189,6 +189,10 @@ are only supported at Instruction Set Architecture level 2 and higher.
 @itemx --no-trap
 Generate code to take a break exception rather than a trap exception when an
 error is detected.  This is the default.
+
+@item -n
+When this option is used, @code{@value{AS}} will issue a warning every
+time it generates a nop instruction from a macro.
 @end table
 
 @node MIPS Object