Index: usr.bin/clang/llvm-objdump/llvm-objdump.1
===================================================================
--- usr.bin/clang/llvm-objdump/llvm-objdump.1
+++ usr.bin/clang/llvm-objdump/llvm-objdump.1
@@ -88,6 +88,7 @@
 .Nm
 accepts many of the same command line arguments as GNU objdump.
 .Sh OPTIONS
+.Ss General Options
 .Bl -tag -width indent
 .It Fl -aarch64-neon-syntax Ns = Ns Ar value
 Choose style of NEON code to emit from AArch64 backend.
@@ -106,31 +107,11 @@
 See
 .Fl -version
 for available targets.
-.It Fl -archive-headers
-Print archive headers for Mach-O archives.
-Requires
-.Fl -macho .
-.It Fl -archive-member-offsets
-Print the offset to each archive member for Mach-O archives.
-Requires
-.Fl -macho
-and
-.Fl -archive-headers.
 .It Fl -bind
 Display mach-o binding info.
 .It Fl -color
 Use colored syntax highlighting.
 Default autodetect.
-.It Fl -data-in-code
-Print the data in code table for Mach-O objects.
-Requires
-.Fl -macho .
-.It Fl -dis-symname Ns = Ns Ar symbol
-Disassemble just
-.Ar symbol 's
-instructions.
-Requires
-.Fl -macho .
 .It Fl -disassemble
 Display assembler mnemonics for machine instructions.
 .It Fl -disassemble-all
@@ -145,14 +126,6 @@
 .It frames
 .Dv .debug_frame
 .El
-.It Fl -dylib-id
-Print the shared library's id for the dylib Mach-O file.
-Requires
-.Fl -macho .
-.It Fl -dylibs-used
-Print the shared libraries used for linked Mach-O files.
-Requires
-.Fl -macho .
 .It Fl -exports-trie
 Display mach-o exported symbols.
 .It Fl -fault-map-section
@@ -172,22 +145,11 @@
 Use
 .Fl -help-hidden
 for more.
-.It Fl -indirect-symbols
-Print indirect symbol table for Mach-O objects.
-Requires
-.Fl -macho .
-.It Fl -info-plist
-Print the info plist section as strings for Mach-O objects.
-Requires
-.Fl -macho .
 .It Fl -lazy-bind
 Display mach-o lazy binding info.
 .It Fl -line-numbers
-Display source line numbers with disassembly. Implies disassemble object.
-.It Fl -link-opt-hints
-Print the linker optimization hints for Mach-O objects.
-Requires
-.Fl -macho .
+Display source line numbers with disassembly.
+Implies disassemble object.
 .It Fl -macho
 Use MachO specific object file parser.
 .It Fl -mattr Ns = Ns Ar attribute ...
@@ -203,18 +165,6 @@
 Print no leading headers.
 .It Fl -no-show-raw-insn
 When disassembling instructions, do not print the instruction bytes.
-.It Fl -no-symbolic-operands
-do not symbolic operands when disassembling.
-Requires
-.Fl -macho .
-.It Fl -non-verbose
-Print the info for Mach-O objects in non-verbose or numeric form.
-Requires
-.Fl -macho .
-.It Fl -objc-meta-data
-Print the Objective-C runtime meta data for Mach-O files.
-Requires
-.Fl -macho .
 .It Fl -print-after-all
 Print IR after each pass.
 .It Fl -print-before-all
@@ -265,10 +215,6 @@
 See
 .Fl -version
 for available targets.
-.It Fl -universal-headers
-Print Mach-O universal headers.
-Requires
-.Fl -macho .
 .It Fl -unwind-info
 Display unwind information.
 .It Fl -verify-debug-info
@@ -288,3 +234,42 @@
 Emit Intel-style assembly.
 .El
 .El
+.Ss Mach-O Options
+There are a number of options specific to the Mach-O format.
+These are used in combination with the
+.Fl -macho
+option.
+.Bl -tag -width indent
+.It Fl -archive-headers
+Print archive headers for Mach-O archives.
+.It Fl -archive-member-offsets
+Print the offset to each archive member for Mach-O archives.
+Requires
+.Fl -macho
+and
+.Fl -archive-headers .
+.It Fl -data-in-code
+Print the data in code table for Mach-O objects.
+.It Fl -dis-symname Ns = Ns Ar symbol
+Disassemble just
+.Ar symbol 's
+instructions.
+.It Fl -dylib-id
+Print the shared library's id for the dylib Mach-O file.
+.It Fl -dylibs-used
+Print the shared libraries used for linked Mach-O files.
+.It Fl -indirect-symbols
+Print indirect symbol table for Mach-O objects.
+.It Fl -info-plist
+Print the info plist section as strings for Mach-O objects.
+.It Fl -link-opt-hints
+Print the linker optimization hints for Mach-O objects.
+.It Fl -no-symbolic-operands
+do not symbolic operands when disassembling.
+.It Fl -non-verbose
+Print the info for Mach-O objects in non-verbose or numeric form.
+.It Fl -objc-meta-data
+Print the Objective-C runtime meta data for Mach-O files.
+.It Fl -universal-headers
+Print Mach-O universal headers.
+.El