moldname content is already included in all other msvcrt def files. This
allows applications to use moldname aliases defined in msvcrt-common.def.in
also when linking with other crt dll libraries.
---
mingw-w64-crt/Makefile.am | 3 ++-
mingw-w64-crt/lib32/{crtdll.def => crtdll.def.in} | 3 +++
mingw-w64-crt/lib32/{msvcr70.def => msvcr70.def.in} | 3 +++
mingw-w64-crt/lib32/{msvcr71.def => msvcr71.def.in} | 3 +++
mingw-w64-crt/lib32/{msvcrt10.def => msvcrt10.def.in} | 3 +++
mingw-w64-crt/lib32/{msvcrt20.def => msvcrt20.def.in} | 3 +++
mingw-w64-crt/lib32/{msvcrt40.def => msvcrt40.def.in} | 3 +++
7 files changed, 20 insertions(+), 1 deletion(-)
rename mingw-w64-crt/lib32/{crtdll.def => crtdll.def.in} (99%)
rename mingw-w64-crt/lib32/{msvcr70.def => msvcr70.def.in} (99%)
rename mingw-w64-crt/lib32/{msvcr71.def => msvcr71.def.in} (99%)
rename mingw-w64-crt/lib32/{msvcrt10.def => msvcrt10.def.in} (99%)
rename mingw-w64-crt/lib32/{msvcrt20.def => msvcrt20.def.in} (99%)
rename mingw-w64-crt/lib32/{msvcrt40.def => msvcrt40.def.in} (99%)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 5aac06e5e544..6e670af0b2e5 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -943,7 +943,8 @@ lib32_LIBRARIES += lib32/libmingwthrd.a
lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
lib32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
-processed_defs += lib32/msvcrt.def lib32/msvcr80.def lib32/msvcr90.def
lib32/msvcr90d.def lib32/msvcr100.def lib32/msvcr110.def lib32/msvcr120.def
lib32/msvcr120d.def \
+processed_defs += lib32/crtdll.def lib32/msvcrt10.def lib32/msvcrt20.def
lib32/msvcrt40.def lib32/msvcrt.def lib32/msvcr70.def lib32/msvcr71.def \
+ lib32/msvcr80.def lib32/msvcr90.def
lib32/msvcr90d.def lib32/msvcr100.def lib32/msvcr110.def lib32/msvcr120.def
lib32/msvcr120d.def \
lib32/msvcr120_app.def lib32/msvcp120_app.def
lib32/ucrtbase.def \
lib32/api-ms-win-crt-math-l1-1-0.def
lib32/api-ms-win-crt-private-l1-1-0.def lib32/api-ms-win-crt-runtime-l1-1-0.def
\
lib32/vcruntime140_app.def
diff --git a/mingw-w64-crt/lib32/crtdll.def b/mingw-w64-crt/lib32/crtdll.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/crtdll.def
rename to mingw-w64-crt/lib32/crtdll.def.in
index 48640253c13c..d8b5bd82114e 100644
--- a/mingw-w64-crt/lib32/crtdll.def
+++ b/mingw-w64-crt/lib32/crtdll.def.in
@@ -174,6 +174,9 @@
;
LIBRARY "crtdll.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
_CIacos
_CIasin
_CIatan
diff --git a/mingw-w64-crt/lib32/msvcr70.def
b/mingw-w64-crt/lib32/msvcr70.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/msvcr70.def
rename to mingw-w64-crt/lib32/msvcr70.def.in
index 43c469fc123e..721dd7959868 100644
--- a/mingw-w64-crt/lib32/msvcr70.def
+++ b/mingw-w64-crt/lib32/msvcr70.def.in
@@ -5,6 +5,9 @@
;
LIBRARY "MSVCR70.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
; public: __thiscall __non_rtti_object::__non_rtti_object(class
__non_rtti_object const &)
??0__non_rtti_object@@QAE@ABV0@@Z ; has WINAPI (@4)
; public: __thiscall __non_rtti_object::__non_rtti_object(char const *)
diff --git a/mingw-w64-crt/lib32/msvcr71.def
b/mingw-w64-crt/lib32/msvcr71.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/msvcr71.def
rename to mingw-w64-crt/lib32/msvcr71.def.in
index 5ec0f2ab4ac1..7e120a22fc10 100644
--- a/mingw-w64-crt/lib32/msvcr71.def
+++ b/mingw-w64-crt/lib32/msvcr71.def.in
@@ -5,6 +5,9 @@
;
LIBRARY "MSVCR71.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
; public: __thiscall __non_rtti_object::__non_rtti_object(class
__non_rtti_object const &)
??0__non_rtti_object@@QAE@ABV0@@Z ; has WINAPI (@4)
; public: __thiscall __non_rtti_object::__non_rtti_object(char const *)
diff --git a/mingw-w64-crt/lib32/msvcrt10.def
b/mingw-w64-crt/lib32/msvcrt10.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/msvcrt10.def
rename to mingw-w64-crt/lib32/msvcrt10.def.in
index 5a3edf6e6b7b..58c4a3673745 100644
--- a/mingw-w64-crt/lib32/msvcrt10.def
+++ b/mingw-w64-crt/lib32/msvcrt10.def.in
@@ -5,6 +5,9 @@
;
LIBRARY "MSVCRT10.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
; public: __thiscall Iostream_init::Iostream_init(class ios &,int)
??0Iostream_init@@QAE@AAVios@@H@Z ; has WINAPI (@8)
; public: __thiscall Iostream_init::Iostream_init(void)
diff --git a/mingw-w64-crt/lib32/msvcrt20.def
b/mingw-w64-crt/lib32/msvcrt20.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/msvcrt20.def
rename to mingw-w64-crt/lib32/msvcrt20.def.in
index 48d0487b9e7c..51999bd09965 100644
--- a/mingw-w64-crt/lib32/msvcrt20.def
+++ b/mingw-w64-crt/lib32/msvcrt20.def.in
@@ -5,6 +5,9 @@
;
LIBRARY "MSVCRT20.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
; public: __thiscall Iostream_init::Iostream_init(class ios &,int)
??0Iostream_init@@QAE@AAVios@@H@Z ; has WINAPI (@8)
; public: __thiscall Iostream_init::Iostream_init(void)
diff --git a/mingw-w64-crt/lib32/msvcrt40.def
b/mingw-w64-crt/lib32/msvcrt40.def.in
similarity index 99%
rename from mingw-w64-crt/lib32/msvcrt40.def
rename to mingw-w64-crt/lib32/msvcrt40.def.in
index 648f792dfd88..0d1104a9abb0 100644
--- a/mingw-w64-crt/lib32/msvcrt40.def
+++ b/mingw-w64-crt/lib32/msvcrt40.def.in
@@ -5,6 +5,9 @@
;
LIBRARY "MSVCRT40.dll"
EXPORTS
+
+#include "msvcrt-common.def.in"
+
; public: __thiscall Iostream_init::Iostream_init(class ios &,int)
??0Iostream_init@@QAE@AAVios@@H@Z ; has WINAPI (@8)
; public: __thiscall Iostream_init::Iostream_init(void)
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
