binutils.texi: break overlong synopsis options lines

Also fix typos in objdump options (-wD/-wE should be -WD/-WE),
and move ar man synopsis where it belongs.

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 239a50f9e0733f2f067d05ea1a5d46056f7df589..e1d23f3c87d65c4a1db370bc9c9f1617f37b66a9 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -170,8 +170,17 @@ in the section entitled ``GNU Free Documentation License''.
 @c man title ar create, modify, and extract from archives
 
 @smallexample
-ar [-]@var{p}[@var{mod}] [@option{--plugin} @var{name}] [@option{--target} @var{bfdname}] [@option{--output} @var{dirname}] [@option{--record-libdeps} @var{libdeps}] [@var{relpos}] [@var{count}] @var{archive} [@var{member}@dots{}]
-ar -M [ <mri-script ]
+@c man begin SYNOPSIS ar
+ar [@option{-X32_64}]
+   [@option{-}]@var{p}[@var{mod}]
+   [@option{--plugin} @var{name}]
+   [@option{--target} @var{bfdname}]
+   [@option{--output} @var{dirname}]
+   [@option{--record-libdeps} @var{libdeps}]
+   [@option{--thin}]
+   [@var{relpos}] [@var{count}] @var{archive} [@var{member}@dots{}]
+ar @option{-M} [< mri-script]
+@c man end
 @end smallexample
 
 @c man begin DESCRIPTION ar
@@ -252,12 +261,6 @@ program.
 @node ar cmdline
 @section Controlling @command{ar} on the Command Line
 
-@smallexample
-@c man begin SYNOPSIS ar
-ar [@option{-X32_64}] [@option{-}]@var{p}[@var{mod}] [@option{--plugin} @var{name}] [@option{--target} @var{bfdname}] [@option{--output} @var{dirname}] [@option{--record-libdeps} @var{libdeps}] [@option{--thin}] [@var{relpos}] [@var{count}] @var{archive} [@var{member}@dots{}]
-@c man end
-@end smallexample
-
 @cindex Unix compatibility, @command{ar}
 When you use @command{ar} in the Unix style, @command{ar} insists on at least two
 arguments to execute: one keyletter specifying the @emph{operation}
@@ -2321,12 +2324,32 @@ objdump [@option{-a}|@option{--archive-headers}]
         [@option{-R}|@option{--dynamic-reloc}]
         [@option{-s}|@option{--full-contents}]
         [@option{-Z}|@option{--decompress}]
