Author: mstorsjo Date: Fri Oct 26 00:01:59 2018 New Revision: 345370 URL: http://llvm.org/viewvc/llvm-project?rev=345370&view=rev Log: Reapply: [Driver] Use forward slashes in most linker arguments
libtool inspects the output of $CC -v to detect what object files and libraries are linked in by default. When clang is built as a native windows executable, all paths are formatted with backslashes, and the backslashes cause each argument to be enclosed in quotes. The backslashes and quotes break further processing within libtool (which is implemented in shell script, running in e.g. msys) pretty badly. Between unix style pathes (that only work in tools that are linked to the msys runtime, essentially the same as cygwin) and proper windows style paths (with backslashes, that can easily break shell scripts and msys environments), the best compromise is to use windows style paths (starting with e.g. c:) but with forward slashes, which both msys based tools, shell scripts and native windows executables can cope with. This incidentally turns out to be the form of paths that GCC prints out when run with -v on windows as well. This change potentially makes the output from clang -v a bit more inconsistent, but it is isn't necessarily very consistent to begin with. Compared to the previous attempt in SVN r345004, this now does the same transformation on more paths, hopefully on the right set of paths so that all tests pass (previously some tests failed, where path fragments that were required to be identical turned out to use different path separators in different places). This now also is done only for non-windows, or cygwin/mingw targets, to preserve all backslashes for MSVC cases (where the paths can end up e.g. embedded into PDB files. (The transformation function itself, llvm::sys::path::convert_to_slash only has an effect when run on windows.) Differential Revision: https://reviews.llvm.org/D53066 Modified: cfe/trunk/include/clang/Driver/ToolChain.h cfe/trunk/lib/Driver/Driver.cpp cfe/trunk/lib/Driver/ToolChain.cpp cfe/trunk/lib/Driver/ToolChains/Clang.cpp cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Modified: cfe/trunk/include/clang/Driver/ToolChain.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/ToolChain.h?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/ToolChain.h (original) +++ cfe/trunk/include/clang/Driver/ToolChain.h Fri Oct 26 00:01:59 2018 @@ -21,6 +21,7 @@ #include "llvm/ADT/Triple.h" #include "llvm/MC/MCTargetOptions.h" #include "llvm/Option/Option.h" +#include "llvm/Support/Path.h" #include "llvm/Support/VersionTuple.h" #include "llvm/Target/TargetOptions.h" #include <cassert> @@ -370,6 +371,12 @@ public: StringRef Component, bool Shared = false) const; + std::string normalizePath(StringRef Path) const { + if (!Triple.isOSWindows() || Triple.isOSCygMing()) + return llvm::sys::path::convert_to_slash(Path); + return Path; + } + // Returns <ResourceDir>/lib/<OSName>/<arch>. This is used by runtimes (such // as OpenMP) to find arch-specific libraries. std::string getArchSpecificLibPath() const; Modified: cfe/trunk/lib/Driver/Driver.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Driver.cpp (original) +++ cfe/trunk/lib/Driver/Driver.cpp Fri Oct 26 00:01:59 2018 @@ -1011,6 +1011,12 @@ Compilation *Driver::BuildCompilation(Ar .Default(SaveTempsCwd); } + llvm::Triple EffectiveTriple = computeTargetTriple(*this, TargetTriple, Args); + if (!EffectiveTriple.isOSWindows() || EffectiveTriple.isOSCygMing()) { + for (auto *Str : {&Dir, &InstalledDir, &SysRoot, &ResourceDir}) + *Str = llvm::sys::path::convert_to_slash(*Str); + } + setLTOMode(Args); // Process -fembed-bitcode= flags. Modified: cfe/trunk/lib/Driver/ToolChain.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChain.cpp (original) +++ cfe/trunk/lib/Driver/ToolChain.cpp Fri Oct 26 00:01:59 2018 @@ -376,9 +376,10 @@ std::string ToolChain::getCompilerRT(con for (const auto &LibPath : getLibraryPaths()) { SmallString<128> P(LibPath); - llvm::sys::path::append(P, Prefix + Twine("clang_rt.") + Component + Suffix); + llvm::sys::path::append(P, + Prefix + Twine("clang_rt.") + Component + Suffix); if (getVFS().exists(P)) - return P.str(); + return normalizePath(P); } StringRef Arch = getArchNameForCompilerRTLib(*this, Args); @@ -386,7 +387,7 @@ std::string ToolChain::getCompilerRT(con SmallString<128> Path(getCompilerRTPath()); llvm::sys::path::append(Path, Prefix + Twine("clang_rt.") + Component + "-" + Arch + Env + Suffix); - return Path.str(); + return normalizePath(Path); } const char *ToolChain::getCompilerRTArgString(const llvm::opt::ArgList &Args, @@ -425,7 +426,7 @@ Tool *ToolChain::SelectTool(const JobAct } std::string ToolChain::GetFilePath(const char *Name) const { - return D.GetFilePath(Name, *this); + return normalizePath(D.GetFilePath(Name, *this)); } std::string ToolChain::GetProgramPath(const char *Name) const { @@ -774,12 +775,14 @@ void ToolChain::AddCXXStdlibLibArgs(cons void ToolChain::AddFilePathLibArgs(const ArgList &Args, ArgStringList &CmdArgs) const { for (const auto &LibPath : getLibraryPaths()) - if(LibPath.length() > 0) - CmdArgs.push_back(Args.MakeArgString(StringRef("-L") + LibPath)); + if (LibPath.length() > 0) + CmdArgs.push_back( + Args.MakeArgString(StringRef("-L") + normalizePath(LibPath))); for (const auto &LibPath : getFilePaths()) - if(LibPath.length() > 0) - CmdArgs.push_back(Args.MakeArgString(StringRef("-L") + LibPath)); + if (LibPath.length() > 0) + CmdArgs.push_back( + Args.MakeArgString(StringRef("-L") + normalizePath(LibPath))); } void ToolChain::AddCCKextLibArgs(const ArgList &Args, Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Fri Oct 26 00:01:59 2018 @@ -3570,7 +3570,8 @@ void Clang::ConstructJob(Compilation &C, for (const auto &II : Inputs) { addDashXForInput(Args, II, CmdArgs); if (II.isFilename()) - CmdArgs.push_back(II.getFilename()); + CmdArgs.push_back( + Args.MakeArgString(TC.normalizePath(II.getFilename()))); else II.getInputArg().renderAsInput(Args, CmdArgs); } @@ -4963,7 +4964,8 @@ void Clang::ConstructJob(Compilation &C, // Handled with other dependency code. } else if (Output.isFilename()) { CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); + CmdArgs.push_back( + Args.MakeArgString(TC.normalizePath(Output.getFilename()))); } else { assert(Output.isNothing() && "Invalid output."); } @@ -4978,7 +4980,8 @@ void Clang::ConstructJob(Compilation &C, for (const InputInfo &Input : FrontendInputs) { if (Input.isFilename()) - CmdArgs.push_back(Input.getFilename()); + CmdArgs.push_back( + Args.MakeArgString(TC.normalizePath(Input.getFilename()))); else Input.getInputArg().renderAsInput(Args, CmdArgs); } @@ -5671,9 +5674,10 @@ void ClangAs::ConstructJob(Compilation & assert(Inputs.size() == 1 && "Unexpected number of inputs."); const InputInfo &Input = Inputs[0]; - const llvm::Triple &Triple = getToolChain().getEffectiveTriple(); + const ToolChain &TC = getToolChain(); + const llvm::Triple &Triple = TC.getEffectiveTriple(); const std::string &TripleStr = Triple.getTriple(); - const auto &D = getToolChain().getDriver(); + const auto &D = TC.getDriver(); // Don't warn about "clang -w -c foo.s" Args.ClaimAllArgs(options::OPT_w); @@ -5847,7 +5851,7 @@ void ClangAs::ConstructJob(Compilation & assert(Output.isFilename() && "Unexpected lipo output."); CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); + CmdArgs.push_back(Args.MakeArgString(TC.normalizePath(Output.getFilename()))); const llvm::Triple &T = getToolChain().getTriple(); if (Args.hasArg(options::OPT_gsplit_dwarf) && @@ -5857,7 +5861,7 @@ void ClangAs::ConstructJob(Compilation & } assert(Input.isFilename() && "Invalid input."); - CmdArgs.push_back(Input.getFilename()); + CmdArgs.push_back(Args.MakeArgString(TC.normalizePath(Input.getFilename()))); const char *Exec = getToolChain().getDriver().getClangProgramPath(); C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); Modified: cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp Fri Oct 26 00:01:59 2018 @@ -163,7 +163,7 @@ void tools::AddLinkerInputs(const ToolCh // Add filenames immediately. if (II.isFilename()) { - CmdArgs.push_back(II.getFilename()); + CmdArgs.push_back(Args.MakeArgString(TC.normalizePath(II.getFilename()))); continue; } Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=345370&r1=345369&r2=345370&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Fri Oct 26 00:01:59 2018 @@ -1699,7 +1699,7 @@ void Generic_GCC::GCCInstallationDetecto if (GCCToolchainDir.back() == '/') GCCToolchainDir = GCCToolchainDir.drop_back(); // remove the / - Prefixes.push_back(GCCToolchainDir); + Prefixes.push_back(llvm::sys::path::convert_to_slash(GCCToolchainDir)); } else { // If we have a SysRoot, try that first. if (!D.SysRoot.empty()) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
