[v2] Add MinGW option -mcrtdll= for choosing C RunTime DLL library
Checks
| Context |
Check |
Description |
| linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_gcc_build--master-arm |
success
|
Testing passed
|
Commit Message
It adjust preprocess, compile and link flags, which allows to change
default -lmsvcrt library by another provided by MinGW runtime.
gcc/
* config/i386/mingw-w64.h (CPP_SPEC): Adjust for -mcrtdll=.
(REAL_LIBGCC_SPEC): New define.
* config/i386/mingw.opt: Add mcrtdll=
* config/i386/mingw32.h (CPP_SPEC): Adjust for -mcrtdll=.
(REAL_LIBGCC_SPEC): Adjust for -mcrtdll=.
(STARTFILE_SPEC): Adjust for -mcrtdll=.
* doc/invoke.texi: Add mcrtdll= documentation.
---
Changes in v2:
* Fixed doc/invoke.texi documentation
---
gcc/config/i386/mingw-w64.h | 22 +++++++++++++++++++++-
gcc/config/i386/mingw.opt | 4 ++++
gcc/config/i386/mingw32.h | 28 ++++++++++++++++++++++++----
gcc/doc/invoke.texi | 24 +++++++++++++++++++++++-
4 files changed, 72 insertions(+), 6 deletions(-)
Comments
On 6/14/23 16:09, Pali Rohár wrote:
> It adjust preprocess, compile and link flags, which allows to change
> default -lmsvcrt library by another provided by MinGW runtime.
>
> gcc/
> * config/i386/mingw-w64.h (CPP_SPEC): Adjust for -mcrtdll=.
> (REAL_LIBGCC_SPEC): New define.
> * config/i386/mingw.opt: Add mcrtdll=
> * config/i386/mingw32.h (CPP_SPEC): Adjust for -mcrtdll=.
> (REAL_LIBGCC_SPEC): Adjust for -mcrtdll=.
> (STARTFILE_SPEC): Adjust for -mcrtdll=.
> * doc/invoke.texi: Add mcrtdll= documentation.
> ---
> Changes in v2:
> * Fixed doc/invoke.texi documentation
> ---
> gcc/config/i386/mingw-w64.h | 22 +++++++++++++++++++++-
> gcc/config/i386/mingw.opt | 4 ++++
> gcc/config/i386/mingw32.h | 28 ++++++++++++++++++++++++----
> gcc/doc/invoke.texi | 24 +++++++++++++++++++++++-
> 4 files changed, 72 insertions(+), 6 deletions(-)
>
Thanks, pushed to master branch.
@@ -25,7 +25,27 @@ along with GCC; see the file COPYING3. If not see
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT} " \
"%{municode:-DUNICODE} " \
"%{" SPEC_PTHREAD1 ":-D_REENTRANT} " \
- "%{" SPEC_PTHREAD2 ":-U_REENTRANT} "
+ "%{" SPEC_PTHREAD2 ":-U_REENTRANT} " \
+ "%{mcrtdll=crtdll*:-U__MSVCRT__ -D__CRTDLL__} " \
+ "%{mcrtdll=msvcrt10*:-D__MSVCRT_VERSION__=0x100} " \
+ "%{mcrtdll=msvcrt20*:-D__MSVCRT_VERSION__=0x200} " \
+ "%{mcrtdll=msvcrt40*:-D__MSVCRT_VERSION__=0x400} " \
+ "%{mcrtdll=msvcrt-os*:-D__MSVCRT_VERSION__=0x700} " \
+ "%{mcrtdll=msvcr70*:-D__MSVCRT_VERSION__=0x700} " \
+ "%{mcrtdll=msvcr71*:-D__MSVCRT_VERSION__=0x701} " \
+ "%{mcrtdll=msvcr80*:-D__MSVCRT_VERSION__=0x800} " \
+ "%{mcrtdll=msvcr90*:-D__MSVCRT_VERSION__=0x900} " \
+ "%{mcrtdll=msvcr100*:-D__MSVCRT_VERSION__=0xA00} " \
+ "%{mcrtdll=msvcr110*:-D__MSVCRT_VERSION__=0xB00} " \
+ "%{mcrtdll=msvcr120*:-D__MSVCRT_VERSION__=0xC00} " \
+ "%{mcrtdll=ucrt*:-D_UCRT} "
+
+#undef REAL_LIBGCC_SPEC
+#define REAL_LIBGCC_SPEC \
+ "%{mthreads:-lmingwthrd} -lmingw32 \
+ " SHARED_LIBGCC_SPEC " \
+ -lmingwex %{!mcrtdll=*:-lmsvcrt} %{mcrtdll=*:-l%*} \
+ -lkernel32 " MCFGTHREAD_SPEC
#undef STARTFILE_SPEC
#define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
@@ -18,6 +18,10 @@
; along with GCC; see the file COPYING3. If not see
; <http://www.gnu.org/licenses/>.
+mcrtdll=
+Target RejectNegative Joined
+Preprocess, compile or link with specified C RunTime DLL library.
+
pthread
Driver
@@ -89,7 +89,20 @@ along with GCC; see the file COPYING3. If not see
#undef CPP_SPEC
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT} " \
"%{" SPEC_PTHREAD1 ":-D_REENTRANT} " \
- "%{" SPEC_PTHREAD2 ": } "
+ "%{" SPEC_PTHREAD2 ": } " \
+ "%{mcrtdll=crtdll*:-U__MSVCRT__ -D__CRTDLL__} " \
+ "%{mcrtdll=msvcrt10*:-D__MSVCRT_VERSION__=0x100} " \
+ "%{mcrtdll=msvcrt20*:-D__MSVCRT_VERSION__=0x200} " \
+ "%{mcrtdll=msvcrt40*:-D__MSVCRT_VERSION__=0x400} " \
+ "%{mcrtdll=msvcrt-os*:-D__MSVCRT_VERSION__=0x700} " \
+ "%{mcrtdll=msvcr70*:-D__MSVCRT_VERSION__=0x700} " \
+ "%{mcrtdll=msvcr71*:-D__MSVCRT_VERSION__=0x701} " \
+ "%{mcrtdll=msvcr80*:-D__MSVCRT_VERSION__=0x800} " \
+ "%{mcrtdll=msvcr90*:-D__MSVCRT_VERSION__=0x900} " \
+ "%{mcrtdll=msvcr100*:-D__MSVCRT_VERSION__=0xA00} " \
+ "%{mcrtdll=msvcr110*:-D__MSVCRT_VERSION__=0xB00} " \
+ "%{mcrtdll=msvcr120*:-D__MSVCRT_VERSION__=0xC00} " \
+ "%{mcrtdll=ucrt*:-D_UCRT} "
/* For Windows applications, include more libraries, but always include
kernel32. */
@@ -184,11 +197,18 @@ along with GCC; see the file COPYING3. If not see
#define REAL_LIBGCC_SPEC \
"%{mthreads:-lmingwthrd} -lmingw32 \
" SHARED_LIBGCC_SPEC " \
- -lmoldname -lmingwex -lmsvcrt -lkernel32 " MCFGTHREAD_SPEC
+ %{mcrtdll=crtdll*:-lcoldname} %{!mcrtdll=crtdll*:-lmoldname} \
+ -lmingwex %{!mcrtdll=*:-lmsvcrt} %{mcrtdll=*:-l%*} \
+ -lkernel32 " MCFGTHREAD_SPEC
#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
- %{!shared:%{!mdll:crt2%O%s}} %{pg:gcrt2%O%s} \
+#define STARTFILE_SPEC " \
+ %{shared|mdll:%{mcrtdll=crtdll*:dllcrt1%O%s}} \
+ %{shared|mdll:%{!mcrtdll=crtdll*:dllcrt2%O%s}} \
+ %{!shared:%{!mdll:%{mcrtdll=crtdll*:crt1%O%s}}} \
+ %{!shared:%{!mdll:%{!mcrtdll=crtdll*:crt2%O%s}}} \
+ %{pg:%{mcrtdll=crtdll*:gcrt1%O%s}} \
+ %{pg:%{!mcrtdll=crtdll*:gcrt2%O%s}} \
crtbegin.o%s \
%{fvtable-verify=none:%s; \
fvtable-verify=preinit:vtv_start.o%s; \
@@ -1458,7 +1458,7 @@ See RS/6000 and PowerPC Options.
-munroll-only-small-loops -mlam=@var{choice}}
@emph{x86 Windows Options}
-@gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll
+@gccoptlist{-mconsole -mcrtdll=@var{library} -mcygwin -mno-cygwin -mdll
-mnop-fun-dllimport -mthread
-municode -mwin32 -mwindows -fno-set-stack-executable}
@@ -34202,6 +34202,28 @@ required for console applications.
This option is available for Cygwin and MinGW targets and is
enabled by default on those targets.
+@opindex mcrtdll
+@item -mcrtdll=@var{library}
+Preprocess, compile or link with specified C RunTime DLL @var{library}.
+This option adjust predefined macros @code{__CRTDLL__}, @code{__MSVCRT__}
+and @code{__MSVCRT_VERSION__} for specified CRT @var{library}, choose
+start file for CRT @var{library} and link with CRT @var{library}.
+Recognized CRT library names for proprocessor are:
+@code{crtdll}, @code{msvcrt10}, @code{msvcrt20}, @code{msvcrt40},
+@code{msvcrt-os}, @code{msvcr70}, @code{msvcr80}, @code{msvcr90},
+@code{msvcr100}, @code{msvcr110}, @code{msvcr120} and @code{ucrt}.
+If this options is not specified then the default MinGW import library
+@code{msvcrt} is used for linking and no other adjustment for
+preprocessor is done. MinGW import library @code{msvcrt} is just a
+symlink to (or a copy of) another MinGW CRT import library
+chosen during MinGW compilation. MinGW import library @code{msvcrt-os}
+is for Windows system CRT DLL library @code{msvcrt.dll} and
+in most cases is the default MinGW import library.
+Generally speaking, changing the CRT DLL requires recompiling
+the entire MinGW CRT. This option is for experimental and testing
+purposes only.
+This option is available for MinGW targets.
+
@opindex mdll
@item -mdll
This option is available for Cygwin and MinGW targets. It