André Hentschel : msvcrt: Forward _setjmp on x86_64.
Alexandre Julliard
julliard at winehq.org
Thu Apr 7 07:36:47 CDT 2011
Module: wine
Branch: stable
Commit: 8fbbbb63867470bfec89bdce143fb2212dc8fd6c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbbbb63867470bfec89bdce143fb2212dc8fd6c
Author: André Hentschel <nerv at dawncrow.de>
Date: Fri Dec 31 16:04:05 2010 +0100
msvcrt: Forward _setjmp on x86_64.
(cherry picked from commit 28bdb8c58a3c07f7cc4867a74ff8b1a069cef514)
---
dlls/crtdll/crtdll.spec | 2 +-
dlls/msvcr70/msvcr70.spec | 2 +-
dlls/msvcr71/msvcr71.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt20/msvcrt20.spec | 2 +-
dlls/msvcrt40/msvcrt40.spec | 2 +-
dlls/msvcrtd/msvcrtd.spec | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 8bfde5f..b9cce26 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -263,7 +263,7 @@
@ cdecl _scalb( double long) msvcrt._scalb
@ cdecl _searchenv(str str ptr) msvcrt._searchenv
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
@ cdecl _setmode(long long) msvcrt._setmode
@ cdecl _setsystime(ptr long) msvcrt._setsystime
@ cdecl _sleep(long) msvcrt._sleep
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 97783fb..7ad465a 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -483,7 +483,7 @@
@ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
@ stub _set_security_error_handler
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index dfa04f8..3482b02 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -479,7 +479,7 @@
@ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
@ stub _set_security_error_handler
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 3d6b104..651d3a3 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -880,7 +880,7 @@
@ stub _set_purecall_handler
@ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 3b04f96..e4977ee 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -866,7 +866,7 @@
@ stub _set_purecall_handler
@ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 92eb395..be6c55b 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -766,7 +766,7 @@
@ cdecl _searchenv(str str ptr) msvcrt._searchenv
@ stdcall -i386 __seh_longjmp_unwind at 4(ptr) msvcrt._seh_longjmp_unwind
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmbcp(long) msvcrt._setmbcp
@ cdecl _setmode(long long) msvcrt._setmode
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index 6f2b6c2..dcee6c0 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -831,7 +831,7 @@
@ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind
@ cdecl _set_error_mode(long) msvcrt._set_error_mode
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index ec5b8fe..7665293 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -458,7 +458,7 @@
@ cdecl _set_error_mode(long) msvcrt._set_error_mode
@ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
@ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
@ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
@ cdecl _setmbcp(long) msvcrt._setmbcp
More information about the wine-cvs
mailing list