* Makefile.in: Note dependencies on bucomm.h.

	(cplus-dem.o): Link c++filt with version.o.

	* strings.c: Include bucomm.h and add prototypes to other decls.
	Remove -h option.

	* bucomm.h: Declare xrealloc.

	* nm.c, objcopy.c, objdump.c, size.c, strings.c (main, usage): Add
	--help option.  Put "GNU" in the version message.
	(usage): Take stream and exit status as args.
	(main): Pass new args to usage.

1 files changed, 23 insertions, 11 deletions

diff --git a/binutils/objdump.1 b/binutils/objdump.1
index c7c4f0a..3d0a5f0 100644
--- a/binutils/objdump.1
+++ b/binutils/objdump.1
@@ -14,7 +14,7 @@ objdump\(em\&display information from object files.
 .hy 0
 .na
 .TP
-.B   objdump
+.B objdump
 .RB "[\|" \-a "\|]" 
 .RB "[\|" "\-b\ "\c
 .I bfdname\c
@@ -35,6 +35,8 @@ objdump\(em\&display information from object files.
 .RB "[\|" \-\-stabs "\|]"
 .RB "[\|" \-t | \-\-syms "\|]" 
 .RB "[\|" \-x "\|]"
+.RB "[\|" \-\-version "\|]"
+.RB "[\|" \-\-help "\|]"
 .I objfile\c
 \&.\|.\|.
 .ad b
@@ -47,17 +49,17 @@ The options control what particular information to display.  This
 information is mostly useful to programmers who are working on the
 compilation tools, as opposed to programmers who just want their
 program to compile and work.
-.SH OPTIONS
-Where long and short forms of an option are shown together, they are
-equivalent.
-
-.TP
+.PP
 .IR  "objfile" .\|.\|.
-The object files to be examined.  When you specify archives,
+are the object files to be examined.  When you specify archives,
 \c
 .B objdump\c
 \& shows information on each of the member object files.
 
+.SH OPTIONS
+Where long and short forms of an option are shown together, they are
+equivalent.
+
 .TP
 .B \-a
 If any files from \c
@@ -76,7 +78,7 @@ the object file format of each archive member.
 .TP
 .BI "-b " "bfdname"\c
 \&
-You can specify a particular object-code format for your object files as
+Specify the object-code format for the object files to be
 \c
 .I bfdname\c
 \&.  This may not be necessary; \c
@@ -89,7 +91,7 @@ objdump\ \-b\ oasys\ \-m\ vax\ \-h\ fu.o
 .br
 .sp
 
-Displays summary information from the section headers (`\|\c
+display summary information from the section headers (`\|\c
 .B \-h\c
 \|') of
 `\|\c
@@ -124,6 +126,12 @@ Header.  Display summary information from the section headers of the
 object file.
 
 .TP
+.B \-\-help
+Print a summary of the options to
+.B objdump
+and exit.
+
+.TP
 .B \-i
 Display a list showing all architectures and object formats available
 for specification with \c
@@ -186,6 +194,12 @@ This is similar to the information provided by the `\|\c
 \|' program.
 
 .TP
+.B \-\-version
+Print the version number of
+.B objdump
+and exit.
+
+.TP
 .B \-x
 Display all available header information, including the symbol table and
 relocation entries.  Using `\|\c
@@ -195,8 +209,6 @@ relocation entries.  Using `\|\c
 .B \-a \-f \-h \-r \-t\c
 \|'.
 
-.PP
-
 .SH "SEE ALSO"
 .RB "`\|" binutils "\|'"
 entry in