[MinGW] Don't link -lmsvcrt if a different msvcrt version is to be linked

[rnk]

What do you think of letting people spell this as -lmsvcrt120? We could forward those options and suppress our implicit addition of -lmsvcrt if we see -lmsvcr* anywhere.

lib/Driver/ToolChains/MinGW.cpp

161

I guess ld.bfd for COFF does some wacky name mangling. =/

[mstorsjo]

In D37530#862644, @rnk wrote:

What do you think of letting people spell this as -lmsvcrt120? We could forward those options and suppress our implicit addition of -lmsvcrt if we see -lmsvcr* anywhere.

That might work and would probably be sensible. Does the argument order matter, if the -lmsvcr120 is listed at the end or at the same spot as -lmsvcrt were to be included?

Another complicating matter is that the pattern shouldn't just be -lmsvcr*, it should also match -lucrtbase since that's the name of the new Win10 CRT DLL (that I've just posted patches for mingw to support). And not sure if there later would be another import library for the case where one would link to api-ms-win-crt*-dll instead (which is mostly similar ucrtbase.dll but split up over a number of smaller files).

lib/Driver/ToolChains/MinGW.cpp

161

Oh, sorry - this was unrelated to this patch and slip through accidentally. (It turned out to be an issue with the lld mingw frontend, not with clang itself.)

[mstorsjo]

Attempted implementing Reid's suggestion.

On the mingw-w64 mailing list (https://sourceforge.net/p/mingw-w64/mailman/message/36030072/), there were points made that it would be better with some mechanism that controls both linking the right msvcrt version and setting __MSVCRT_VERSION__ in sync.

And someone pointed out some widely used (but not upstreamed) patches for GCC that adds an option -mcrtdll which does pretty much exactly what my -mmsvcrt option did in the previous iteration (https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-gcc-git/0006-gcc-7-branch-Windows-New-feature-to-allow-overriding.patch), which in another non-upstreamed patch also is used to set __MSVCRT_VERSION__ (https://raw.githubusercontent.com/nak5124/build_env/master/gcc_build/patches/gcc/0020-MinGW-w64-Define-__MSVCRT_VERSION__.patch).

[rnk]

lgtm

[rnk]

In D37530#865333, @mstorsjo wrote:

Attempted implementing Reid's suggestion.

On the mingw-w64 mailing list (https://sourceforge.net/p/mingw-w64/mailman/message/36030072/), there were points made that it would be better with some mechanism that controls both linking the right msvcrt version and setting __MSVCRT_VERSION__ in sync.

And someone pointed out some widely used (but not upstreamed) patches for GCC that adds an option -mcrtdll which does pretty much exactly what my -mmsvcrt option did in the previous iteration (https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-gcc-git/0006-gcc-7-branch-Windows-New-feature-to-allow-overriding.patch), which in another non-upstreamed patch also is used to set __MSVCRT_VERSION__ (https://raw.githubusercontent.com/nak5124/build_env/master/gcc_build/patches/gcc/0020-MinGW-w64-Define-__MSVCRT_VERSION__.patch).

Hm, these are interesting. Getting a separate concept of CRT version would be nice. We've talked about getting something like that for glibc as well, since there were some new math builtins we'd like to use there.

[martell]

LGTM

include/clang/Driver/Options.td

 def mdefault_build_attributes : Joined<["-"], "mdefault-build-attributes">, Group<m_Group>;
 def mno_default_build_attributes : Joined<["-"], "mno-default-build-attributes">, Group<m_Group>;
 def mconstant_cfstrings : Flag<["-"], "mconstant-cfstrings">, Group<clang_ignored_m_Group>;
 def mconsole : Joined<["-"], "mconsole">, Group<m_Group>, Flags<[DriverOption]>;
 def mwindows : Joined<["-"], "mwindows">, Group<m_Group>, Flags<[DriverOption]>;
 def mdll : Joined<["-"], "mdll">, Group<m_Group>, Flags<[DriverOption]>;
 def municode : Joined<["-"], "municode">, Group<m_Group>, Flags<[DriverOption]>;
 def mthreads : Joined<["-"], "mthreads">, Group<m_Group>, Flags<[DriverOption]>;
+def mmsvcrt_EQ : Joined<["-"], "mmsvcrt=">, Group<m_Group>, Flags<[DriverOption]>;
 def mcpu_EQ : Joined<["-"], "mcpu=">, Group<m_Group>;
 def mmcu_EQ : Joined<["-"], "mmcu=">, Group<m_Group>;
 def mdynamic_no_pic : Joined<["-"], "mdynamic-no-pic">, Group<m_Group>;
 def mfix_and_continue : Flag<["-"], "mfix-and-continue">, Group<clang_ignored_m_Group>;
 def mieee_fp : Flag<["-"], "mieee-fp">, Group<clang_ignored_m_Group>;
 def minline_all_stringops : Flag<["-"], "minline-all-stringops">, Group<clang_ignored_m_Group>;
 def mno_inline_all_stringops : Flag<["-"], "mno-inline-all-stringops">, Group<clang_ignored_m_Group>;
 def malign_double : Flag<["-"], "malign-double">, Group<m_Group>, Flags<[CC1Option]>,

lib/Driver/ToolChains/MinGW.cpp

if (Static || (!CXX && !Shared)) {
       CmdArgs.push_back("-lgcc");
     }
   } else {
     AddRunTimeLibs(getToolChain(), getToolChain().getDriver(), CmdArgs, Args);
   }
 
   CmdArgs.push_back("-lmoldname");
   CmdArgs.push_back("-lmingwex");
-  CmdArgs.push_back("-lmsvcrt");
+  CmdArgs.push_back(Args.MakeArgString(
+      "-l" + Args.getLastArgValue(options::OPT_mmsvcrt_EQ, "msvcrt")));
 }
 
 void tools::MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA,
                                         const InputInfo &Output,
                                         const InputInfoList &Inputs,
                                         const ArgList &Args,
                                         const char *LinkingOutput) const {
   const ToolChain &TC = getToolChain();
else {
     if (Args.hasArg(options::OPT_mdll))
       CmdArgs.push_back("--dll");
     else if (Args.hasArg(options::OPT_shared))
       CmdArgs.push_back("--shared");
     CmdArgs.push_back("-Bdynamic");
     if (Args.hasArg(options::OPT_mdll) || Args.hasArg(options::OPT_shared)) {
       CmdArgs.push_back("-e");
       if (TC.getArch() == llvm::Triple::x86)
-        CmdArgs.push_back("_DllMainCRTStartup@12");
+        CmdArgs.push_back("DllMainCRTStartup@12");
       else
         CmdArgs.push_back("DllMainCRTStartup");
       CmdArgs.push_back("--enable-auto-image-base");
     }
   }
 
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());

test/Driver/mingw-msvcrt.c

+// RUN: %clang -v -target i686-pc-windows-gnu -### %s 2>&1 | FileCheck -check-prefix=CHECK_DEFAULT %s
+// RUN: %clang -v -target i686-pc-windows-gnu -mmsvcrt=msvcr120 -### %s 2>&1 | FileCheck -check-prefix=CHECK_MSVCR120 %s
+
+// CHECK_DEFAULT: "-lmingwex" "-lmsvcrt"
+// CHECK_MSVCR120: "-lmingwex" "-lmsvcr120"