All 3 vcruntime140 def files (vcruntime140.def.in, vcruntime140d.def.in and
vcruntime140_app.def.in) contains exactly same symbols. Deduplicate symbols
into new common file vcruntime140-common.def.in and include it in all 3 def
files.
---
 ...e140.def.in => vcruntime140-common.def.in} |  5 -
 mingw-w64-crt/lib-common/vcruntime140.def.in  | 91 +------------------
 .../lib-common/vcruntime140_app.def.in        | 91 +------------------
 mingw-w64-crt/lib-common/vcruntime140d.def.in | 91 +------------------
 4 files changed, 3 insertions(+), 275 deletions(-)
 copy mingw-w64-crt/lib-common/{vcruntime140.def.in => 
vcruntime140-common.def.in} (96%)

diff --git a/mingw-w64-crt/lib-common/vcruntime140.def.in 
b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
similarity index 96%
copy from mingw-w64-crt/lib-common/vcruntime140.def.in
copy to mingw-w64-crt/lib-common/vcruntime140-common.def.in
index 4d507d03c4b0..6dc643f70635 100644
--- a/mingw-w64-crt/lib-common/vcruntime140.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140-common.def.in
@@ -1,8 +1,3 @@
-LIBRARY "VCRUNTIME140.dll"
-EXPORTS
-
-#include "func.def.in"
-
 _CreateFrameInfo
 F_I386(_CxxThrowException@8)
 F_NON_I386(_CxxThrowException)
diff --git a/mingw-w64-crt/lib-common/vcruntime140.def.in 
b/mingw-w64-crt/lib-common/vcruntime140.def.in
index 4d507d03c4b0..b3b548e29cbf 100644
--- a/mingw-w64-crt/lib-common/vcruntime140.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140.def.in
@@ -2,93 +2,4 @@ LIBRARY "VCRUNTIME140.dll"
 EXPORTS
 
 #include "func.def.in"
-
-_CreateFrameInfo
-F_I386(_CxxThrowException@8)
-F_NON_I386(_CxxThrowException)
-F_I386(_EH_prolog)
-_FindAndUnlinkFrame
-_IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
-F_I386(_NLG_Return2)
-_SetWinRTOutOfMemoryExceptionCallback
-__AdjustPointer
-__BuildCatchObject
-__BuildCatchObjectHelper
-F_NON_I386(__C_specific_handler)
-F_NON_I386(__C_specific_handler_noexcept)
-__CxxDetectRethrow
-__CxxExceptionFilter
-__CxxFrameHandler
-__CxxFrameHandler2
-__CxxFrameHandler3
-F_I386(__CxxLongjmpUnwind@4)
-__CxxQueryExceptionSize
-__CxxRegisterExceptionObject
-__CxxUnregisterExceptionObject
-__DestructExceptionObject
-__FrameUnwindFilter
-__GetPlatformExceptionInfo
-F_NON_I386(__NLG_Dispatch2)
-F_NON_I386(__NLG_Return2)
-__RTCastToVoid
-__RTDynamicCast
-__RTtypeid
-__TypeMatch
-__current_exception
-__current_exception_context
-F_NON_ARM64(__intrinsic_setjmp)
-F_NON_I386(__intrinsic_setjmpex)
-F_ARM32(__jump_unwind)
-__processing_throw
-__report_gsfailure
-__std_exception_copy
-__std_exception_destroy
-__std_terminate
-__std_type_info_compare
-__std_type_info_destroy_list
-__std_type_info_hash
-__std_type_info_name
-__telemetry_main_invoke_trigger
-__telemetry_main_return_trigger
-__unDName
-__unDNameEx
-__uncaught_exception
-__uncaught_exceptions
-__vcrt_GetModuleFileNameW
-__vcrt_GetModuleHandleW
-__vcrt_InitializeCriticalSectionEx
-__vcrt_LoadLibraryExW
-F_I386(_chkesp)
-F_I386(_except_handler2)
-F_I386(_except_handler3)
-F_I386(_except_handler4_common)
-_get_purecall_handler
-_get_unexpected
-F_I386(_global_unwind2)
-_is_exception_typeof
-F64(_local_unwind)
-F_I386(_local_unwind2)
-F_I386(_local_unwind4)
-F_I386(_longjmpex)
-_purecall
-F_I386(_seh_longjmp_unwind4@4)
-F_I386(_seh_longjmp_unwind@4)
-_set_purecall_handler
-_set_se_translator
-F_I386(_setjmp3)
-longjmp
-memchr
-memcmp
-memcpy
-memmove
-memset
-set_unexpected
-strchr
-strrchr
-strstr
-unexpected
-wcschr
-wcsrchr
-wcsstr
+#include "vcruntime140-common.def.in"
diff --git a/mingw-w64-crt/lib-common/vcruntime140_app.def.in 
b/mingw-w64-crt/lib-common/vcruntime140_app.def.in
index 1f13abb0f71f..3048e9770d36 100644
--- a/mingw-w64-crt/lib-common/vcruntime140_app.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140_app.def.in
@@ -2,93 +2,4 @@ LIBRARY "VCRUNTIME140_APP.dll"
 EXPORTS
 
 #include "func.def.in"
