Martin Storsjo : ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64.

Alexandre Julliard julliard at winehq.org
Tue Jun 26 04:44:26 CDT 2018


Module: wine
Branch: stable
Commit: a37b7f4e378c40aeb66bfce06b7b19c2607105ab
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a37b7f4e378c40aeb66bfce06b7b19c2607105ab

Author: Martin Storsjo <martin at martin.st>
Date:   Mon Jan 22 00:06:09 2018 +0200

ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64.

Signed-off-by: Martin Storsjo <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit ae49bc94b4b49363133e31a0d6c28cfb9f99b294)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +-
 dlls/ucrtbase/ucrtbase.spec                                           | 2 +-
 dlls/vcruntime140/vcruntime140.spec                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
index 61bd326..0edd871 100644
--- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
@@ -39,7 +39,7 @@
 @ stub __dcrt_initial_narrow_environment
 @ stub __intrinsic_abnormal_termination
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp
-@ stub __intrinsic_setjmpex
+@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex
 @ stub __processing_throw
 @ stub __report_gsfailure
 @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 0d56715..00d779c 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -94,7 +94,7 @@
 @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init
 @ stub __intrinsic_abnormal_termination
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp
-@ stub __intrinsic_setjmpex
+@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex
 @ cdecl __isascii(long) MSVCRT___isascii
 @ cdecl __iscsym(long) MSVCRT___iscsym
 @ cdecl __iscsymf(long) MSVCRT___iscsymf
diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec
index 5efd1a4..331a087 100644
--- a/dlls/vcruntime140/vcruntime140.spec
+++ b/dlls/vcruntime140/vcruntime140.spec
@@ -33,7 +33,7 @@
 @ cdecl __current_exception() ucrtbase.__current_exception
 @ stub __current_exception_context
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp
-@ stub __intrinsic_setjmpex
+@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex
 @ stub __processing_throw
 @ stub __report_gsfailure
 @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy




More information about the wine-cvs mailing list