4c30b74390
This is a reasonably non-intrusive change, which I've verified works for both x86 and x64 DevDiv-internal builds. The idea is to change `bool IsVS2017OrNewer` into a 3-state `ToolsetLayout VSLayout`. Either a build is DevDiv-internal, released VS 2017 or newer, or released VS 2015 or older. When looking at the directory structure, if instead of `"VC"` we see `"x86ret"`, `"x86chk"`, `"amd64ret"`, or `"amd64chk"`, we recognize this as a DevDiv-internal build. After we get past the directory structure validation, we use this knowledge to regenerate paths appropriately. `llvmArchToDevDivInternalArch()` knows how we use `"i386"` subdirectories, and `MSVCToolChain::getSubDirectoryPath()` uses that. It also knows that DevDiv-internal builds have an `"inc"` subdirectory instead of `"include"`. This may still not be the "right" fix in any sense, but I believe that it's non-intrusive in the sense that if the special directory names aren't found, no codepaths are affected. (`ToolsetLayout::OlderVS` and `ToolsetLayout::VS2017OrNewer` correspond to `IsVS2017OrNewer` being `false` or `true`, respectively.) I searched for all references to `IsVS2017OrNewer`, which are places where Clang cares about VS's directory structure, and the only one that isn't being patched is some logic to deal with cross-compilation. I'm fine with that not working for DevDiv-internal builds for the moment (we typically test the native compilers), so I added a comment. Fixes D36860. llvm-svn: 311391
147 lines
5.1 KiB
C++
147 lines
5.1 KiB
C++
//===--- MSVC.h - MSVC ToolChain Implementations ----------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MSVC_H
|
|
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MSVC_H
|
|
|
|
#include "Cuda.h"
|
|
#include "clang/Driver/Compilation.h"
|
|
#include "clang/Driver/Tool.h"
|
|
#include "clang/Driver/ToolChain.h"
|
|
|
|
namespace clang {
|
|
namespace driver {
|
|
namespace tools {
|
|
|
|
/// Visual studio tools.
|
|
namespace visualstudio {
|
|
class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
|
|
public:
|
|
Linker(const ToolChain &TC)
|
|
: Tool("visualstudio::Linker", "linker", TC, RF_Full,
|
|
llvm::sys::WEM_UTF16) {}
|
|
|
|
bool hasIntegratedCPP() const override { return false; }
|
|
bool isLinkJob() const override { return true; }
|
|
|
|
void ConstructJob(Compilation &C, const JobAction &JA,
|
|
const InputInfo &Output, const InputInfoList &Inputs,
|
|
const llvm::opt::ArgList &TCArgs,
|
|
const char *LinkingOutput) const override;
|
|
};
|
|
|
|
class LLVM_LIBRARY_VISIBILITY Compiler : public Tool {
|
|
public:
|
|
Compiler(const ToolChain &TC)
|
|
: Tool("visualstudio::Compiler", "compiler", TC, RF_Full,
|
|
llvm::sys::WEM_UTF16) {}
|
|
|
|
bool hasIntegratedAssembler() const override { return true; }
|
|
bool hasIntegratedCPP() const override { return true; }
|
|
bool isLinkJob() const override { return false; }
|
|
|
|
void ConstructJob(Compilation &C, const JobAction &JA,
|
|
const InputInfo &Output, const InputInfoList &Inputs,
|
|
const llvm::opt::ArgList &TCArgs,
|
|
const char *LinkingOutput) const override;
|
|
|
|
std::unique_ptr<Command> GetCommand(Compilation &C, const JobAction &JA,
|
|
const InputInfo &Output,
|
|
const InputInfoList &Inputs,
|
|
const llvm::opt::ArgList &TCArgs,
|
|
const char *LinkingOutput) const;
|
|
};
|
|
} // end namespace visualstudio
|
|
|
|
} // end namespace tools
|
|
|
|
namespace toolchains {
|
|
|
|
class LLVM_LIBRARY_VISIBILITY MSVCToolChain : public ToolChain {
|
|
public:
|
|
MSVCToolChain(const Driver &D, const llvm::Triple &Triple,
|
|
const llvm::opt::ArgList &Args);
|
|
|
|
llvm::opt::DerivedArgList *
|
|
TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,
|
|
Action::OffloadKind DeviceOffloadKind) const override;
|
|
|
|
bool IsIntegratedAssemblerDefault() const override;
|
|
bool IsUnwindTablesDefault(const llvm::opt::ArgList &Args) const override;
|
|
bool isPICDefault() const override;
|
|
bool isPIEDefault() const override;
|
|
bool isPICDefaultForced() const override;
|
|
|
|
enum class SubDirectoryType {
|
|
Bin,
|
|
Include,
|
|
Lib,
|
|
};
|
|
std::string getSubDirectoryPath(SubDirectoryType Type,
|
|
llvm::Triple::ArchType TargetArch) const;
|
|
|
|
// Convenience overload.
|
|
// Uses the current target arch.
|
|
std::string getSubDirectoryPath(SubDirectoryType Type) const {
|
|
return getSubDirectoryPath(Type, getArch());
|
|
}
|
|
|
|
enum class ToolsetLayout {
|
|
OlderVS,
|
|
VS2017OrNewer,
|
|
DevDivInternal,
|
|
};
|
|
bool getIsVS2017OrNewer() const { return VSLayout == ToolsetLayout::VS2017OrNewer; }
|
|
|
|
void
|
|
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
|
llvm::opt::ArgStringList &CC1Args) const override;
|
|
void AddClangCXXStdlibIncludeArgs(
|
|
const llvm::opt::ArgList &DriverArgs,
|
|
llvm::opt::ArgStringList &CC1Args) const override;
|
|
|
|
void AddCudaIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
|
llvm::opt::ArgStringList &CC1Args) const override;
|
|
|
|
bool getWindowsSDKLibraryPath(std::string &path) const;
|
|
/// \brief Check if Universal CRT should be used if available
|
|
bool getUniversalCRTLibraryPath(std::string &path) const;
|
|
bool useUniversalCRT() const;
|
|
VersionTuple
|
|
computeMSVCVersion(const Driver *D,
|
|
const llvm::opt::ArgList &Args) const override;
|
|
|
|
std::string ComputeEffectiveClangTriple(const llvm::opt::ArgList &Args,
|
|
types::ID InputType) const override;
|
|
SanitizerMask getSupportedSanitizers() const override;
|
|
|
|
void printVerboseInfo(raw_ostream &OS) const override;
|
|
|
|
protected:
|
|
void AddSystemIncludeWithSubfolder(const llvm::opt::ArgList &DriverArgs,
|
|
llvm::opt::ArgStringList &CC1Args,
|
|
const std::string &folder,
|
|
const Twine &subfolder1,
|
|
const Twine &subfolder2 = "",
|
|
const Twine &subfolder3 = "") const;
|
|
|
|
Tool *buildLinker() const override;
|
|
Tool *buildAssembler() const override;
|
|
private:
|
|
std::string VCToolChainPath;
|
|
ToolsetLayout VSLayout = ToolsetLayout::OlderVS;
|
|
CudaInstallationDetector CudaInstallation;
|
|
};
|
|
|
|
} // end namespace toolchains
|
|
} // end namespace driver
|
|
} // end namespace clang
|
|
|
|
#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MSVC_H
|