-
-_CreateFrameInfo
-F_I386(_CxxThrowException@8)
-F_NON_I386(_CxxThrowException)
-F_I386(_EH_prolog)
-_FindAndUnlinkFrame
-_IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
-F_I386(_NLG_Return2)
-_SetWinRTOutOfMemoryExceptionCallback
-__AdjustPointer
-__BuildCatchObject
-__BuildCatchObjectHelper
-F_NON_I386(__C_specific_handler)
-F_NON_I386(__C_specific_handler_noexcept)
-__CxxDetectRethrow
-__CxxExceptionFilter
-__CxxFrameHandler
-__CxxFrameHandler2
-__CxxFrameHandler3
-F_I386(__CxxLongjmpUnwind@4)
-__CxxQueryExceptionSize
-__CxxRegisterExceptionObject
-__CxxUnregisterExceptionObject
-__DestructExceptionObject
-__FrameUnwindFilter
-__GetPlatformExceptionInfo
-F_NON_I386(__NLG_Dispatch2)
-F_NON_I386(__NLG_Return2)
-__RTCastToVoid
-__RTDynamicCast
-__RTtypeid
-__TypeMatch
-__current_exception
-__current_exception_context
-F_NON_ARM64(__intrinsic_setjmp)
-F_NON_I386(__intrinsic_setjmpex)
-F_ARM32(__jump_unwind)
-__processing_throw
-__report_gsfailure
-__std_exception_copy
-__std_exception_destroy
-__std_terminate
-__std_type_info_compare
-__std_type_info_destroy_list
-__std_type_info_hash
-__std_type_info_name
-__telemetry_main_invoke_trigger
-__telemetry_main_return_trigger
-__unDName
-__unDNameEx
-__uncaught_exception
-__uncaught_exceptions
-__vcrt_GetModuleFileNameW
-__vcrt_GetModuleHandleW
-__vcrt_InitializeCriticalSectionEx
-__vcrt_LoadLibraryExW
-F_I386(_chkesp)
-F_I386(_except_handler2)
-F_I386(_except_handler3)
-F_I386(_except_handler4_common)
-_get_purecall_handler
-_get_unexpected
-F_I386(_global_unwind2)
-_is_exception_typeof
-F64(_local_unwind)
-F_I386(_local_unwind2)
-F_I386(_local_unwind4)
-F_I386(_longjmpex)
-_purecall
-F_I386(_seh_longjmp_unwind4@4)
-F_I386(_seh_longjmp_unwind@4)
-_set_purecall_handler
-_set_se_translator
-F_I386(_setjmp3)
-longjmp
-memchr
-memcmp
-memcpy
-memmove
-memset
-set_unexpected
-strchr
-strrchr
-strstr
-unexpected
-wcschr
-wcsrchr
-wcsstr
+#include "vcruntime140-common.def.in"
diff --git a/mingw-w64-crt/lib-common/vcruntime140d.def.in 
b/mingw-w64-crt/lib-common/vcruntime140d.def.in
index c0ac6c9d6776..50819fab5534 100644
--- a/mingw-w64-crt/lib-common/vcruntime140d.def.in
+++ b/mingw-w64-crt/lib-common/vcruntime140d.def.in
@@ -2,93 +2,4 @@ LIBRARY "VCRUNTIME140D.dll"
 EXPORTS
 
 #include "func.def.in"
-
-_CreateFrameInfo
-F_I386(_CxxThrowException@8)
-F_NON_I386(_CxxThrowException)
-F_I386(_EH_prolog)
-_FindAndUnlinkFrame
-_IsExceptionObjectToBeDestroyed
-F_I386(_NLG_Dispatch2@4)
-F_I386(_NLG_Return@12)
-F_I386(_NLG_Return2)
-_SetWinRTOutOfMemoryExceptionCallback
-__AdjustPointer
-__BuildCatchObject
-__BuildCatchObjectHelper
-F_NON_I386(__C_specific_handler)
-F_NON_I386(__C_specific_handler_noexcept)
-__CxxDetectRethrow
-__CxxExceptionFilter
-__CxxFrameHandler
-__CxxFrameHandler2
-__CxxFrameHandler3
-F_I386(__CxxLongjmpUnwind@4)
-__CxxQueryExceptionSize
-__CxxRegisterExceptionObject
-__CxxUnregisterExceptionObject
-__DestructExceptionObject
-__FrameUnwindFilter
-__GetPlatformExceptionInfo
-F_NON_I386(__NLG_Dispatch2)
-F_NON_I386(__NLG_Return2)
-__RTCastToVoid
-__RTDynamicCast
-__RTtypeid
-__TypeMatch
-__current_exception
-__current_exception_context
-F_NON_ARM64(__intrinsic_setjmp)
-F_NON_I386(__intrinsic_setjmpex)
-F_ARM32(__jump_unwind)
-__processing_throw
-__report_gsfailure
-__std_exception_copy
-__std_exception_destroy
-__std_terminate
-__std_type_info_compare
-__std_type_info_destroy_list
-__std_type_info_hash
-__std_type_info_name
-__telemetry_main_invoke_trigger
-__telemetry_main_return_trigger
-__unDName
-__unDNameEx
-__uncaught_exception
-__uncaught_exceptions
-__vcrt_GetModuleFileNameW
-__vcrt_GetModuleHandleW
-__vcrt_InitializeCriticalSectionEx
-__vcrt_LoadLibraryExW
-F_I386(_chkesp)
-F_I386(_except_handler2)
-F_I386(_except_handler3)
-F_I386(_except_handler4_common)
-_get_purecall_handler
-_get_unexpected
-F_I386(_global_unwind2)
-_is_exception_typeof
-F64(_local_unwind)
-F_I386(_local_unwind2)
-F_I386(_local_unwind4)
-F_I386(_longjmpex)
-_purecall
-F_I386(_seh_longjmp_unwind4@4)
-F_I386(_seh_longjmp_unwind@4)
-_set_purecall_handler
-_set_se_translator
-F_I386(_setjmp3)
-longjmp
-memchr
-memcmp
-memcpy
-memmove
-memset
-set_unexpected
-strchr
-strrchr
-strstr
-unexpected
-wcschr
-wcsrchr
-wcsstr
+#include "vcruntime140-common.def.in"
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to