Skip to content

Add support for Windows - flang_release_40 branch #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: flang_release_40
Choose a base branch
from
+113 −12
Open

Add support for Windows - flang_release_40 branch #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6414fd1
Add support to set linker flags for flang on windows
isuruf Oct 29, 2017
c82849d
Defines for windows
isuruf Oct 30, 2017
34a9da2
Link in msvcrt by default
isuruf Oct 30, 2017
c549ee0
Add Dbghelp
isuruf Oct 30, 2017
2b0d6a5
Honour CPATH and C_INCLUDE_PATH
isuruf Oct 31, 2017
70a8ae8
Add -linker -directive
isuruf Nov 4, 2017
ed5a500
Remove hack
isuruf Nov 4, 2017
f08d7ef
Remove Dbghelp
isuruf Nov 4, 2017
c6e98d6
Don't add linker directives if no-flang-libs
isuruf Nov 6, 2017
96204a9
Send target
isuruf Nov 7, 2017
eddf15a
Fix typo
isuruf Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/clang/Driver/ToolChain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ class ToolChain {
/// AddFortranStdlibLibArgs - Add the system specific linker arguments to use
/// for the given Fortran runtime library type.
virtual void AddFortranStdlibLibArgs(const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) const;
llvm::opt::ArgStringList &CmdArgs,
bool AddMLinker=false) const;

/// \brief Return sanitizers which are available in this toolchain.
virtual SanitizerMask getSupportedSanitizers() const;
Expand Down
54 changes: 49 additions & 5 deletions lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,10 +663,22 @@ void ToolChain::AddCCKextLibArgs(const ArgList &Args,
CmdArgs.push_back("-lcc_kext");
}

void addMLinkerHelper(const ArgList &Args, ArgStringList &CmdArgs, bool AddMLinker, StringRef Arg) {
if (AddMLinker) {
CmdArgs.push_back("-linker");
CmdArgs.push_back(Args.MakeArgString(Arg));
} else {
CmdArgs.push_back(Args.MakeArgString(Arg));
}
}

void ToolChain::AddFortranStdlibLibArgs(const ArgList &Args,
ArgStringList &CmdArgs) const {
bool staticFlangLibs = false;
bool useOpenMP = false;
ArgStringList &CmdArgs, bool AddMLinker) const {
bool staticFlangLibs = false;
bool useOpenMP = false;

const llvm::Triple &Triple = getTriple();
bool IsWindows = Triple.isWindowsMSVCEnvironment();

if (Args.hasArg(options::OPT_staticFlangLibs)) {
for (auto *A: Args.filtered(options::OPT_staticFlangLibs)) {
Expand All @@ -680,9 +692,41 @@ void ToolChain::AddFortranStdlibLibArgs(const ArgList &Args,
if (A &&
(A->getOption().matches(options::OPT_mp) ||
A->getOption().matches(options::OPT_fopenmp))) {
useOpenMP = true;
useOpenMP = true;
}
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
if (getDriver().IsFortranMode()) {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:msvcrt");
} else if (!getDriver().IsCLMode() && !getDriver().IsFortranMode()) {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:libcmt");
}
}
if (IsWindows) {
if (!AddMLinker)
CmdArgs.push_back(Args.MakeArgString(std::string("-libpath:") +
D.Dir + "/../lib"));

if (staticFlangLibs) {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:libflang");
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:libflangrti");
if( useOpenMP ) {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:libomp");
}
else {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:libompstub");
}
} else {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:flang");
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:flangrti");
if( useOpenMP ) {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:omp");
}
else {
addMLinkerHelper(Args, CmdArgs, AddMLinker, "/defaultlib:ompstub");
}
}
return;
}

if (staticFlangLibs) {
CmdArgs.push_back("-Bstatic");
}
Expand Down
68 changes: 62 additions & 6 deletions lib/Driver/Tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4696,19 +4696,36 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
// Add system include arguments.
getToolChain().AddFlangSystemIncludeArgs(Args, UpperCmdArgs);

bool IsWindowsMSVC = getToolChain().getTriple().isWindowsMSVCEnvironment();

if (!IsWindowsMSVC) {
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("unix");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__unix");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__unix__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("linux");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__linux");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__linux__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__NO_MATH_INLINES");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LP64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=9223372036854775807L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long int");
} else {
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__LONG_MAX__=2147483647L");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__SIZE_TYPE__=unsigned long long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__PTRDIFF_TYPE__=long long int");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("_WIN32");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("WIN32");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("_WIN64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("WIN64");
VersionTuple MSVT =
getToolChain().computeMSVCVersion(&getToolChain().getDriver(), Args);
auto msc_ver = MSVT.getMajor() * 100 + MSVT.getMinor().getValueOr(0);
UpperCmdArgs.push_back("-def");
UpperCmdArgs.push_back(Args.MakeArgString(std::string("_MSC_VER=")+std::to_string(msc_ver)));
}
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__NO_MATH_INLINES");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__x86_64__");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__THROW=");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__extension__=");
UpperCmdArgs.push_back("-def"); UpperCmdArgs.push_back("__amd_64__amd64__");
Expand Down Expand Up @@ -4792,6 +4809,10 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
UpperCmdArgs.push_back(Arg->getValue(0));
}

