Skip to content

Commit 079b6d0

Browse files
committed
[clang] [MinGW] Recognize -lcrtdll as a library replacing -lmsvcrt
Differential Revision: https://reviews.llvm.org/D119234
1 parent 9545976 commit 079b6d0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

clang/lib/Driver/ToolChains/MinGW.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ void tools::MinGW::Linker::AddLibGCC(const ArgList &Args,
8686
CmdArgs.push_back("-lmoldname");
8787
CmdArgs.push_back("-lmingwex");
8888
for (auto Lib : Args.getAllArgValues(options::OPT_l))
89-
if (StringRef(Lib).startswith("msvcr") || StringRef(Lib).startswith("ucrt"))
89+
if (StringRef(Lib).startswith("msvcr") ||
90+
StringRef(Lib).startswith("ucrt") ||
91+
StringRef(Lib).startswith("crtdll"))
9092
return;
9193
CmdArgs.push_back("-lmsvcrt");
9294
}

clang/test/Driver/mingw-msvcrt.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// RUN: %clang -v -target i686-pc-windows-gnu -lmsvcr120 -### %s 2>&1 | FileCheck -check-prefix=CHECK_MSVCR120 %s
33
// RUN: %clang -v -target i686-pc-windows-gnu -lucrtbase -### %s 2>&1 | FileCheck -check-prefix=CHECK_UCRTBASE %s
44
// RUN: %clang -v -target i686-pc-windows-gnu -lucrt -### %s 2>&1 | FileCheck -check-prefix=CHECK_UCRT %s
5+
// RUN: %clang -v -target i686-pc-windows-gnu -lcrtdll -### %s 2>&1 | FileCheck -check-prefix=CHECK_CRTDLL %s
56

67
// CHECK_DEFAULT: "-lmingwex" "-lmsvcrt" "-ladvapi32"
78
// CHECK_DEFAULT-SAME: "-lmsvcrt" "-lkernel32" "{{.*}}crtend.o"
@@ -11,3 +12,5 @@
1112
// CHECK_UCRTBASE-SAME: "-lmingwex" "-ladvapi32"
1213
// CHECK_UCRT: "-lucrt"
1314
// CHECK_UCRT-SAME: "-lmingwex" "-ladvapi32"
15+
// CHECK_CRTDLL: "-lcrtdll"
16+
// CHECK_CRTDLL-SAME: "-lmingwex" "-ladvapi32"

0 commit comments

Comments
 (0)