Use llvm::to_string instead of std::to_string to fix bot

This should fix the android build in this bot:
http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-buildserver/builds/11143

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@282308 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index d212af42cf1f5827e664a4a698e4d2710deeb0fd..7d1e0d091aa18bdf4f335b73267f25ef39b73eb4 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -41,6 +41,7 @@
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/ScopedPrinter.h"
 #include "llvm/Support/TargetParser.h"
 
 #ifdef LLVM_ON_UNIX
@@ -2045,7 +2046,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
 
   if (unsigned Parallelism = getLTOParallelism(Args, D))
     CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-opt=jobs=") +
-                                         std::to_string(Parallelism)));
+                                         llvm::to_string(Parallelism)));
 
   // If an explicit debugger tuning argument appeared, pass it along.
   if (Arg *A = Args.getLastArg(options::OPT_gTune_Group,
@@ -8079,7 +8080,7 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA,
           getLTOParallelism(Args, getToolChain().getDriver())) {
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back(
-        Args.MakeArgString(Twine("-threads=") + std::to_string(Parallelism)));
+        Args.MakeArgString(Twine("-threads=") + llvm::to_string(Parallelism)));
   }
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {