https://github.com/DavidTruby updated
https://github.com/llvm/llvm-project/pull/70833
>From 46057145d229e5b6ee7e6891f34d47b0d2aa818d Mon Sep 17 00:00:00 2001
From: David Truby
Date: Tue, 31 Oct 2023 15:07:13 +
Subject: [PATCH] [flang][windows] Add option to link against specific MSVC CRT
DavidTruby wrote:
I've also started the work to get linker option directives (like "/DEFAULTLIB")
added to MLIR's LLVMIR dialect so that we can do this the correct way: see
#71720. I'd still like to merge this patch first though for the incremental
improvement it does provide. Then once the
bradking wrote:
@DavidTruby please see my above retraction of the suggestion to rename
`.dynamic.lib` to `.dll.lib`.
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
@@ -281,3 +281,26 @@ add_flang_library(FortranRuntime
INSTALL_WITH_TOOLCHAIN
)
+
+if (DEFINED MSVC)
+ set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded)
+ add_flang_library(FortranRuntime.static ${sources}
bradking wrote:
When targeting the MSVC ABI, the
https://github.com/DavidTruby updated
https://github.com/llvm/llvm-project/pull/70833
>From 9e84729cada6c032c64934ee519e605407aab049 Mon Sep 17 00:00:00 2001
From: David Truby
Date: Tue, 31 Oct 2023 15:07:13 +
Subject: [PATCH 1/6] [flang][windows] Add option to link against specific MSVC
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
https://github.com/bradking edited
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
https://github.com/DavidTruby updated
https://github.com/llvm/llvm-project/pull/70833
>From 9e84729cada6c032c64934ee519e605407aab049 Mon Sep 17 00:00:00 2001
From: David Truby
Date: Tue, 31 Oct 2023 15:07:13 +
Subject: [PATCH 1/5] [flang][windows] Add option to link against specific MSVC
@@ -1,3 +1,21 @@
add_flang_library(Fortran_main STATIC INSTALL_WITH_TOOLCHAIN
Fortran_main.c
)
+if (DEFINED MSVC)
+add_flang_library(Fortran_main.static STATIC INSTALL_WITH_TOOLCHAIN
+Fortran_main.c
+)
bradking wrote:
The style elsewhere
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
@@ -281,3 +281,26 @@ add_flang_library(FortranRuntime
INSTALL_WITH_TOOLCHAIN
)
+
+if (DEFINED MSVC)
+ add_flang_library(FortranRuntime.static ${sources}
+LINK_LIBS
+FortranDecimal.static
+INSTALL_WITH_TOOLCHAIN)
+ set_property(TARGET FortranRuntime.static
https://github.com/rnk approved this pull request.
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
rnk wrote:
> Do we really need to have all 4 variants of the 3 fortran runtime libraries?
> That's a lot of complexity. Can we pare it down to just static/dynamic? It's
> also sometimes possible to generate code that works in both the static and
> dynamic context, depending on what is in
rnk wrote:
Do we really need to have all 4 variants of the 3 fortran runtime libraries?
That's a lot of complexity. Can we pare it down to just static/dynamic? It's
also sometimes possible to generate code that works in both the static and
dynamic context, depending on what is in those
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
https://github.com/DavidTruby updated
https://github.com/llvm/llvm-project/pull/70833
>From 9e84729cada6c032c64934ee519e605407aab049 Mon Sep 17 00:00:00 2001
From: David Truby
Date: Tue, 31 Oct 2023 15:07:13 +
Subject: [PATCH 1/3] [flang][windows] Add option to link against specific MSVC
@@ -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)
bradking wrote:
`add_flang_library` eventually ends up in
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
https://github.com/bradking edited
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -976,12 +976,46 @@ bool tools::addOpenMPRuntime(ArgStringList ,
const ToolChain ,
return true;
}
-void tools::addFortranRuntimeLibs(const ToolChain ,
+void tools::addFortranRuntimeLibs(const ToolChain , const ArgList ,
https://github.com/bradking requested changes to this pull request.
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -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)
DavidTruby wrote:
Yeah I tried this but inside add_flang_library
https://github.com/DavidTruby edited
https://github.com/llvm/llvm-project/pull/70833
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
@@ -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)
mstorsjo wrote:
Instead of redefining
26 matches
Mail list logo
