From 9ae88c64fa6ee582578c4a018cf92ada6a8bb08d Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Wed, 10 Oct 2018 20:29:29 +0000
Subject: [PATCH] Eliminate dependency to formatv(). NFC.

llvm-svn: 344177
---
 lld/ELF/DriverUtils.cpp           | 7 +++----
 lld/lib/Driver/DarwinLdDriver.cpp | 7 +++----
 lld/wasm/Driver.cpp               | 6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lld/ELF/DriverUtils.cpp b/lld/ELF/DriverUtils.cpp
index d8d317a..e51d02e 100644
--- a/lld/ELF/DriverUtils.cpp
+++ b/lld/ELF/DriverUtils.cpp
@@ -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
diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp
index 7521d6e..bbac230 100644
--- a/lld/lib/Driver/DarwinLdDriver.cpp
+++ b/lld/lib/Driver/DarwinLdDriver.cpp
@@ -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");
       }
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index bbf9bcd..4079b11 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -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;
   }
 
-- 
2.7.4