diff --git a/llvm/test/tools/llvm-objdump/help.test b/llvm/test/tools/llvm-objdump/help.test --- a/llvm/test/tools/llvm-objdump/help.test +++ b/llvm/test/tools/llvm-objdump/help.test @@ -3,12 +3,14 @@ CHECK: OVERVIEW: llvm object file dumper CHECK: USAGE: llvm-objdump{{(.exe)?}} [options] {{$}} -CHECK: Generic Options: +CHECK: OPTIONS: CHECK-NOT: {{ -w }} +CHECK: llvm-objdump MachO Specific Options: CHECK: @FILE HIDDEN: OVERVIEW: llvm object file dumper HIDDEN: USAGE: llvm-objdump{{(.exe)?}} [options] {{$}} -HIDDEN: Generic Options: +HIDDEN: OPTIONS: HIDDEN: {{ -w }} +HIDDEN: llvm-objdump MachO Specific Options: HIDDEN: @FILE diff --git a/llvm/tools/llvm-objdump/ObjdumpOpts.td b/llvm/tools/llvm-objdump/ObjdumpOpts.td --- a/llvm/tools/llvm-objdump/ObjdumpOpts.td +++ b/llvm/tools/llvm-objdump/ObjdumpOpts.td @@ -1,17 +1,14 @@ include "llvm/Option/OptParser.td" -def grp_generic : OptionGroup<"kind">, HelpText<"Generic Options">; - def help : Flag<["--"], "help">, - HelpText<"Display available options (--help-hidden for more)">, - Group; + HelpText<"Display available options (--help-hidden for more)">; def help_hidden : Flag<["--"], "help-hidden">, Flags<[HelpHidden]>, - HelpText<"Display all available options">, - Group; + HelpText<"Display all available options">; def version : Flag<["--"], "version">, +<<<<<<< Updated upstream HelpText<"Display the version of this program">, Group; def : Flag<["-"], "v">, Alias, HelpText<"Alias for --version">, @@ -20,295 +17,219 @@ def grp_objdump : OptionGroup<"objdump">, HelpText<"llvm-objdump Options">; +======= + HelpText<"Display the version of this program">; +>>>>>>> Stashed changes def adjust_vma_EQ : Joined<["--"], "adjust-vma=">, MetaVarName<"offset">, - HelpText<"Increase the displayed address by the specified offset">, - Group; + HelpText<"Increase the displayed address by the specified offset">; def all_headers : Flag<["--"], "all-headers">, - HelpText<"Display all available header information">, - Group; -def : Flag<["-"], "x">, Alias, HelpText<"Alias for --all-headers">, - Group; + HelpText<"Display all available header information">; +def : Flag<["-"], "x">, Alias, HelpText<"Alias for --all-headers">; def arch_name_EQ : Joined<["--"], "arch-name=">, HelpText<"Target arch to disassemble for, " - "see --version for available targets">, - Group; - + "see --version for available targets">; def archive_headers : Flag<["--"], "archive-headers">, - HelpText<"Display archive header information">, - Group; + HelpText<"Display archive header information">; + def : Flag<["-"], "a">, Alias, - HelpText<"Alias for --archive-headers">, - Group; + HelpText<"Alias for --archive-headers">; -def demangle : Flag<["--"], "demangle">, HelpText<"Demangle symbol names">, - Group; -def : Flag<["-"], "C">, Alias, HelpText<"Alias for --demangle">, - Group; +def demangle : Flag<["--"], "demangle">, HelpText<"Demangle symbol names">; +def : Flag<["-"], "C">, Alias, HelpText<"Alias for --demangle">; def disassemble : Flag<["--"], "disassemble">, - HelpText<"Display assembler mnemonics for the machine instructions">, - Group; -def : Flag<["-"], "d">, Alias, HelpText<"Alias for --disassemble">, - Group; + HelpText<"Display assembler mnemonics for the machine instructions">; +def : Flag<["-"], "d">, Alias, HelpText<"Alias for --disassemble">; def disassemble_all : Flag<["--"], "disassemble-all">, - HelpText<"Display assembler mnemonics for the machine instructions">, - Group; + HelpText<"Display assembler mnemonics for the machine instructions">; def : Flag<["-"], "D">, Alias, - HelpText<"Alias for --disassemble-all">, - Group; + HelpText<"Alias for --disassemble-all">; def symbol_description : Flag<["--"], "symbol-description">, HelpText<"Add symbol description for disassembly. This " - "option is for XCOFF files only.">, - Group; + "option is for XCOFF files only.">; def disassemble_symbols_EQ : Joined<["--"], "disassemble-symbols=">, HelpText<"List of symbols to disassemble. " "Accept demangled names when --demangle is " - "specified, otherwise accept mangled names">, - Group; + "specified, otherwise accept mangled names">; def disassemble_zeroes : Flag<["--"], "disassemble-zeroes">, - HelpText<"Do not skip blocks of zeroes when disassembling">, - Group; + HelpText<"Do not skip blocks of zeroes when disassembling">; def : Flag<["-"], "z">, Alias, - HelpText<"Alias for --disassemble-zeroes">, - Group; + HelpText<"Alias for --disassemble-zeroes">; def disassembler_options_EQ : Joined<["--"], "disassembler-options=">, MetaVarName<"options">, - HelpText<"Pass target specific disassembler options">, - Group; + HelpText<"Pass target specific disassembler options">; def : JoinedOrSeparate<["-"], "M">, Alias, - HelpText<"Alias for --disassembler-options=">, - Group; + HelpText<"Alias for --disassembler-options=">; def dynamic_reloc : Flag<["--"], "dynamic-reloc">, - HelpText<"Display the dynamic relocation entries in the file">, - Group; + HelpText<"Display the dynamic relocation entries in the file">; def : Flag<["-"], "R">, Alias, - HelpText<"Alias for --dynamic-reloc">, - Group; + HelpText<"Alias for --dynamic-reloc">; def dwarf_EQ : Joined<["--"], "dwarf=">, - HelpText<"Dump of dwarf debug sections">, Values<"frames">, - Group; + HelpText<"Dump of dwarf debug sections">, Values<"frames">; def fault_map_section : Flag<["--"], "fault-map-section">, - HelpText<"Display contents of faultmap section">, - Group; + HelpText<"Display contents of faultmap section">; def file_headers : Flag<["--"], "file-headers">, - HelpText<"Display the contents of the overall file header">, - Group; + HelpText<"Display the contents of the overall file header">; def : Flag<["-"], "f">, Alias, - HelpText<"Alias for --file-headers">, - Group; + HelpText<"Alias for --file-headers">; def full_contents : Flag<["--"], "full-contents">, - HelpText<"Display the content of each section">, - Group; + HelpText<"Display the content of each section">; def : Flag<["-"], "s">, Alias, - HelpText<"Alias for --full-contents">, - Group; + HelpText<"Alias for --full-contents">; def line_numbers : Flag<["--"], "line-numbers">, HelpText<"Display source line numbers with " - "disassembly. Implies disassemble object">, - Group; + "disassembly. Implies disassemble object">; def : Flag<["-"], "l">, Alias, - HelpText<"Alias for --line-numbers">, - Group; + HelpText<"Alias for --line-numbers">; def macho : Flag<["--"], "macho">, - HelpText<"Use MachO specific object file parser">, - Group; -def : Flag<["-"], "m">, Alias, HelpText<"Alias for --macho">, - Group; + HelpText<"Use MachO specific object file parser">; +def : Flag<["-"], "m">, Alias, HelpText<"Alias for --macho">; def mcpu_EQ : Joined<["--"], "mcpu=">, MetaVarName<"cpu-name">, - HelpText<"Target a specific cpu type (--mcpu=help for details)">, - Group; + HelpText<"Target a specific cpu type (--mcpu=help for details)">; def mattr_EQ : Joined<["--"], "mattr=">, MetaVarName<"a1,+a2,-a3,...">, - HelpText<"Target specific attributes (--mattr=help for details)">, - Group; + HelpText<"Target specific attributes (--mattr=help for details)">; def no_show_raw_insn : Flag<["--"], "no-show-raw-insn">, HelpText<"When disassembling instructions, " - "do not print the instruction bytes.">, - Group; + "do not print the instruction bytes.">; def no_leading_addr : Flag<["--"], "no-leading-addr">, - HelpText<"Print no leading address">, - Group; + HelpText<"Print no leading address">; def raw_clang_ast : Flag<["--"], "raw-clang-ast">, - HelpText<"Dump the raw binary contents of the clang AST section">, - Group; + HelpText<"Dump the raw binary contents of the clang AST section">; def reloc : Flag<["--"], "reloc">, - HelpText<"Display the relocation entries in the file">, - Group; -def : Flag<["-"], "r">, Alias, HelpText<"Alias for --reloc">, - Group; + HelpText<"Display the relocation entries in the file">; +def : Flag<["-"], "r">, Alias, HelpText<"Alias for --reloc">; def print_imm_hex : Flag<["--"], "print-imm-hex">, - HelpText<"Use hex format for immediate values">, - Group; + HelpText<"Use hex format for immediate values">; def no_print_imm_hex : Flag<["--"], "no-print-imm-hex">, - HelpText<"Do not use hex format for immediate values (default)">, - Group; -def : Flag<["--"], "print-imm-hex=false">, Alias, - Group; + HelpText<"Do not use hex format for immediate values (default)">; +def : Flag<["--"], "print-imm-hex=false">, Alias; def private_headers : Flag<["--"], "private-headers">, - HelpText<"Display format specific file headers">, - Group; + HelpText<"Display format specific file headers">; def : Flag<["-"], "p">, Alias, - HelpText<"Alias for --private-headers">, - Group; + HelpText<"Alias for --private-headers">; def section_EQ : Joined<["--"], "section=">, HelpText<"Operate on the specified sections only. " - "With --macho dump segment,section">, - Group; -def : Separate<["--"], "section">, Alias, - Group; + "With --macho dump segment,section">; +def : Separate<["--"], "section">, Alias; def : JoinedOrSeparate<["-"], "j">, Alias, - HelpText<"Alias for --section">, - Group; + HelpText<"Alias for --section">; def section_headers : Flag<["--"], "section-headers">, - HelpText<"Display summaries of the headers for each section.">, - Group; + HelpText<"Display summaries of the headers for each section.">; def : Flag<["--"], "headers">, Alias, - HelpText<"Alias for --section-headers">, - Group; + HelpText<"Alias for --section-headers">; def : Flag<["-"], "h">, Alias, - HelpText<"Alias for --section-headers">, - Group; + HelpText<"Alias for --section-headers">; def show_lma : Flag<["--"], "show-lma">, - HelpText<"Display LMA column when dumping ELF section headers">, - Group; + HelpText<"Display LMA column when dumping ELF section headers">; def source : Flag<["--"], "source">, - HelpText<"Display source inlined with disassembly. Implies disassemble object">, - Group; -def : Flag<["-"], "S">, Alias, HelpText<"Alias for --source">, - Group; + HelpText<"Display source inlined with disassembly. Implies disassemble object">; +def : Flag<["-"], "S">, Alias, HelpText<"Alias for --source">; def start_address_EQ : Joined<["--"], "start-address=">, MetaVarName<"address">, - HelpText<"Disassemble beginning at address">, - Group; + HelpText<"Disassemble beginning at address">; def stop_address_EQ : Joined<["--"], "stop-address=">, MetaVarName<"address">, - HelpText<"Stop disassembly at address">, - Group; + HelpText<"Stop disassembly at address">; def syms : Flag<["--"], "syms">, - HelpText<"Display the symbol table">, - Group; -def : Flag<["-"], "t">, Alias, HelpText<"Alias for --syms">, - Group; + HelpText<"Display the symbol table">; +def : Flag<["-"], "t">, Alias, HelpText<"Alias for --syms">; def symbolize_operands : Flag<["--"], "symbolize-operands">, - HelpText<"Symbolize instruction operands when disassembling">, - Group; + HelpText<"Symbolize instruction operands when disassembling">; def dynamic_syms : Flag<["--"], "dynamic-syms">, - HelpText<"Display the contents of the dynamic symbol table">, - Group; + HelpText<"Display the contents of the dynamic symbol table">; def : Flag<["-"], "T">, Alias, - HelpText<"Alias for --dynamic-syms">, - Group; + HelpText<"Alias for --dynamic-syms">; def triple_EQ : Joined<["--"], "triple=">, HelpText<"Target triple to disassemble for, " - "see --version for available targets">, - Group; + "see --version for available targets">; def : Separate<["--"], "triple">, - Alias, - Group; + Alias; def unwind_info : Flag<["--"], "unwind-info">, - HelpText<"Display unwind information">, - Group; + HelpText<"Display unwind information">; def : Flag<["-"], "u">, Alias, - HelpText<"Alias for --unwind-info">, - Group; + HelpText<"Alias for --unwind-info">; def wide : Flag<["--"], "wide">, - HelpText<"Ignored for compatibility with GNU objdump">, - Group; -def : Flag<["-"], "w">, Alias, - Group; + HelpText<"Ignored for compatibility with GNU objdump">; +def : Flag<["-"], "w">, Alias; def prefix : Separate<["--"], "prefix">, - HelpText<"Add prefix to absolute paths">, - Group; + HelpText<"Add prefix to absolute paths">; def prefix_strip : Separate<["--"], "prefix-strip">, HelpText<"Strip out initial directories from absolute " - "paths. No effect without --prefix">, - Group; + "paths. No effect without --prefix">; def debug_vars_EQ : Joined<["--"], "debug-vars=">, - Values<"unicode,ascii">, - Group; + Values<"unicode,ascii">; def : Flag<["--"], "debug-vars">, HelpText<"Print the locations (in registers or memory) of " "source-level variables alongside disassembly">, - Alias, AliasArgs<["unicode"]>, - Group; + Alias, AliasArgs<["unicode"]>; def debug_vars_indent_EQ : Joined<["--"], "debug-vars-indent=">, HelpText<"Distance to indent the source-level variable display, " - "relative to the start of the disassembly">, - Group; + "relative to the start of the disassembly">; def x86_asm_syntax_att : Flag<["--"], "x86-asm-syntax=att">, - HelpText<"Emit AT&T-style disassembly">, - Group; + HelpText<"Emit AT&T-style disassembly">; def x86_asm_syntax_intel : Flag<["--"], "x86-asm-syntax=intel">, - HelpText<"Emit Intel-style disassembly">, - Group; + HelpText<"Emit Intel-style disassembly">; -def mhvx : Flag<["--"], "mhvx">, HelpText<"Enable Hexagon Vector eXtensions">, - Group; +def mhvx : Flag<["--"], "mhvx">, HelpText<"Enable Hexagon Vector eXtensions">; -def mhvx_v66 : Flag<["--"], "mhvx=v66">, - Group; +def mhvx_v66 : Flag<["--"], "mhvx=v66">; -def mv60 : Flag<["--"], "mv60">, HelpText<"Build for Hexagon V60">, - Group; +def mv60 : Flag<["--"], "mv60">, HelpText<"Build for Hexagon V60">; -def mv65 : Flag<["--"], "mv65">, HelpText<"Build for Hexagon V65">, - Group; +def mv65 : Flag<["--"], "mv65">, HelpText<"Build for Hexagon V65">; -def mv66 : Flag<["--"], "mv66">, HelpText<"Build for Hexagon V66">, - Group; +def mv66 : Flag<["--"], "mv66">, HelpText<"Build for Hexagon V66">; -def mv67 : Flag<["--"], "mv67">, HelpText<"Build for Hexagon V67">, - Group; +def mv67 : Flag<["--"], "mv67">, HelpText<"Build for Hexagon V67">; -def mv67t : Flag<["--"], "mv67t">, HelpText<"Build for Hexagon V67T">, - Group; +def mv67t : Flag<["--"], "mv67t">, HelpText<"Build for Hexagon V67T">; def riscv_no_aliases : Flag<["--"], "riscv-no-aliases">, - HelpText<"Disable the emission of assembler pseudo instructions">, - Group; + HelpText<"Disable the emission of assembler pseudo instructions">; def grp_mach_o : OptionGroup<"kind">, HelpText<"llvm-objdump MachO Specific Options">;