Fix help messages about demangling styles

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 88c9d1e84feefa85585b5bf97eb1941872ca0c7f..e3039efc5330de0120947751f6a0a4fe87518a4a 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-12  Bob Wilson  <bob.wilson@acm.org>
+
+       * nm.c (usage): Add `java' and `gnat' demangle styles and make
+       quotes consistent.
+       * objdump.c (usage): Ditto.  Also fix some typos.
+
 2003-02-10  Nick Clifton  <nickc@redhat.com>
 
        * readelf.c (decode_ARM_machine_flags): Handle the

diff --git a/binutils/nm.c b/binutils/nm.c
index 06d99af82dd65589f4bc78b52898e6ef63c1a65d..5d88ae6b36c14076d418008adc66e427cc71b2a2 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -1,6 +1,6 @@
 /* nm.c -- Describe symbol table of a rel file.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002
+   2001, 2002, 2003
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -288,7 +288,8 @@ usage (stream, status)
   -B                     Same as --format=bsd\n\
   -C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
                           The STYLE, if specified, can be `auto' (the default),\n\
-                          `gnu', 'lucid', 'arm', 'hp', 'edg' or 'gnu-v3'\n\
+                          `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\
+                          or `gnat'\n\
       --no-demangle      Do not demangle low-level symbol names\n\
   -D, --dynamic          Display dynamic symbols instead of normal symbols\n\
       --defined-only     Display only defined symbols\n\

diff --git a/binutils/objdump.c b/binutils/objdump.c
index eb777a80b2bdb737175315958ecde8735e59e1d2..97eddd71290c732b84ac459f7b372e9d26421e5c 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1,6 +1,6 @@
 /* objdump.c -- dump information about an object file.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002
+   2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -230,12 +230,13 @@ usage (stream, status)
       --file-start-context       Include context from start of file (with -S)\n\
   -l, --line-numbers             Include line numbers and filenames in output\n\
   -C, --demangle[=STYLE]         Decode mangled/processed symbol names\n\
-                                  The STYLE, if specified, can be `auto', 'gnu',\n\
-                                  'lucid', 'arm', 'hp', 'edg', or 'gnu-v3'\n\
+                                  The STYLE, if specified, can be `auto', `gnu',\n\
+                                  `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\
+                                  or `gnat'\n\
   -w, --wide                     Format output for more than 80 columns\n\
   -z, --disassemble-zeroes       Do not skip blocks of zeroes when disassembling\n\
-      --start-address=ADDR       Only process data whoes address is >= ADDR\n\
-      --stop-address=ADDR        Only process data whoes address is <= ADDR\n\
+      --start-address=ADDR       Only process data whose address is >= ADDR\n\
+      --stop-address=ADDR        Only process data whose address is <= ADDR\n\
       --prefix-addresses         Print complete address alongside disassembly\n\
       --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n\
       --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n\