crt: Make i386 _NLG_Dispatch2 and _NLG_Return symbols compatible with msvc
These two symbols _NLG_Dispatch2 and _NLG_Return are available only in
32-bit x86 crt dll libraries, starting in msvcr80.dll.
msvc import library msvcrt.lib from the beginning since Visual C++ 2005
contains these symbols without stdcall decoration.
So for compatibility with msvc, do not decorate these symbols with @SIZE
suffix (the suffix used for stdcall) in all def files.
Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in b/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
index ce9ff54..8aaebcc 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-private-l1-1-0.def.in
@@ -12,8 +12,8 @@
F_X64(_GetImageBase)
F_X64(_GetThrowImageBase)
_IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
F_I386(_NLG_Return2)
F_X64(_SetImageBase)
F_X64(_SetThrowImageBase)
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 55d9127..083b1f2 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -1040,8 +1040,8 @@
__DestructExceptionObject
__FrameUnwindFilter
__GetPlatformExceptionInfo
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
F_NON_I386(__NLG_Dispatch2)
F_I386(_NLG_Return2)
F_NON_I386(__NLG_Return2)
diff --git a/mingw-w64-crt/lib-common/ucrtbase-common.def.in b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
index e121ced..dd4f081 100644
--- a/mingw-w64-crt/lib-common/ucrtbase-common.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
@@ -75,8 +75,8 @@
_LCbuild
_LCmulcc
_LCmulcr
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
F_I386(_NLG_Return2)
F_X64(_SetImageBase)
F_X64(_SetThrowImageBase)
diff --git a/mingw-w64-crt/lib-common/vcruntime140-common.def.in b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
index 6dc643f..4a94a78 100644
--- a/mingw-w64-crt/lib-common/vcruntime140-common.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
@@ -4,8 +4,8 @@
F_I386(_EH_prolog)
_FindAndUnlinkFrame
_IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
+F_I386(_NLG_Dispatch2) ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+F_I386(_NLG_Return) ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
F_I386(_NLG_Return2)
_SetWinRTOutOfMemoryExceptionCallback
__AdjustPointer
diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in
index 038b6b7..4016060 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -574,8 +574,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr100d.def.in b/mingw-w64-crt/lib32/msvcr100d.def.in
index df0e0f6..40d9e34 100644
--- a/mingw-w64-crt/lib32/msvcr100d.def.in
+++ b/mingw-w64-crt/lib32/msvcr100d.def.in
@@ -608,8 +608,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_VCrtDbgReportA
diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in
index ce8c936..eb8c50d 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in
@@ -695,8 +695,8 @@
_HUGE DATA
_IsExceptionObjectToBeDestroyed
_Lock_shared_ptr_spin_lock
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_Unlock_shared_ptr_spin_lock
diff --git a/mingw-w64-crt/lib32/msvcr110d.def.in b/mingw-w64-crt/lib32/msvcr110d.def.in
index 89d6ef5..cae1990 100644
--- a/mingw-w64-crt/lib32/msvcr110d.def.in
+++ b/mingw-w64-crt/lib32/msvcr110d.def.in
@@ -729,8 +729,8 @@
_HUGE DATA
_IsExceptionObjectToBeDestroyed
_Lock_shared_ptr_spin_lock
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_Unlock_shared_ptr_spin_lock
diff --git a/mingw-w64-crt/lib32/msvcr120.def.in b/mingw-w64-crt/lib32/msvcr120.def.in
index 49723bb..385567b 100644
--- a/mingw-w64-crt/lib32/msvcr120.def.in
+++ b/mingw-w64-crt/lib32/msvcr120.def.in
@@ -684,8 +684,8 @@
_HUGE DATA
_IsExceptionObjectToBeDestroyed
_LCbuild
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_SetWinRTOutOfMemoryExceptionCallback
_Strftime
diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in b/mingw-w64-crt/lib32/msvcr120d.def.in
index ed503ba..eb02578 100644
--- a/mingw-w64-crt/lib32/msvcr120d.def.in
+++ b/mingw-w64-crt/lib32/msvcr120d.def.in
@@ -718,8 +718,8 @@
_HUGE DATA
_IsExceptionObjectToBeDestroyed
_LCbuild
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_SetWinRTOutOfMemoryExceptionCallback
_Strftime
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in
index 0f3b0f5..f3f78df 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -174,8 +174,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr80d.def.in b/mingw-w64-crt/lib32/msvcr80d.def.in
index 153dfc4..0df1c12 100644
--- a/mingw-w64-crt/lib32/msvcr80d.def.in
+++ b/mingw-w64-crt/lib32/msvcr80d.def.in
@@ -221,8 +221,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_VCrtDbgReportA
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in
index 6df2f0f..bfb97ff 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -176,8 +176,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_XcptFilter
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in
index a311af1..69f0d8e 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -214,8 +214,8 @@
_Gettnames
_HUGE DATA
_IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2@4
-_NLG_Return@12
+_NLG_Dispatch2 ; msvc symbol is without decoration but callee pop stack (like stdcall @4)
+_NLG_Return ; msvc symbol is without decoration but callee pop stack (like stdcall @12)
_NLG_Return2
_Strftime
_VCrtDbgReportA
