From baed44cd14abcae7603f16b2b8c865e714dc0f6b Mon Sep 17 00:00:00 2001
From: David MacKenzie <djm@cygnus>
Date: Fri, 3 Jun 1994 21:19:02 +0000
Subject: [PATCH] 	* as.c (show_usage), config/tc-alpha.c
 (md_show_usage), 	config/tc-mips.c (md_show_usage): Fix up messages.

---
 gas/ChangeLog        | 3 +++
 gas/as.c             | 7 ++++---
 gas/config/tc-mips.c | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3bb916b9f3b..17a53f581ce 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 Fri Jun  3 12:50:13 1994  David J. MacKenzie  (djm@rtl.cygnus.com)
 
+	* as.c (show_usage), config/tc-alpha.c (md_show_usage),
+	config/tc-mips.c (md_show_usage): Fix up messages.
+
 	* as.h: Replace flagseen with separate variables.
 	* as.c (parse_args): Set them.  Don't accept -1 option, or -v
 	explicitly (it's a synonym for --version).
diff --git a/gas/as.c b/gas/as.c
index 30915062b3f..424d20242fc 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -111,7 +111,7 @@ Options:\n\
   l	include assembly\n\
   n	omit forms processing\n\
   s	include symbols\n\
--D			ignored\n\
+-D			produce assembler debugging messages\n\
 -f			skip whitespace and comment preprocessing\n\
 --help			show this message and exit\n\
 -I DIR			add DIR to search list for .include directives\n\
@@ -119,13 +119,14 @@ Options:\n\
 -K			warn when differences altered for long displacements\n\
 -L			keep local symbols (starting with `L')\n");
   fprintf (stream, "\
+-nocpp			ignored\n\
 -o OBJFILE		name the object-file output OBJFILE (default a.out)\n\
 -R			fold data section into text section\n\
 --statistics		print maximum bytes and total seconds used\n\
 --version		print assembler version number and exit\n\
 -W			suppress warnings\n\
 -w			ignored\n\
--x			ignored\n\
+-X			ignored\n\
 -Z			generate object file even after errors\n");
 
   md_show_usage (stream);
@@ -298,7 +299,7 @@ parse_args (pargc, pargv)
 
 	case 'D':
 	  /* DEBUG is implemented: it debugs different */
-	  /* things to other people's assemblers. */
+	  /* things from other people's assemblers. */
 	  flag_debug = 1;
 	  break;
 
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index e77ef72c638..4b6525ef116 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -5068,7 +5068,6 @@ md_show_usage (stream)
   fprintf(stream, "\
 MIPS options:\n\
 -membedded-pic		generate embedded position independent code\n\
--nocpp			ignored\n\
 -EB			generate big endian output\n\
 -EL			generate little endian output\n\
 -g, -g2			do not remove uneeded NOPs or swap branches\n\
-- 
2.30.2