replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eliminate dependency to formatv(). NFC. 

llvm-svn: 344177
This commit is contained in:
Rui Ueyama 2018-10-10 20:29:29 +00:00
parent 7e30c91dca
commit 9ae88c64fa
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lld/ELF/DriverUtils.cpp
View File

@ -24,7 +24,6 @@
#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"
@ -140,9 +139,9 @@ opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> Argv) {
}
void elf::printHelp() {
std::string Usage = formatv("{0} [options] file...", Config->ProgName).str();
ELFOptTable().PrintHelp(outs(), Usage.c_str(), "lld", false /*ShowHidden*/,
true /*ShowAllAliases*/);
ELFOptTable().PrintHelp(
outs(), (Config->ProgName + " [options] file...").str().c_str(), "lld",
false /*ShowHidden*/, true /*ShowAllAliases*/);
outs() << "\n";
// Scripts generated by Libtool versions up to at least 2.4.6 (the most

7
lld/lib/Driver/DarwinLdDriver.cpp
View File

@ -44,7 +44,6 @@
#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"
@ -384,9 +383,9 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) {
!parsedArgs.getLastArg(OPT_test_file_usage)) {
// If no -arch and no options at all, print usage message.
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);
table.PrintHelp(llvm::outs(),
(std::string(args[0]) + " [options] file...").c_str(),
"LLVM Linker", false);
} else {
error("-arch not specified and could not be inferred");
}

6
lld/wasm/Driver.cpp
View File

@ -24,7 +24,6 @@
#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"
@ -350,8 +349,9 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
// Handle --help
if (Args.hasArg(OPT_help)) {
std::string Usage = formatv("{0} [options] file...", ArgsArr[0]).str();
Parser.PrintHelp(outs(), Usage.c_str(), "LLVM Linker", false);
Parser.PrintHelp(outs(),
(std::string(ArgsArr[0]) + " [options] file...").c_str(),
"LLVM Linker", false);
return;
}