// Add env variables
addDirectoryList(Args, UpperCmdArgs, "-idir", "C_INCLUDE_PATH");
addDirectoryList(Args, UpperCmdArgs, "-idir", "CPATH");

// Add user-defined module directories
for (auto Arg : Args.filtered(options::OPT_ModuleDir, options::OPT_J)) {
Arg->claim();
Expand Down Expand Up @@ -4918,6 +4939,23 @@ void FlangFrontend::ConstructJob(Compilation &C, const JobAction &JA,
LowerCmdArgs.push_back(STBFile);

LowerCmdArgs.push_back("-asm"); LowerCmdArgs.push_back(Args.MakeArgString(OutFile));
if (IsWindowsMSVC && !Args.hasArg(options::OPT_noFlangLibs)) {
getToolChain().AddFortranStdlibLibArgs(Args, LowerCmdArgs, true);
if (needFortranMain(getToolChain().getDriver(), Args)) {
LowerCmdArgs.push_back("-linker");
LowerCmdArgs.push_back("/subsystem:console");
LowerCmdArgs.push_back("-linker");
LowerCmdArgs.push_back("/defaultlib:flangmain");
}
}
for (auto Arg : Args.filtered(options::OPT_noFlangLibs)) {
Arg->claim();
}

const llvm::Triple &Triple = getToolChain().getEffectiveTriple();
const std::string &TripleStr = Triple.getTriple();
LowerCmdArgs.push_back("-target");
LowerCmdArgs.push_back(Args.MakeArgString(TripleStr));

C.addCommand(llvm::make_unique<Command>(JA, *this, LowerExec, LowerCmdArgs, Inputs));
}
Expand Down Expand Up @@ -11693,15 +11731,20 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
const char *LinkingOutput) const {
ArgStringList CmdArgs;
const ToolChain &TC = getToolChain();
const Driver &D = TC.getDriver();

assert((Output.isFilename() || Output.isNothing()) && "invalid output");
if (Output.isFilename())
CmdArgs.push_back(
Args.MakeArgString(std::string("-out:") + Output.getFilename()));

if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles) &&
!C.getDriver().IsCLMode())
CmdArgs.push_back("-defaultlib:libcmt");
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
if (C.getDriver().IsFortranMode()) {
CmdArgs.push_back("-defaultlib:msvcrt");
} else if (!C.getDriver().IsCLMode() && !C.getDriver().IsFortranMode()) {
CmdArgs.push_back("-defaultlib:libcmt");
}
}

if (!llvm::sys::Process::GetEnv("LIB")) {
// If the VC environment hasn't been configured (perhaps because the user
Expand Down Expand Up @@ -11783,6 +11826,19 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back(TC.getCompilerRTArgString(Args, Lib));
}
}
if (needFortranMain(D, Args)) {
CmdArgs.push_back("-subsystem:console");
CmdArgs.push_back("-defaultlib:flangmain");
}
// Add Fortran runtime libraries
if (needFortranLibs(D, Args)) {
TC.AddFortranStdlibLibArgs(Args, CmdArgs);
} else {
// Claim "no Flang libraries" arguments if any
for (auto Arg : Args.filtered(options::OPT_noFlangLibs)) {
Arg->claim();
}
}

Args.AddAllArgValues(CmdArgs, options::OPT__SLASH_link);

Expand Down