diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:21:19 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:21:19 +0000 |
commit | be08ec96063be8c1a1a8621eccd05a4ebeecfb42 (patch) | |
tree | a390ff37f3537ba45537f8cd0a0b6c19c9251ca5 /COFF | |
parent | d2d3ebb81992e107edf95c1c136d7a342d9b1418 (diff) |
Vendor import of lld trunk r300890:vendor/lld/lld-trunk-r300890
Notes
Notes:
svn path=/vendor/lld/dist/; revision=317226
svn path=/vendor/lld/lld-trunk-r300890/; revision=317227; tag=vendor/lld/lld-trunk-r300890
Diffstat (limited to 'COFF')
-rw-r--r-- | COFF/Driver.cpp | 8 | ||||
-rw-r--r-- | COFF/DriverUtils.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/COFF/Driver.cpp b/COFF/Driver.cpp index 3e7f10bf8d11..daddfb86d4cf 100644 --- a/COFF/Driver.cpp +++ b/COFF/Driver.cpp @@ -509,7 +509,7 @@ filterBitcodeFiles(StringRef Path, std::vector<std::string> &TemporaryFiles) { // Create response file contents and invoke the MSVC linker. void LinkerDriver::invokeMSVC(opt::InputArgList &Args) { - std::string Rsp = "/nologo "; + std::string Rsp = "/nologo\n"; std::vector<std::string> Temps; for (auto *Arg : Args) { @@ -528,14 +528,14 @@ void LinkerDriver::invokeMSVC(opt::InputArgList &Args) { case OPT_INPUT: { if (Optional<StringRef> Path = doFindFile(Arg->getValue())) { if (Optional<std::string> S = filterBitcodeFiles(*Path, Temps)) - Rsp += quote(*S) + " "; + Rsp += quote(*S) + "\n"; continue; } - Rsp += quote(Arg->getValue()) + " "; + Rsp += quote(Arg->getValue()) + "\n"; break; } default: - Rsp += toString(Arg) + " "; + Rsp += toString(Arg) + "\n"; } } diff --git a/COFF/DriverUtils.cpp b/COFF/DriverUtils.cpp index a9c1c9d5593e..2c9ba797f73b 100644 --- a/COFF/DriverUtils.cpp +++ b/COFF/DriverUtils.cpp @@ -634,7 +634,7 @@ void runMSVCLinker(std::string Rsp, ArrayRef<StringRef> Objects) { std::vector<TemporaryFile> Temps; for (StringRef S : Objects) { Temps.emplace_back("lto", "obj", S); - Rsp += quote(Temps.back().Path) + " "; + Rsp += quote(Temps.back().Path) + "\n"; } log("link.exe " + Rsp); |