diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-10-04 18:24:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-01-07 23:04:40 +0000 |
| commit | 27485d5542b4af45e13a1069a76a6a68eee99440 (patch) | |
| tree | 5856f0ff3df84b9060c537b58475bd3c487e1049 /contrib/llvm-project/clang | |
| parent | 80a1bcb529d0c08c834f05de8ad6758ba093b591 (diff) | |
Merge llvm-project release/17.x llvmorg-17.0.2-0-gb2417f51dbbd
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-17.0.2-0-gb2417f51dbbd.
PR: 273753
MFC after: 1 month
(cherry picked from commit 3bd749dbd90cc3b95719b65393df5ca8a0fe919d)
Diffstat (limited to 'contrib/llvm-project/clang')
| -rw-r--r-- | contrib/llvm-project/clang/lib/Driver/ToolChains/MinGW.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/MinGW.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/MinGW.cpp index b47041dcca70..eaec1d22e6e5 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/MinGW.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/MinGW.cpp @@ -699,8 +699,11 @@ void toolchains::MinGW::addClangTargetOptions( } } - if (Arg *A = DriverArgs.getLastArgNoClaim(options::OPT_mthreads)) - A->ignoreTargetSpecific(); + for (auto Opt : {options::OPT_mthreads, options::OPT_mwindows, + options::OPT_mconsole, options::OPT_mdll}) { + if (Arg *A = DriverArgs.getLastArgNoClaim(Opt)) + A->ignoreTargetSpecific(); + } } void toolchains::MinGW::AddClangCXXStdlibIncludeArgs( |