Skip to content

Commit

Permalink
[dsymutil] Fix short options displayed in the help message.
Browse files Browse the repository at this point in the history
This patch helps make the short options displayed in the help message be consistant with the description in https://llvm.org/docs/CommandGuide/dsymutil.html

Reviewed By: JDevlieghere, aprantl

Differential Revision: https://reviews.llvm.org/D78476
  • Loading branch information
higuoxing committed Apr 29, 2020
1 parent b5f8974 commit 329ebb8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions llvm/test/tools/dsymutil/cmdline.test
Expand Up @@ -14,17 +14,18 @@ HELP: -no-swiftmodule-timestamp
HELP: -num-threads <threads>
HELP: -object-prefix-map <prefix=remapped>
HELP: -oso-prepend-path <path>
HELP: -o <filename>
HELP: {{ -o <filename> }}
HELP: -papertrail
HELP: -remarks-output-format <format>
HELP: -remarks-prepend-path <path>
HELP: -symbol-map
HELP: -symtab
HELP: {{ -S }}
HELP: -toolchain
HELP: -update
HELP: -verbose
HELP: -verify
HELP: -y
HELP: {{ -y }}
HELP-NOT: -reverse-iterate

RUN: dsymutil --version 2>&1 | FileCheck --check-prefix=VERSION %s
Expand Down
10 changes: 5 additions & 5 deletions llvm/tools/dsymutil/Options.td
Expand Up @@ -44,15 +44,15 @@ def dump_debug_map: F<"dump-debug-map">,
HelpText<"Parse and dump the debug map to standard output. Not DWARF link will take place.">,
Group<grp_general>;

def yaml_input: F<"y">,
def yaml_input: Flag<["-", "--"], "y">,
HelpText<"Treat the input file is a YAML debug map rather than a binary.">,
Group<grp_general>;

def papertrail: F<"papertrail">,
HelpText<"Embed warnings in the linked DWARF debug info.">,
Group<grp_general>;

def assembly: F<"S">,
def assembly: Flag<["-", "--"], "S">,
HelpText<"Output textual assembly instead of a binary dSYM companion file.">,
Group<grp_general>;

Expand Down Expand Up @@ -93,16 +93,16 @@ def: Flag<["-"], "u">,
HelpText<"Alias for --update">,
Group<grp_general>;

def output: Separate<["--", "-"], "o">,
def output: Separate<["-", "--"], "o">,
MetaVarName<"<filename>">,
HelpText<"Specify the output file. Defaults to <input file>.dwarf">,
Group<grp_general>;
def: Separate<["--", "-"], "out">,
Alias<output>,
HelpText<"Alias for --o">,
HelpText<"Alias for -o">,
Group<grp_general>;
def: Joined<["--", "-"], "out=">, Alias<output>;
def: Joined<["--", "-"], "o=">, Alias<output>;
def: Joined<["-", "--"], "o=">, Alias<output>;

def oso_prepend_path: Separate<["--", "-"], "oso-prepend-path">,
MetaVarName<"<path>">,
Expand Down

0 comments on commit 329ebb8

Please sign in to comment.