diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 3409ce29ac563..dacc4442b338a 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2858,7 +2858,7 @@ def fms_compatibility_version "version number to report in _MSC_VER (0 = don't define it " "(default))">; def fms_runtime_lib_EQ : Joined<["-"], "fms-runtime-lib=">, Group, - Flags<[]>, Visibility<[ClangOption, CLOption]>, + Flags<[]>, Visibility<[ClangOption, CLOption, FlangOption]>, Values<"static,static_dbg,dll,dll_dbg">, HelpText<"Select Windows run-time library">, DocBrief<[{ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index e19f1829c9fa8..a81c9b6201f81 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC, return true; } -void tools::addFortranRuntimeLibs(const ToolChain &TC, +void tools::addFortranRuntimeLibs(const ToolChain &TC, const ArgList &Args, llvm::opt::ArgStringList &CmdArgs) { if (TC.getTriple().isKnownWindowsMSVCEnvironment()) { - CmdArgs.push_back("Fortran_main.lib"); - CmdArgs.push_back("FortranRuntime.lib"); - CmdArgs.push_back("FortranDecimal.lib"); + CmdArgs.push_back(Args.MakeArgString( + "/DEFAULTLIB:" + TC.getCompilerRTBasename(Args, "builtins"))); + unsigned RTOptionID = options::OPT__SLASH_MT; + if (auto *rtl = Args.getLastArg(options::OPT_fms_runtime_lib_EQ)) { + RTOptionID = llvm::StringSwitch(rtl->getValue()) + .Case("static", options::OPT__SLASH_MT) + .Case("static_dbg", options::OPT__SLASH_MTd) + .Case("dll", options::OPT__SLASH_MD) + .Case("dll_dbg", options::OPT__SLASH_MDd) + .Default(options::OPT__SLASH_MT); + } + switch (RTOptionID) { + case options::OPT__SLASH_MT: + CmdArgs.push_back("/DEFAULTLIB:libcmt"); + CmdArgs.push_back("Fortran_main.static.lib"); + CmdArgs.push_back("FortranRuntime.static.lib"); + CmdArgs.push_back("FortranDecimal.static.lib"); + break; + case options::OPT__SLASH_MTd: + CmdArgs.push_back("/DEFAULTLIB:libcmtd"); + CmdArgs.push_back("Fortran_main.static_dbg.lib"); + CmdArgs.push_back("FortranRuntime.static_dbg.lib"); + CmdArgs.push_back("FortranDecimal.static_dbg.lib"); + break; + case options::OPT__SLASH_MD: + CmdArgs.push_back("/DEFAULTLIB:msvcrt"); + CmdArgs.push_back("Fortran_main.dynamic.lib"); + CmdArgs.push_back("FortranRuntime.dynamic.lib"); + CmdArgs.push_back("FortranDecimal.dynamic.lib"); + break; + case options::OPT__SLASH_MDd: + CmdArgs.push_back("/DEFAULTLIB:msvcrtd"); + CmdArgs.push_back("Fortran_main.dynamic_dbg.lib"); + CmdArgs.push_back("FortranRuntime.dynamic_dbg.lib"); + CmdArgs.push_back("FortranDecimal.dynamic_dbg.lib"); + break; + } } else { CmdArgs.push_back("-lFortran_main"); CmdArgs.push_back("-lFortranRuntime"); diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h index f364c9793c9be..0a0951c5386e6 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.h +++ b/clang/lib/Driver/ToolChains/CommonArgs.h @@ -116,7 +116,7 @@ bool addOpenMPRuntime(llvm::opt::ArgStringList &CmdArgs, const ToolChain &TC, bool IsOffloadingHost = false, bool GompNeedsRT = false); /// Adds Fortran runtime libraries to \p CmdArgs. -void addFortranRuntimeLibs(const ToolChain &TC, +void addFortranRuntimeLibs(const ToolChain &TC, const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs); /// Adds the path for the Fortran runtime libraries to \p CmdArgs. diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index f28e08d81bf29..7481f6cab9a96 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -678,7 +678,7 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA, // to generate executables. if (getToolChain().getDriver().IsFlangMode()) { addFortranRuntimeLibraryPath(getToolChain(), Args, CmdArgs); - addFortranRuntimeLibs(getToolChain(), CmdArgs); + addFortranRuntimeLibs(getToolChain(), Args, CmdArgs); } if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) diff --git a/clang/lib/Driver/ToolChains/DragonFly.cpp b/clang/lib/Driver/ToolChains/DragonFly.cpp index cced977bf0292..b13449bf778fa 100644 --- a/clang/lib/Driver/ToolChains/DragonFly.cpp +++ b/clang/lib/Driver/ToolChains/DragonFly.cpp @@ -153,7 +153,7 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); CmdArgs.push_back("-lm"); } diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp index 685616a9bfd46..264700acc77bf 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -308,7 +308,7 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); if (Profiling) CmdArgs.push_back("-lm_p"); else diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 3276590729e47..19dff4ec4d45e 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -584,7 +584,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); CmdArgs.push_back("-lm"); } diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp index 1df9c7b08879e..1c2d6bcaf9b45 100644 --- a/clang/lib/Driver/ToolChains/Haiku.cpp +++ b/clang/lib/Driver/ToolChains/Haiku.cpp @@ -104,7 +104,7 @@ void haiku::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); } CmdArgs.push_back("-lgcc"); diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp index 4966d102c51f1..8a4a174c90ea8 100644 --- a/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/clang/lib/Driver/ToolChains/MSVC.cpp @@ -131,7 +131,7 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (C.getDriver().IsFlangMode()) { addFortranRuntimeLibraryPath(TC, Args, CmdArgs); - addFortranRuntimeLibs(TC, CmdArgs); + addFortranRuntimeLibs(TC, Args, CmdArgs); // Inform the MSVC linker that we're generating a console application, i.e. // one with `main` as the "user-defined" entry point. The `main` function is diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp index 39d767795445d..5d7f8675daf8d 100644 --- a/clang/lib/Driver/ToolChains/MinGW.cpp +++ b/clang/lib/Driver/ToolChains/MinGW.cpp @@ -249,7 +249,7 @@ void tools::MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (C.getDriver().IsFlangMode()) { addFortranRuntimeLibraryPath(TC, Args, CmdArgs); - addFortranRuntimeLibs(TC, CmdArgs); + addFortranRuntimeLibs(TC, Args, CmdArgs); } // TODO: Add profile stuff here diff --git a/clang/lib/Driver/ToolChains/NetBSD.cpp b/clang/lib/Driver/ToolChains/NetBSD.cpp index cfde8d40a77ae..ffc4742b6c4e7 100644 --- a/clang/lib/Driver/ToolChains/NetBSD.cpp +++ b/clang/lib/Driver/ToolChains/NetBSD.cpp @@ -324,7 +324,7 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); CmdArgs.push_back("-lm"); } diff --git a/clang/lib/Driver/ToolChains/OpenBSD.cpp b/clang/lib/Driver/ToolChains/OpenBSD.cpp index c5255573baf3c..d9f6b20f43ad8 100644 --- a/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -223,7 +223,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, // AddRunTimeLibs). if (D.IsFlangMode()) { addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibs(ToolChain, Args, CmdArgs); if (Profiling) CmdArgs.push_back("-lm_p"); else diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp b/clang/lib/Driver/ToolChains/Solaris.cpp index e45932008a65a..96757f07a5497 100644 --- a/clang/lib/Driver/ToolChains/Solaris.cpp +++ b/clang/lib/Driver/ToolChains/Solaris.cpp @@ -228,8 +228,8 @@ void solaris::Linker::ConstructJob(Compilation &C, const JobAction &JA, // to generate executables. As Fortran runtime depends on the C runtime, // these dependencies need to be listed before the C runtime below. if (D.IsFlangMode()) { - addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs); - addFortranRuntimeLibs(ToolChain, CmdArgs); + addFortranRuntimeLibraryPath(getToolChain(), Args, CmdArgs); + addFortranRuntimeLibs(getToolChain(), Args, CmdArgs); CmdArgs.push_back("-lm"); } if (Args.hasArg(options::OPT_fstack_protector) || diff --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt index 3116ff68ea262..febc9ef7ee51b 100644 --- a/flang/lib/Decimal/CMakeLists.txt +++ b/flang/lib/Decimal/CMakeLists.txt @@ -53,3 +53,26 @@ add_flang_library(FortranDecimal INSTALL_WITH_TOOLCHAIN binary-to-decimal.cpp decimal-to-binary.cpp ) + +if (DEFINED MSVC) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded) + add_flang_library(FortranDecimal.static INSTALL_WITH_TOOLCHAIN + binary-to-decimal.cpp + decimal-to-binary.cpp + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + add_flang_library(FortranDecimal.dynamic INSTALL_WITH_TOOLCHAIN + binary-to-decimal.cpp + decimal-to-binary.cpp + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebug) + add_flang_library(FortranDecimal.static_dbg INSTALL_WITH_TOOLCHAIN + binary-to-decimal.cpp + decimal-to-binary.cpp + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebugDLL) + add_flang_library(FortranDecimal.dynamic_dbg INSTALL_WITH_TOOLCHAIN + binary-to-decimal.cpp + decimal-to-binary.cpp + ) +endif() \ No newline at end of file diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index f75daa373705f..575c5bcf0a255 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -274,10 +274,38 @@ if (NOT FLANG_EXPERIMENTAL_OMP_OFFLOAD_BUILD STREQUAL "off") endif() endif() -add_flang_library(FortranRuntime - ${sources} - LINK_LIBS - FortranDecimal +if (NOT DEFINED MSVC) + add_flang_library(FortranRuntime + ${sources} + LINK_LIBS + FortranDecimal - INSTALL_WITH_TOOLCHAIN -) + INSTALL_WITH_TOOLCHAIN + ) +else() + add_flang_library(FortranRuntime + ${sources} + LINK_LIBS + FortranDecimal + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded) + add_flang_library(FortranRuntime.static ${sources} + LINK_LIBS + FortranDecimal.static + INSTALL_WITH_TOOLCHAIN) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + add_flang_library(FortranRuntime.dynamic ${sources} + LINK_LIBS + FortranDecimal.dynamic + INSTALL_WITH_TOOLCHAIN) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebug) + add_flang_library(FortranRuntime.static_dbg ${sources} + LINK_LIBS + FortranDecimal.static_dbg + INSTALL_WITH_TOOLCHAIN) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebugDLL) + add_flang_library(FortranRuntime.dynamic_dbg ${sources} + LINK_LIBS + FortranDecimal.dynamic_dbg + INSTALL_WITH_TOOLCHAIN) +endif() diff --git a/flang/runtime/FortranMain/CMakeLists.txt b/flang/runtime/FortranMain/CMakeLists.txt index fe0d607c3f1a9..2e3c68f1c331b 100644 --- a/flang/runtime/FortranMain/CMakeLists.txt +++ b/flang/runtime/FortranMain/CMakeLists.txt @@ -1,3 +1,21 @@ add_flang_library(Fortran_main STATIC INSTALL_WITH_TOOLCHAIN Fortran_main.c ) +if (DEFINED MSVC) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded) + add_flang_library(Fortran_main.static STATIC INSTALL_WITH_TOOLCHAIN + Fortran_main.c + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + add_flang_library(Fortran_main.dynamic STATIC INSTALL_WITH_TOOLCHAIN + Fortran_main.c + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebug) + add_flang_library(Fortran_main.static_dbg STATIC INSTALL_WITH_TOOLCHAIN + Fortran_main.c + ) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebugDLL) + add_flang_library(Fortran_main.dynamic_dbg STATIC INSTALL_WITH_TOOLCHAIN + Fortran_main.c + ) +endif() diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90 index 5e0e459c21c93..bd04ffae231b6 100644 --- a/flang/test/Driver/driver-help-hidden.f90 +++ b/flang/test/Driver/driver-help-hidden.f90 @@ -61,6 +61,8 @@ ! CHECK-NEXT: -flto=jobserver Enable LTO in 'full' mode ! CHECK-NEXT: -flto= Set LTO mode ! CHECK-NEXT: -flto Enable LTO in 'full' mode +! CHECK-NEXT: -fms-runtime-lib= +! CHECK-NEXT: Select Windows run-time library ! CHECK-NEXT: -fno-alias-analysis Do not pass alias information on to LLVM (default for unoptimized builds) ! CHECK-NEXT: -fno-automatic Implies the SAVE attribute for non-automatic local objects in subprograms unless RECURSIVE ! CHECK-NEXT: -fno-color-diagnostics Disable colors in diagnostics diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90 index 31c9caa32ea82..2f81ec260ec96 100644 --- a/flang/test/Driver/driver-help.f90 +++ b/flang/test/Driver/driver-help.f90 @@ -51,6 +51,8 @@ ! HELP-NEXT: -flto=jobserver Enable LTO in 'full' mode ! HELP-NEXT: -flto= Set LTO mode ! HELP-NEXT: -flto Enable LTO in 'full' mode +! HELP-NEXT: -fms-runtime-lib= +! HELP-NEXT: Select Windows run-time library ! HELP-NEXT: -fno-alias-analysis Do not pass alias information on to LLVM (default for unoptimized builds) ! HELP-NEXT: -fno-automatic Implies the SAVE attribute for non-automatic local objects in subprograms unless RECURSIVE ! HELP-NEXT: -fno-color-diagnostics Disable colors in diagnostics diff --git a/flang/test/Driver/linker-flags.f90 b/flang/test/Driver/linker-flags.f90 index e4d713df499b7..a1417057d4da0 100644 --- a/flang/test/Driver/linker-flags.f90 +++ b/flang/test/Driver/linker-flags.f90 @@ -12,11 +12,13 @@ ! RUN: %flang -### --target=x86_64-unknown-haiku %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,HAIKU ! RUN: %flang -### --target=x86_64-windows-gnu %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MINGW -! NOTE: Clang's driver library, clangDriver, usually adds 'libcmt' and -! 'oldnames' on Windows, but they are not needed when compiling -! Fortran code and they might bring in additional dependencies. -! Make sure they're not added. -! RUN: %flang -### --target=aarch64-windows-msvc -fuse-ld= %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC --implicit-check-not libcmt --implicit-check-not oldnames +! NOTE: Clang's driver library, clangDriver, usually adds 'oldnames' on Windows, +! but it is not needed when compiling Fortran code and they might bring in +! additional dependencies. Make sure its not added. +! RUN: %flang -### --target=aarch64-windows-msvc -fuse-ld= %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC --implicit-check-not oldnames +! RUN: %flang -### --target=aarch64-windows-msvc -fms-runtime-lib=static_dbg -fuse-ld= %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC-DEBUG --implicit-check-not oldnames +! RUN: %flang -### --target=aarch64-windows-msvc -fms-runtime-lib=dll -fuse-ld= %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC-DLL --implicit-check-not oldnames +! RUN: %flang -### --target=aarch64-windows-msvc -fms-runtime-lib=dll_dbg -fuse-ld= %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC-DLL-DEBUG --implicit-check-not oldnames ! Compiler invocation to generate the object file ! CHECK-LABEL: {{.*}} "-emit-obj" @@ -52,8 +54,37 @@ ! (lld-)link.exe on Windows platforms. The suffix may not be added ! when the executable is not found or on non-Windows platforms. ! MSVC-LABEL: link -! MSVC-SAME: Fortran_main.lib -! MSVC-SAME: FortranRuntime.lib -! MSVC-SAME: FortranDecimal.lib +! MSVC-SAME: /DEFAULTLIB:clang_rt.builtins-aarch64.lib +! MSVC-SAME: /DEFAULTLIB:libcmt +! MSVC-SAME: Fortran_main.static.lib +! MSVC-SAME: FortranRuntime.static.lib +! MSVC-SAME: FortranDecimal.static.lib ! MSVC-SAME: /subsystem:console ! MSVC-SAME: "[[object_file]]" + +! MSVC-DEBUG-LABEL: link +! MSVC-DEBUG-SAME: /DEFAULTLIB:clang_rt.builtins-aarch64.lib +! MSVC-DEBUG-SAME: /DEFAULTLIB:libcmtd +! MSVC-DEBUG-SAME: Fortran_main.static_dbg.lib +! MSVC-DEBUG-SAME: FortranRuntime.static_dbg.lib +! MSVC-DEBUG-SAME: FortranDecimal.static_dbg.lib +! MSVC-DEBUG-SAME: /subsystem:console +! MSVC-DEBUG-SAME: "[[object_file]]" + +! MSVC-DLL-LABEL: link +! MSVC-DLL-SAME: /DEFAULTLIB:clang_rt.builtins-aarch64.lib +! MSVC-DLL-SAME: /DEFAULTLIB:msvcrt +! MSVC-DLL-SAME: Fortran_main.dynamic.lib +! MSVC-DLL-SAME: FortranRuntime.dynamic.lib +! MSVC-DLL-SAME: FortranDecimal.dynamic.lib +! MSVC-DLL-SAME: /subsystem:console +! MSVC-DLL-SAME: "[[object_file]]" + +! MSVC-DLL-DEBUG-LABEL: link +! MSVC-DLL-DEBUG-SAME: /DEFAULTLIB:clang_rt.builtins-aarch64.lib +! MSVC-DLL-DEBUG-SAME: /DEFAULTLIB:msvcrtd +! MSVC-DLL-DEBUG-SAME: Fortran_main.dynamic_dbg.lib +! MSVC-DLL-DEBUG-SAME: FortranRuntime.dynamic_dbg.lib +! MSVC-DLL-DEBUG-SAME: FortranDecimal.dynamic_dbg.lib +! MSVC-DLL-DEBUG-SAME: /subsystem:console +! MSVC-DLL-DEBUG-SAME: "[[object_file]]"