Module: wine Branch: master Commit: 76496e90fce7120c361215b42b65d606339681a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/76496e90fce7120c361215b42b65d60...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 19 17:46:13 2023 +0200
msvcrt: Export more exception handling functions on ARM platforms.
---
dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4c5648e1953..37aee60487d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -541,7 +541,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -1042,7 +1042,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1286,7 +1286,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 584663fdfc4..d1fc7c2de55 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -872,7 +872,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ cdecl __CxxDetectRethrow(ptr) @ cdecl __CxxExceptionFilter(ptr ptr long ptr) @@ -1399,7 +1399,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() __libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() __libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1643,7 +1643,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fcdfb49ee0f..9576cd52edb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -857,7 +857,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ cdecl __CxxDetectRethrow(ptr) @ cdecl __CxxExceptionFilter(ptr ptr long ptr) @@ -1410,7 +1410,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() __libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() __libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1655,7 +1655,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d5aa4020471..591a25f3cce 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -852,7 +852,7 @@ @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) msvcr120.__CppXcptFilter @ cdecl __CxxDetectRethrow(ptr) msvcr120.__CxxDetectRethrow @ cdecl __CxxExceptionFilter(ptr ptr long ptr) msvcr120.__CxxExceptionFilter @@ -1274,7 +1274,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sin_precise() msvcr120._libm_sse2_sin_precise @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() msvcr120._libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() msvcr120._libm_sse2_tan_precise -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcr120._local_unwind +@ cdecl -arch=win64 _local_unwind(ptr ptr) msvcr120._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) msvcr120._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) msvcr120._local_unwind4 @ cdecl _localtime32(ptr) msvcr120._localtime32 @@ -1377,7 +1377,7 @@ @ cdecl _set_purecall_handler(ptr) msvcr120._set_purecall_handler @ cdecl -norelay _setjmp(ptr) msvcr120._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcr120._setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) msvcr120._setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) msvcr120._setjmpex @ cdecl _setmaxstdio(long) msvcr120._setmaxstdio @ cdecl _setmbcp(long) msvcr120._setmbcp @ cdecl _setmode(long long) msvcr120._setmode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ae134b8141c..6c3c87ada0f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -175,7 +175,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -714,7 +714,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -966,7 +966,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 213d7fd2f9f..efaef544b7d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -166,7 +166,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -692,7 +692,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 69d97016282..8515f13263f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -660,7 +660,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 10dbe5f5e65..d61b70ede0a 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -381,7 +381,7 @@ @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl _lock(long) @ cdecl _locking(long long long)
-
Alexandre Julliard