diff --git a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-help-message.test b/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-help-message.test --- a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-help-message.test +++ b/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-help-message.test @@ -1,10 +1,10 @@ -# RUN: llvm-install-name-tool -h | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s -# RUN: llvm-install-name-tool --help | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s -# RUN: not llvm-install-name-tool 2>&1 | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s +# RUN: llvm-install-name-tool -h | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s --match-full-lines +# RUN: llvm-install-name-tool --help | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s --match-full-lines +# RUN: not llvm-install-name-tool 2>&1 | FileCheck --check-prefix=INSTALL-NAME-TOOL-USAGE %s --match-full-lines # RUN: not llvm-install-name-tool -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s # RUN: not llvm-install-name-tool --abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s -# INSTALL-NAME-TOOL-USAGE: USAGE: llvm-install-name-tool -# INSTALL-NAME-TOOL-USAGE: @FILE +# INSTALL-NAME-TOOL-USAGE: USAGE: llvm-install-name-tool input +# INSTALL-NAME-TOOL-USAGE: Pass @FILE as argument to read options from FILE. # UNKNOWN-ARG: unknown argument '{{-+}}abcabc' diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp --- a/llvm/tools/llvm-objcopy/CopyConfig.cpp +++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp @@ -395,7 +395,8 @@ static void printHelp(const opt::OptTable &OptTable, raw_ostream &OS, StringRef ToolName) { - OptTable.PrintHelp(OS, (ToolName + " input [output]").str().c_str(), + StringRef Output = ToolName == "llvm-install-name-tool" ? "" : " [output]"; + OptTable.PrintHelp(OS, (ToolName + " input" + Output).str().c_str(), (ToolName + " tool").str().c_str()); // TODO: Replace this with libOption call once it adds extrahelp support. // The CommandLine library has a cl::extrahelp class to support this,