From: "André Hentschel" Subject: [PATCH 14/23] ucrtbase: Enable __intrinsic_setjmpex on PPC64 Message-Id: <20210131173433.114385-15-nerv@dawncrow.de> Date: Sun, 31 Jan 2021 18:34:24 +0100 In-Reply-To: <20210131173433.114385-1-nerv@dawncrow.de> References: <20210131173433.114385-1-nerv@dawncrow.de> Signed-off-by: André Hentschel --- .../api-ms-win-core-crt-l2-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 22 +++++++++---------- dlls/msvcrt40/msvcrt40.spec | 22 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec index 69f2629c8d5..86651e0a8bc 100644 --- a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec +++ b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec @@ -14,5 +14,5 @@ @ cdecl exit(long) msvcrt.exit @ stub hgets @ stub hwprintf -@ cdecl time(ptr) msvcrt.time +@ cdecl -arch=win32 time(ptr) msvcrt.time @ varargs wprintf(wstr) msvcrt.wprintf 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 73a33b4157d..3f260a402a6 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 @@ -40,7 +40,7 @@ @ stub __dcrt_initial_narrow_environment @ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64,powerpc64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 7e2ec304979..e386ed8511d 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -932,10 +932,10 @@ @ cdecl _fputwchar(long) msvcrt._fputwchar @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat -@ cdecl _ftime(ptr) msvcrt._ftime +@ cdecl -arch=win32 _ftime(ptr) msvcrt._ftime @ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath -@ cdecl _futime(long ptr) msvcrt._futime +@ cdecl -arch=win32 _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _getch() msvcrt._getch @@ -1187,7 +1187,7 @@ @ cdecl _ungetch(long) msvcrt._ungetch @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll -@ cdecl _utime(str ptr) msvcrt._utime +@ cdecl -arch=win32 _utime(str ptr) msvcrt._utime @ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @@ -1207,7 +1207,7 @@ @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset @ cdecl _wcsupr(wstr) msvcrt._wcsupr -@ cdecl _wctime(ptr) msvcrt._wctime +@ cdecl -arch=win32 _wctime(ptr) msvcrt._wctime @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle @@ -1263,7 +1263,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink -@ cdecl _wutime(wstr ptr) msvcrt._wutime +@ cdecl -arch=win32 _wutime(wstr ptr) msvcrt._wutime @ cdecl _y0(double) msvcrt._y0 @ cdecl _y1(double) msvcrt._y1 @ cdecl _yn(long double) msvcrt._yn @@ -1285,8 +1285,8 @@ @ cdecl clock() msvcrt.clock @ cdecl cos(double) msvcrt.cos @ cdecl cosh(double) msvcrt.cosh -@ cdecl ctime(ptr) msvcrt.ctime -@ cdecl difftime(long long) msvcrt.difftime +@ cdecl -arch=win32 ctime(ptr) msvcrt.ctime +@ cdecl -arch=win32 difftime(long long) msvcrt.difftime @ cdecl -ret64 div(long long) msvcrt.div @ cdecl exit(long) msvcrt.exit @ cdecl exp(double) msvcrt.exp @@ -1325,7 +1325,7 @@ @ cdecl gets(str) msvcrt.gets @ cdecl getwc(ptr) msvcrt.getwc @ cdecl getwchar() msvcrt.getwchar -@ cdecl gmtime(ptr) msvcrt.gmtime +@ cdecl -arch=win32 gmtime(ptr) msvcrt.gmtime @ cdecl is_wctype(long long) msvcrt.is_wctype @ cdecl isalnum(long) msvcrt.isalnum @ cdecl isalpha(long) msvcrt.isalpha @@ -1356,7 +1356,7 @@ @ cdecl ldexp(double long) msvcrt.ldexp @ cdecl -ret64 ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv -@ cdecl localtime(ptr) msvcrt.localtime +@ cdecl -arch=win32 localtime(ptr) msvcrt.localtime @ cdecl log(double) msvcrt.log @ cdecl log10(double) msvcrt.log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) msvcrt.longjmp @@ -1369,7 +1369,7 @@ @ cdecl memcpy(ptr ptr long) msvcrt.memcpy @ cdecl memmove(ptr ptr long) msvcrt.memmove @ cdecl memset(ptr long long) msvcrt.memset -@ cdecl mktime(ptr) msvcrt.mktime +@ cdecl -arch=win32 mktime(ptr) msvcrt.mktime @ cdecl modf(double ptr) msvcrt.modf @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow @@ -1423,7 +1423,7 @@ @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh -@ cdecl time(ptr) msvcrt.time +@ cdecl -arch=win32 time(ptr) msvcrt.time @ cdecl tmpfile() msvcrt.tmpfile @ cdecl tmpnam(ptr) msvcrt.tmpnam @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index ebcf5df4fc3..1024644b29c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1019,10 +1019,10 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 -@ cdecl _ftime(ptr) msvcrt._ftime +@ cdecl -arch=win32 _ftime(ptr) msvcrt._ftime @ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath -@ cdecl _futime(long ptr) msvcrt._futime +@ cdecl -arch=win32 _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _getch() msvcrt._getch @@ -1252,7 +1252,7 @@ @ cdecl _ungetch(long) msvcrt._ungetch @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll -@ cdecl _utime(str ptr) msvcrt._utime +@ cdecl -arch=win32 _utime(str ptr) msvcrt._utime @ cdecl -norelay _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess @@ -1272,7 +1272,7 @@ @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset @ cdecl _wcsupr(wstr) msvcrt._wcsupr -@ cdecl _wctime(ptr) msvcrt._wctime +@ cdecl -arch=win32 _wctime(ptr) msvcrt._wctime @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle @@ -1331,7 +1331,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink -@ cdecl _wutime(wstr ptr) msvcrt._wutime +@ cdecl -arch=win32 _wutime(wstr ptr) msvcrt._wutime @ cdecl _y0(double) msvcrt._y0 @ cdecl _y1(double) msvcrt._y1 @ cdecl _yn(long double) msvcrt._yn @@ -1353,8 +1353,8 @@ @ cdecl clock() msvcrt.clock @ cdecl cos(double) msvcrt.cos @ cdecl cosh(double) msvcrt.cosh -@ cdecl ctime(ptr) msvcrt.ctime -@ cdecl difftime(long long) msvcrt.difftime +@ cdecl -arch=win32 ctime(ptr) msvcrt.ctime +@ cdecl -arch=win32 difftime(long long) msvcrt.difftime @ cdecl -ret64 div(long long) msvcrt.div @ cdecl exit(long) msvcrt.exit @ cdecl exp(double) msvcrt.exp @@ -1393,7 +1393,7 @@ @ cdecl gets(str) msvcrt.gets @ cdecl getwc(ptr) msvcrt.getwc @ cdecl getwchar() msvcrt.getwchar -@ cdecl gmtime(ptr) msvcrt.gmtime +@ cdecl -arch=win32 gmtime(ptr) msvcrt.gmtime @ cdecl is_wctype(long long) msvcrt.is_wctype @ cdecl isalnum(long) msvcrt.isalnum @ cdecl isalpha(long) msvcrt.isalpha @@ -1424,7 +1424,7 @@ @ cdecl ldexp(double long) msvcrt.ldexp @ cdecl -ret64 ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv -@ cdecl localtime(ptr) msvcrt.localtime +@ cdecl -arch=win32 localtime(ptr) msvcrt.localtime @ cdecl log(double) msvcrt.log @ cdecl log10(double) msvcrt.log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) msvcrt.longjmp @@ -1437,7 +1437,7 @@ @ cdecl memcpy(ptr ptr long) msvcrt.memcpy @ cdecl memmove(ptr ptr long) msvcrt.memmove @ cdecl memset(ptr long long) msvcrt.memset -@ cdecl mktime(ptr) msvcrt.mktime +@ cdecl -arch=win32 mktime(ptr) msvcrt.mktime @ cdecl modf(double ptr) msvcrt.modf @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow @@ -1491,7 +1491,7 @@ @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh -@ cdecl time(ptr) msvcrt.time +@ cdecl -arch=win32 time(ptr) msvcrt.time @ cdecl tmpfile() msvcrt.tmpfile @ cdecl tmpnam(ptr) msvcrt.tmpnam @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c14cd3d66cb..465df3838d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=x86_64,arm64,powerpc64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index f799bcd4db5..d7cf8007bef 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ cdecl __current_exception() ucrtbase.__current_exception @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64,powerpc64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy -- 2.25.1