-        [@option{-W[lLiaprmfFsoORtUuTgAck]}|
-         @option{--dwarf}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
+        [@option{-W}|@option{--dwarf}]
+        [@option{-Wa}|@option{--dwarf=abbrev}]
+        [@option{-WA}|@option{--dwarf=addr}]
+        [@option{-Wr}|@option{--dwarf=aranges}]
+        [@option{-Wc}|@option{--dwarf=cu_index}]
+        [@option{-WL}|@option{--dwarf=decodedline}]
+        [@option{-Wf}|@option{--dwarf=frames}]
+        [@option{-WF}|@option{--dwarf=frames-interp}]
+        [@option{-Wg}|@option{--dwarf=gdb_index}]
+        [@option{-Wi}|@option{--dwarf=info}]
+        [@option{-Wk}|@option{--dwarf=links}]
+        [@option{-Wo}|@option{--dwarf=loc}]
+        [@option{-Wm}|@option{--dwarf=macro}]
+        [@option{-Wp}|@option{--dwarf=pubnames}]
+        [@option{-Wt}|@option{--dwarf=pubtypes}]
+        [@option{-WR}|@option{--dwarf=Ranges}]
+        [@option{-Wl}|@option{--dwarf=rawline}]
+        [@option{-Ws}|@option{--dwarf=str}]
+        [@option{-WO}|@option{--dwarf=str-offsets}]
+        [@option{-Wu}|@option{--dwarf=trace_abbrev}]
+        [@option{-WT}|@option{--dwarf=trace_aranges}]
+        [@option{-WU}|@option{--dwarf=trace_info}]
         [@option{-WK}|@option{--dwarf=follow-links}]
         [@option{-WN}|@option{--dwarf=no-follow-links}]
-        [@option{-wD}|@option{--dwarf=use-debuginfod}]
-        [@option{-wE}|@option{--dwarf=do-not-use-debuginfod}]
+        [@option{-WD}|@option{--dwarf=use-debuginfod}]
+        [@option{-WE}|@option{--dwarf=do-not-use-debuginfod}]
         [@option{--map-global-vars}]
         [@option{-L}|@option{--process-links}]
         [@option{--ctf=}@var{section}]
@@ -4689,24 +4712,35 @@ dlltool [@option{-d}|@option{--input-def} @var{def-file-name}]
         [@option{-z}|@option{--output-def} @var{def-file-name}]
         [@option{-l}|@option{--output-lib} @var{library-file-name}]
         [@option{-y}|@option{--output-delaylib} @var{library-file-name}]
-        [@option{--export-all-symbols}] [@option{--no-export-all-symbols}]
+        [@option{--export-all-symbols}]
+        [@option{--no-export-all-symbols}]
         [@option{--exclude-symbols} @var{list}]
         [@option{--no-default-excludes}]
-        [@option{-S}|@option{--as} @var{path-to-assembler}] [@option{-f}|@option{--as-flags} @var{options}]
-        [@option{-D}|@option{--dllname} @var{name}] [@option{-m}|@option{--machine} @var{machine}]
+        [@option{-S}|@option{--as} @var{path-to-assembler}]
+        [@option{-f}|@option{--as-flags} @var{options}]
+        [@option{-D}|@option{--dllname} @var{name}]
+        [@option{-m}|@option{--machine} @var{machine}]
         [@option{-a}|@option{--add-indirect}]
-        [@option{-U}|@option{--add-underscore}] [@option{--add-stdcall-underscore}]
-        [@option{-k}|@option{--kill-at}] [@option{-A}|@option{--add-stdcall-alias}]
+        [@option{-U}|@option{--add-underscore}]
+        [@option{--add-stdcall-underscore}]
+        [@option{-k}|@option{--kill-at}]
+        [@option{-A}|@option{--add-stdcall-alias}]
         [@option{-p}|@option{--ext-prefix-alias} @var{prefix}]
-        [@option{-x}|@option{--no-idata4}] [@option{-c}|@option{--no-idata5}]
+        [@option{-x}|@option{--no-idata4}]
+        [@option{-c}|@option{--no-idata5}]
         [@option{--use-nul-prefixed-import-tables}]
-        [@option{-I}|@option{--identify} @var{library-file-name}] [@option{--identify-strict}]
+        [@option{-I}|@option{--identify} @var{library-file-name}]
+        [@option{--identify-strict}]
         [@option{-i}|@option{--interwork}]
-        [@option{-n}|@option{--nodelete}] [@option{-t}|@option{--temp-prefix} @var{prefix}]
+        [@option{-n}|@option{--nodelete}]
+        [@option{-t}|@option{--temp-prefix} @var{prefix}]
         [@option{-v}|@option{--verbose}]
-        [@option{-h}|@option{--help}] [@option{-V}|@option{--version}]
-        [@option{--no-leading-underscore}] [@option{--leading-underscore}]
-        [@option{--deterministic-libraries}] [@option{--non-deterministic-libraries}]
+        [@option{-h}|@option{--help}]
+        [@option{-V}|@option{--version}]
+        [@option{--no-leading-underscore}]
+        [@option{--leading-underscore}]
+        [@option{--deterministic-libraries}]
+        [@option{--non-deterministic-libraries}]
         [object-file @dots{}]
 @c man end
 @end smallexample
@@ -5112,8 +5146,28 @@ readelf [@option{-a}|@option{--all}]
         [@option{-j} <number or name>|@option{--display-section=}<number or name>]
         [@option{-z}|@option{--decompress}]
         [@option{-c}|@option{--archive-index}]
-        [@option{-w[lLiaprmfFsoORtUuTgAck]}|
-         @option{--debug-dump}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
+        [@option{-w}|@option{--debug-dump}]
+        [@option{-wa}|@option{--debug-dump=abbrev}]
+        [@option{-wA}|@option{--debug-dump=addr}]
+        [@option{-wr}|@option{--debug-dump=aranges}]
+        [@option{-wc}|@option{--debug-dump=cu_index}]
+        [@option{-wL}|@option{--debug-dump=decodedline}]
+        [@option{-wf}|@option{--debug-dump=frames}]
+        [@option{-wF}|@option{--debug-dump=frames-interp}]
+        [@option{-wg}|@option{--debug-dump=gdb_index}]
+        [@option{-wi}|@option{--debug-dump=info}]
+        [@option{-wk}|@option{--debug-dump=links}]
+        [@option{-wo}|@option{--debug-dump=loc}]
+        [@option{-wm}|@option{--debug-dump=macro}]
+        [@option{-wp}|@option{--debug-dump=pubnames}]
+        [@option{-wt}|@option{--debug-dump=pubtypes}]
+        [@option{-wR}|@option{--debug-dump=Ranges}]
+        [@option{-wl}|@option{--debug-dump=rawline}]
+        [@option{-ws}|@option{--debug-dump=str}]
+        [@option{-wO}|@option{--debug-dump=str-offsets}]
+        [@option{-wu}|@option{--debug-dump=trace_abbrev}]
+        [@option{-wT}|@option{--debug-dump=trace_aranges}]
+        [@option{-wU}|@option{--debug-dump=trace_info}]
         [@option{-wK}|@option{--debug-dump=follow-links}]
         [@option{-wN}|@option{--debug-dump=no-follow-links}]
         [@option{-wD}|@option{--debug-dump=use-debuginfod}]