Index: lld/trunk/COFF/DriverUtils.cpp =================================================================== --- lld/trunk/COFF/DriverUtils.cpp +++ lld/trunk/COFF/DriverUtils.cpp @@ -28,6 +28,7 @@ #include "llvm/Option/Option.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileUtilities.h" +#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/Process.h" #include "llvm/Support/Program.h" @@ -863,7 +864,8 @@ } void printHelp(const char *Argv0) { - COFFOptTable().PrintHelp(outs(), Argv0, "LLVM Linker", false); + std::string Usage = formatv("{0} [options] file...", Argv0).str(); + COFFOptTable().PrintHelp(outs(), Usage.c_str(), "LLVM Linker", false); } } // namespace coff Index: lld/trunk/ELF/DriverUtils.cpp =================================================================== --- lld/trunk/ELF/DriverUtils.cpp +++ lld/trunk/ELF/DriverUtils.cpp @@ -24,6 +24,7 @@ #include "llvm/Option/Option.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" +#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" @@ -139,8 +140,9 @@ } void elf::printHelp() { - ELFOptTable().PrintHelp(outs(), Config->ProgName.data(), "lld", - false /*ShowHidden*/, true /*ShowAllAliases*/); + std::string Usage = formatv("{0} [options] file...", Config->ProgName).str(); + ELFOptTable().PrintHelp(outs(), Usage.c_str(), "lld", false /*ShowHidden*/, + true /*ShowAllAliases*/); outs() << "\n"; // Scripts generated by Libtool versions up to at least 2.4.6 (the most Index: lld/trunk/lib/Driver/DarwinLdDriver.cpp =================================================================== --- lld/trunk/lib/Driver/DarwinLdDriver.cpp +++ lld/trunk/lib/Driver/DarwinLdDriver.cpp @@ -44,6 +44,7 @@ #include "llvm/Support/Error.h" #include "llvm/Support/ErrorOr.h" #include "llvm/Support/Format.h" +#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" @@ -382,10 +383,13 @@ if (arch == MachOLinkingContext::arch_unknown && !parsedArgs.getLastArg(OPT_test_file_usage)) { // If no -arch and no options at all, print usage message. - if (parsedArgs.size() == 0) - table.PrintHelp(llvm::outs(), args[0], "LLVM Linker", false); - else + if (parsedArgs.size() == 0) { + std::string Usage = + llvm::formatv("{0} [options] file...", args[0]).str(); + table.PrintHelp(llvm::outs(), Usage.c_str(), "LLVM Linker", false); + } else { error("-arch not specified and could not be inferred"); + } return false; } } Index: lld/trunk/wasm/Driver.cpp =================================================================== --- lld/trunk/wasm/Driver.cpp +++ lld/trunk/wasm/Driver.cpp @@ -24,6 +24,7 @@ #include "llvm/Object/Wasm.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" #include "llvm/Support/TargetSelect.h" @@ -349,7 +350,8 @@ // Handle --help if (Args.hasArg(OPT_help)) { - Parser.PrintHelp(outs(), ArgsArr[0], "LLVM Linker", false); + std::string Usage = formatv("{0} [options] file...", ArgsArr[0]).str(); + Parser.PrintHelp(outs(), Usage.c_str(), "LLVM Linker", false); return; }