* binutils.texi: Add a chapter summarizing the ways to select

	aspects of the target for each program.

	* objdump.c (long_options, usage): Add long equivalents for all
	remaining short options that lacked them.
	* binutils.texi objdump.1: Document them.

	* size.c (usage): Tweak usage message.
	* size.1: Add missing `=' in examples.

	* binutils.texi strip.1 objcopy.1 nlmconv.1 objcopy.c nlmconv.c:
	Use "--target=bfdname" as the option to select the BFD target,
	like nm and size already do.
	Reserve "--format=format" for textual output selection options, but
	for now keep old option names as obsolete for backward compatibility.

	* strings.c (main, strings_object_file, usage): Add --target option.
	* binutils.texi strings.1: Document it.

1 files changed, 49 insertions, 19 deletions

diff --git a/binutils/objdump.1 b/binutils/objdump.1
index 44c9ad7..ab88bdc 100644
--- a/binutils/objdump.1
+++ b/binutils/objdump.1
@@ -15,26 +15,33 @@ objdump \- display information from object files.
 .na
 .TP
 .B objdump
-.RB "[\|" \-a "\|]" 
+.RB "[\|" \-a | \-\-archive\-headers "\|]" 
 .RB "[\|" "\-b\ "\c
 .I bfdname\c
+.RB " | " "\-\-target="\c
+.I bfdname\c
 \&\|] 
-.RB "[\|" \-d "\|]" 
-.RB "[\|" \-f "\|]"
-.RB "[\|" \-h | \-\-header "\|]" 
-.RB "[\|" \-i "\|]" 
+.RB "[\|" \-d | \-\-disassemble "\|]" 
+.RB "[\|" \-f | \-\-file\-headers "\|]"
+.RB "[\|" \-h | \-\-section\-headers
+.RB "| " \-\-headers "\|]" 
+.RB "[\|" \-i | \-\-info "\|]" 
 .RB "[\|" "\-j\ "\c
 .I section\c
+.RB " | " "\-\-section="\c
+.I section\c
 \&\|] 
-.RB "[\|" \-l "\|]"
+.RB "[\|" \-l | \-\-line\-numbers "\|]"
 .RB "[\|" "\-m\ "\c
 .I machine\c
+.RB " | " "\-\-architecture="\c
+.I machine\c
 \&\|] 
 .RB "[\|" \-r | \-\-reloc "\|]" 
-.RB "[\|" \-s "\|]"
+.RB "[\|" \-s | \-\-full\-contents "\|]"
 .RB "[\|" \-\-stabs "\|]"
 .RB "[\|" \-t | \-\-syms "\|]" 
-.RB "[\|" \-x "\|]"
+.RB "[\|" \-x | \-\-all\-headers "\|]"
 .RB "[\|" \-\-version "\|]"
 .RB "[\|" \-\-help "\|]"
 .I objfile\c
@@ -60,10 +67,12 @@ are the object files to be examined.  When you specify archives,
 Where long and short forms of an option are shown together, they are
 equivalent.  At least one option besides
 .B \-l
-must be given.
+(\fB\-\-line\-numbers\fP) must be given.
 
 .TP
 .B \-a
+.TP
+.B \-\-archive\-headers
 If any files from \c
 .I objfile\c
 \& are archives, display the archive
@@ -78,7 +87,9 @@ information you could list with `\|\c
 the object file format of each archive member.
 
 .TP
-.BI "-b " "bfdname"\c
+.BI "\-b " "bfdname"\c
+.TP
+.BI "\-\-target=" "bfdname"\c
 \&
 Specify the object-code format for the object files to be
 \c
@@ -108,14 +119,18 @@ formats available with the `\|\c
 
 .TP
 .B \-d
-Disassemble.  Display the assembler mnemonics for the machine
+.TP
+.B \-\-disassemble
+Display the assembler mnemonics for the machine
 instructions from \c
 .I objfile\c
 \&.
 
 .TP
 .B \-f
-File header.  Display summary information from the overall header of
+.TP
+.B \-\-file\-headers
+Display summary information from the overall header of
 each file in \c
 .I objfile\c
 \&.
@@ -123,8 +138,10 @@ each file in \c
 .TP
 .B \-h
 .TP
-.B \-\-header
-Header.  Display summary information from the section headers of the
+.B \-\-section\-headers
+.TP
+.B \-\-headers
+Display summary information from the section headers of the
 object file.
 
 .TP
@@ -135,6 +152,8 @@ and exit.
 
 .TP
 .B \-i
+.TP
+.B \-\-info
 Display a list showing all architectures and object formats available
 for specification with \c
 .B \-b\c
@@ -143,7 +162,9 @@ for specification with \c
 \&.
 
 .TP
-.BI "-j " "name"\c
+.BI "\-j " "name"\c
+.TP
+.BI "\-\-section=" "name"\c
 \&
 Display information only for section \c
 .I name\c
@@ -151,11 +172,16 @@ Display information only for section \c
 
 .TP
 .B \-l
-Label the display (using debugging information) with the source filename
-and line numbers corresponding to the object code shown.
+.TP
+.B \-\-line\-numbers
+Label the display (using debugging information) with the filename
+and source line numbers corresponding to the object code shown.
+Only useful with \fB\-d\fP.
 
 .TP
-.BI "-m " "machine"\c
+.BI "\-m " "machine"\c
+.TP
+.BI "\-\-architecture=" "machine"\c
 \&
 Specify the object files \c
 .I objfile\c
@@ -171,10 +197,12 @@ option.
 .B \-r
 .TP
 .B \-\-reloc
-Relocation.  Print the relocation entries of the file.
+Print the relocation entries of the file.
 
 .TP
 .B \-s
+.TP
+.B \-\-full\-contents
 Display the full contents of any sections requested.
 
 .TP
@@ -203,6 +231,8 @@ and exit.
 
 .TP
 .B \-x
+.TP
+.B \-\-all\-headers
 Display all available header information, including the symbol table and
 relocation entries.  Using `\|\c
 .B \-x\c