[llvm] dffddde - Revert "[llvm-objdump] Remove Generic Options group from help text output"
Dimitry Andric via llvm-commits
llvm-commits at lists.llvm.org
Tue May 4 09:29:06 PDT 2021
Author: Dimitry Andric
Date: 2021-05-04T18:28:31+02:00
New Revision: dffddde73ab73cc5d89818330b11eb2dc3610ed7
URL: https://github.com/llvm/llvm-project/commit/dffddde73ab73cc5d89818330b11eb2dc3610ed7
DIFF: https://github.com/llvm/llvm-project/commit/dffddde73ab73cc5d89818330b11eb2dc3610ed7.diff
LOG: Revert "[llvm-objdump] Remove Generic Options group from help text output"
This reverts commit 73686247ac3e60c91fa5943c98956093df5e49ff, as there
were git stash conflict markers left unresolved.
Added:
Modified:
llvm/test/tools/llvm-objdump/help.test
llvm/tools/llvm-objdump/ObjdumpOpts.td
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-objdump/help.test b/llvm/test/tools/llvm-objdump/help.test
index 93147254cc617..ae0bf81e040f3 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] <input object files>{{$}}
-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] <input object files>{{$}}
-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 c066294a94dac..3b4bece6c187f 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<grp_generic>;
def help_hidden : Flag<["--"], "help-hidden">,
Flags<[HelpHidden]>,
- HelpText<"Display all available options">;
+ HelpText<"Display all available options">,
+ Group<grp_generic>;
def version : Flag<["--"], "version">,
-<<<<<<< Updated upstream
HelpText<"Display the version of this program">,
Group<grp_generic>;
def : Flag<["-"], "v">, Alias<version>, HelpText<"Alias for --version">,
@@ -17,219 +20,295 @@ def : Flag<["-"], "v">, Alias<version>, 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<grp_objdump>;
def all_headers : Flag<["--"], "all-headers">,
- HelpText<"Display all available header information">;
-def : Flag<["-"], "x">, Alias<all_headers>, HelpText<"Alias for --all-headers">;
+ HelpText<"Display all available header information">,
+ Group<grp_objdump>;
+def : Flag<["-"], "x">, Alias<all_headers>, HelpText<"Alias for --all-headers">,
+ Group<grp_objdump>;
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<grp_objdump>;
+def archive_headers : Flag<["--"], "archive-headers">,
+ HelpText<"Display archive header information">,
+ Group<grp_objdump>;
def : Flag<["-"], "a">, Alias<all_headers>,
- HelpText<"Alias for --archive-headers">;
+ HelpText<"Alias for --archive-headers">,
+ Group<grp_objdump>;
-def demangle : Flag<["--"], "demangle">, HelpText<"Demangle symbol names">;
-def : Flag<["-"], "C">, Alias<demangle>, HelpText<"Alias for --demangle">;
+def demangle : Flag<["--"], "demangle">, HelpText<"Demangle symbol names">,
+ Group<grp_objdump>;
+def : Flag<["-"], "C">, Alias<demangle>, HelpText<"Alias for --demangle">,
+ Group<grp_objdump>;
def disassemble : Flag<["--"], "disassemble">,
- HelpText<"Display assembler mnemonics for the machine instructions">;
-def : Flag<["-"], "d">, Alias<disassemble>, HelpText<"Alias for --disassemble">;
+ HelpText<"Display assembler mnemonics for the machine instructions">,
+ Group<grp_objdump>;
+def : Flag<["-"], "d">, Alias<disassemble>, HelpText<"Alias for --disassemble">,
+ Group<grp_objdump>;
def disassemble_all : Flag<["--"], "disassemble-all">,
- HelpText<"Display assembler mnemonics for the machine instructions">;
+ HelpText<"Display assembler mnemonics for the machine instructions">,
+ Group<grp_objdump>;
def : Flag<["-"], "D">, Alias<disassemble_all>,
- HelpText<"Alias for --disassemble-all">;
+ HelpText<"Alias for --disassemble-all">,
+ Group<grp_objdump>;
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<grp_objdump>;
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<grp_objdump>;
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<grp_objdump>;
def : Flag<["-"], "z">, Alias<disassemble_zeroes>,
- HelpText<"Alias for --disassemble-zeroes">;
+ HelpText<"Alias for --disassemble-zeroes">,
+ Group<grp_objdump>;
def disassembler_options_EQ : Joined<["--"], "disassembler-options=">,
MetaVarName<"options">,
- HelpText<"Pass target specific disassembler options">;
+ HelpText<"Pass target specific disassembler options">,
+ Group<grp_objdump>;
def : JoinedOrSeparate<["-"], "M">, Alias<disassembler_options_EQ>,
- HelpText<"Alias for --disassembler-options=">;
+ HelpText<"Alias for --disassembler-options=">,
+ Group<grp_objdump>;
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<grp_objdump>;
def : Flag<["-"], "R">, Alias<dynamic_reloc>,
- HelpText<"Alias for --dynamic-reloc">;
+ HelpText<"Alias for --dynamic-reloc">,
+ Group<grp_objdump>;
def dwarf_EQ : Joined<["--"], "dwarf=">,
- HelpText<"Dump of dwarf debug sections">, Values<"frames">;
+ HelpText<"Dump of dwarf debug sections">, Values<"frames">,
+ Group<grp_objdump>;
def fault_map_section : Flag<["--"], "fault-map-section">,
- HelpText<"Display contents of faultmap section">;
+ HelpText<"Display contents of faultmap section">,
+ Group<grp_objdump>;
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<grp_objdump>;
def : Flag<["-"], "f">, Alias<file_headers>,
- HelpText<"Alias for --file-headers">;
+ HelpText<"Alias for --file-headers">,
+ Group<grp_objdump>;
def full_contents : Flag<["--"], "full-contents">,
- HelpText<"Display the content of each section">;
+ HelpText<"Display the content of each section">,
+ Group<grp_objdump>;
def : Flag<["-"], "s">, Alias<full_contents>,
- HelpText<"Alias for --full-contents">;
+ HelpText<"Alias for --full-contents">,
+ Group<grp_objdump>;
def line_numbers : Flag<["--"], "line-numbers">,
HelpText<"Display source line numbers with "
- "disassembly. Implies disassemble object">;
+ "disassembly. Implies disassemble object">,
+ Group<grp_objdump>;
def : Flag<["-"], "l">, Alias<line_numbers>,
- HelpText<"Alias for --line-numbers">;
+ HelpText<"Alias for --line-numbers">,
+ Group<grp_objdump>;
def macho : Flag<["--"], "macho">,
- HelpText<"Use MachO specific object file parser">;
-def : Flag<["-"], "m">, Alias<macho>, HelpText<"Alias for --macho">;
+ HelpText<"Use MachO specific object file parser">,
+ Group<grp_objdump>;
+def : Flag<["-"], "m">, Alias<macho>, HelpText<"Alias for --macho">,
+ Group<grp_objdump>;
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<grp_objdump>;
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<grp_objdump>;
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<grp_objdump>;
def no_leading_addr : Flag<["--"], "no-leading-addr">,
- HelpText<"Print no leading address">;
+ HelpText<"Print no leading address">,
+ Group<grp_objdump>;
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<grp_objdump>;
def reloc : Flag<["--"], "reloc">,
- HelpText<"Display the relocation entries in the file">;
-def : Flag<["-"], "r">, Alias<reloc>, HelpText<"Alias for --reloc">;
+ HelpText<"Display the relocation entries in the file">,
+ Group<grp_objdump>;
+def : Flag<["-"], "r">, Alias<reloc>, HelpText<"Alias for --reloc">,
+ Group<grp_objdump>;
def print_imm_hex : Flag<["--"], "print-imm-hex">,
- HelpText<"Use hex format for immediate values">;
+ HelpText<"Use hex format for immediate values">,
+ Group<grp_objdump>;
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<no_print_imm_hex>;
+ HelpText<"Do not use hex format for immediate values (default)">,
+ Group<grp_objdump>;
+def : Flag<["--"], "print-imm-hex=false">, Alias<no_print_imm_hex>,
+ Group<grp_objdump>;
def private_headers : Flag<["--"], "private-headers">,
- HelpText<"Display format specific file headers">;
+ HelpText<"Display format specific file headers">,
+ Group<grp_objdump>;
def : Flag<["-"], "p">, Alias<private_headers>,
- HelpText<"Alias for --private-headers">;
+ HelpText<"Alias for --private-headers">,
+ Group<grp_objdump>;
def section_EQ : Joined<["--"], "section=">,
HelpText<"Operate on the specified sections only. "
- "With --macho dump segment,section">;
-def : Separate<["--"], "section">, Alias<section_EQ>;
+ "With --macho dump segment,section">,
+ Group<grp_objdump>;
+def : Separate<["--"], "section">, Alias<section_EQ>,
+ Group<grp_objdump>;
def : JoinedOrSeparate<["-"], "j">, Alias<section_EQ>,
- HelpText<"Alias for --section">;
+ HelpText<"Alias for --section">,
+ Group<grp_objdump>;
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<grp_objdump>;
def : Flag<["--"], "headers">, Alias<section_headers>,
- HelpText<"Alias for --section-headers">;
+ HelpText<"Alias for --section-headers">,
+ Group<grp_objdump>;
def : Flag<["-"], "h">, Alias<section_headers>,
- HelpText<"Alias for --section-headers">;
+ HelpText<"Alias for --section-headers">,
+ Group<grp_objdump>;
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<grp_objdump>;
def source : Flag<["--"], "source">,
- HelpText<"Display source inlined with disassembly. Implies disassemble object">;
-def : Flag<["-"], "S">, Alias<source>, HelpText<"Alias for --source">;
+ HelpText<"Display source inlined with disassembly. Implies disassemble object">,
+ Group<grp_objdump>;
+def : Flag<["-"], "S">, Alias<source>, HelpText<"Alias for --source">,
+ Group<grp_objdump>;
def start_address_EQ : Joined<["--"], "start-address=">,
MetaVarName<"address">,
- HelpText<"Disassemble beginning at address">;
+ HelpText<"Disassemble beginning at address">,
+ Group<grp_objdump>;
def stop_address_EQ : Joined<["--"], "stop-address=">,
MetaVarName<"address">,
- HelpText<"Stop disassembly at address">;
+ HelpText<"Stop disassembly at address">,
+ Group<grp_objdump>;
def syms : Flag<["--"], "syms">,
- HelpText<"Display the symbol table">;
-def : Flag<["-"], "t">, Alias<syms>, HelpText<"Alias for --syms">;
+ HelpText<"Display the symbol table">,
+ Group<grp_objdump>;
+def : Flag<["-"], "t">, Alias<syms>, HelpText<"Alias for --syms">,
+ Group<grp_objdump>;
def symbolize_operands : Flag<["--"], "symbolize-operands">,
- HelpText<"Symbolize instruction operands when disassembling">;
+ HelpText<"Symbolize instruction operands when disassembling">,
+ Group<grp_objdump>;
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<grp_objdump>;
def : Flag<["-"], "T">, Alias<dynamic_syms>,
- HelpText<"Alias for --dynamic-syms">;
+ HelpText<"Alias for --dynamic-syms">,
+ Group<grp_objdump>;
def triple_EQ : Joined<["--"], "triple=">,
HelpText<"Target triple to disassemble for, "
- "see --version for available targets">;
+ "see --version for available targets">,
+ Group<grp_objdump>;
def : Separate<["--"], "triple">,
- Alias<triple_EQ>;
+ Alias<triple_EQ>,
+ Group<grp_objdump>;
def unwind_info : Flag<["--"], "unwind-info">,
- HelpText<"Display unwind information">;
+ HelpText<"Display unwind information">,
+ Group<grp_objdump>;
def : Flag<["-"], "u">, Alias<unwind_info>,
- HelpText<"Alias for --unwind-info">;
+ HelpText<"Alias for --unwind-info">,
+ Group<grp_objdump>;
def wide : Flag<["--"], "wide">,
- HelpText<"Ignored for compatibility with GNU objdump">;
-def : Flag<["-"], "w">, Alias<wide>;
+ HelpText<"Ignored for compatibility with GNU objdump">,
+ Group<grp_objdump>;
+def : Flag<["-"], "w">, Alias<wide>,
+ Group<grp_objdump>;
def prefix : Separate<["--"], "prefix">,
- HelpText<"Add prefix to absolute paths">;
+ HelpText<"Add prefix to absolute paths">,
+ Group<grp_objdump>;
def prefix_strip : Separate<["--"], "prefix-strip">,
HelpText<"Strip out initial directories from absolute "
- "paths. No effect without --prefix">;
+ "paths. No effect without --prefix">,
+ Group<grp_objdump>;
def debug_vars_EQ : Joined<["--"], "debug-vars=">,
- Values<"unicode,ascii">;
+ Values<"unicode,ascii">,
+ Group<grp_objdump>;
def : Flag<["--"], "debug-vars">,
HelpText<"Print the locations (in registers or memory) of "
"source-level variables alongside disassembly">,
- Alias<debug_vars_EQ>, AliasArgs<["unicode"]>;
+ Alias<debug_vars_EQ>, AliasArgs<["unicode"]>,
+ Group<grp_objdump>;
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<grp_objdump>;
def x86_asm_syntax_att : Flag<["--"], "x86-asm-syntax=att">,
- HelpText<"Emit AT&T-style disassembly">;
+ HelpText<"Emit AT&T-style disassembly">,
+ Group<grp_objdump>;
def x86_asm_syntax_intel : Flag<["--"], "x86-asm-syntax=intel">,
- HelpText<"Emit Intel-style disassembly">;
+ HelpText<"Emit Intel-style disassembly">,
+ Group<grp_objdump>;
-def mhvx : Flag<["--"], "mhvx">, HelpText<"Enable Hexagon Vector eXtensions">;
+def mhvx : Flag<["--"], "mhvx">, HelpText<"Enable Hexagon Vector eXtensions">,
+ Group<grp_objdump>;
-def mhvx_v66 : Flag<["--"], "mhvx=v66">;
+def mhvx_v66 : Flag<["--"], "mhvx=v66">,
+ Group<grp_objdump>;
-def mv60 : Flag<["--"], "mv60">, HelpText<"Build for Hexagon V60">;
+def mv60 : Flag<["--"], "mv60">, HelpText<"Build for Hexagon V60">,
+ Group<grp_objdump>;
-def mv65 : Flag<["--"], "mv65">, HelpText<"Build for Hexagon V65">;
+def mv65 : Flag<["--"], "mv65">, HelpText<"Build for Hexagon V65">,
+ Group<grp_objdump>;
-def mv66 : Flag<["--"], "mv66">, HelpText<"Build for Hexagon V66">;
+def mv66 : Flag<["--"], "mv66">, HelpText<"Build for Hexagon V66">,
+ Group<grp_objdump>;
-def mv67 : Flag<["--"], "mv67">, HelpText<"Build for Hexagon V67">;
+def mv67 : Flag<["--"], "mv67">, HelpText<"Build for Hexagon V67">,
+ Group<grp_objdump>;
-def mv67t : Flag<["--"], "mv67t">, HelpText<"Build for Hexagon V67T">;
+def mv67t : Flag<["--"], "mv67t">, HelpText<"Build for Hexagon V67T">,
+ Group<grp_objdump>;
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<grp_objdump>;
def grp_mach_o : OptionGroup<"kind">, HelpText<"llvm-objdump MachO Specific Options">;
More information about the llvm-commits
mailing list