* nm.c (long_options): Add --no-demangle to turn off --demangle,

and --no-cplus for Linux compatibility.
	(usage): Mention --no-demangle.
	* binutils.texi: Document --no-demangle.

binutils/ChangeLog

@@ -1,3 +1,10 @@
+Wed Jun 15 12:10:31 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nm.c (long_options): Add --no-demangle to turn off --demangle,
+	and --no-cplus for Linux compatibility.
+	(usage): Mention --no-demangle.
+	* binutils.texi: Document --no-demangle.
+
 Fri Jun 10 15:41:25 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* nm.c: HOST_64_BIT was renamed to BFD_HOST_64_BIT.

binutils/binutils.texi

@@ -572,7 +572,7 @@ nm [ -a | --debug-syms ]  [ -g | --extern-only ]
    [ -r | --reverse-sort ]  [ -u | --undefined-only ]  
    [ -t @var{radix} | --radix=@var{radix} ] [ -P | --portability ]
    [ --target=@var{bfdname} ] [ -f @var{format} | --format=@var{format} ]
-   [ -V | --version ]  [ --help ]  [ @var{objfile}@dots{} ]
+   [ --no-demangle ] [ -V | --version ]  [ --help ]  [ @var{objfile}@dots{} ]
 @end smallexample
 
 GNU @code{nm} lists the symbols from object files @var{objfile}@dots{}.
@@ -653,6 +653,9 @@ Besides removing any initial underscore prepended by the system, this
 makes C++ function names readable.  @xref{c++filt}, for more information
 on demangling.
 
+@item --no-demangle
+Do not demangle low-level symbol names.  This is the default.
+
 @item -D
 @itemx --dynamic
 @cindex dynamic symbols

binutils/nm.c

@@ -183,6 +183,8 @@ static struct option long_options[] =
   {"extern-only", no_argument, &external_only, 1},
   {"format", required_argument, 0, 'f'},
   {"help", no_argument, 0, 'h'},
+  {"no-cplus", no_argument, &do_demangle, 0},  /* Linux compatibility.  */
+  {"no-demangle", no_argument, &do_demangle, 0},
   {"no-sort", no_argument, &no_sort, 1},
   {"numeric-sort", no_argument, &sort_numerically, 1},
   {"portability", no_argument, 0, 'P'},
@@ -208,7 +210,8 @@ Usage: %s [-aABCDgnopPrsuvV] [-t radix] [--radix=radix] [--target=bfdname]\n\
        [--debug-syms] [--extern-only] [--print-armap] [--print-file-name]\n\
        [--numeric-sort] [--no-sort] [--reverse-sort] [--undefined-only]\n\
        [--portability] [-f {bsd,sysv,posix}] [--format={bsd,sysv,posix}]\n\
-       [--demangle] [--dynamic] [--version] [--help] [file...]\n",
+       [--demangle] [--no-demangle] [--dynamic] [--version] [--help]\n\
+       [file...]\n",
 	   program_name);
   exit (status);
 }