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