[PATCHv2 1/2] msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm
Martin Storsjo
martin at martin.st
Wed Aug 2 12:49:17 CDT 2017
Based on the import libraries in MSVC 2012, 2013 and in the Windows 10
SDK, these functions actually aren't exported on arm - only on x86_64.
(And for frexpf, I didn't find it in any of the import libraries of the
above MSVC versions for x86_64 either, and it's not listed in any of the
numbered msvcrt versions, and only appeared in
af9f9cb361fa9a238d8ce46ba81d11d586a7a08f.)
Signed-off-by: Martin Storsjo <martin at martin.st>
---
Added the missing sign-off.
---
dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++---
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 | 6 +++---
dlls/msvcrt/msvcrt.spec | 8 ++++----
dlls/ucrtbase/ucrtbase.spec | 6 +++---
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
index 7a6a8ed..3d2a58f 100644
--- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
@@ -85,7 +85,7 @@
@ cdecl _hypot(double double) ucrtbase._hypot
@ cdecl _hypotf(float float) ucrtbase._hypotf
@ cdecl _isnan(double) ucrtbase._isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) ucrtbase._isnanf
+@ cdecl -arch=x86_64 _isnanf(float) ucrtbase._isnanf
@ cdecl _j0(double) ucrtbase._j0
@ cdecl _j1(double) ucrtbase._j1
@ cdecl _jn(long double) ucrtbase._jn
@@ -114,9 +114,9 @@
@ cdecl _logb(double) ucrtbase._logb
@ cdecl -arch=arm,x86_64 _logbf(float) ucrtbase._logbf
@ cdecl _nextafter(double double) ucrtbase._nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) ucrtbase._nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) ucrtbase._nextafterf
@ cdecl _scalb(double long) ucrtbase._scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) ucrtbase._scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) ucrtbase._scalbf
@ cdecl -arch=win64 _set_FMA3_enable(long) ucrtbase._set_FMA3_enable
@ cdecl -arch=i386 _set_SSE2_enable(long) ucrtbase._set_SSE2_enable
@ cdecl _y0(double) ucrtbase._y0
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index fcf235a..f6200ad 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1011,7 +1011,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -1216,7 +1216,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -1256,7 +1256,7 @@
@ cdecl _rotr(long long)
@ cdecl -ret64 _rotr64(int64 long)
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index e0b7761..ba69912 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1357,7 +1357,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -1573,7 +1573,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -1613,7 +1613,7 @@
@ cdecl _rotr(long long)
@ cdecl -ret64 _rotr64(int64 long)
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 9da3f49..726926f 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1362,7 +1362,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -1583,7 +1583,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -1623,7 +1623,7 @@
@ cdecl _rotr(long long)
@ cdecl -ret64 _rotr64(int64 long)
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 41acbbd..3a44a04 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1227,7 +1227,7 @@
@ cdecl _ismbbtrail(long) msvcr120._ismbbtrail
@ stub _ismbbtrail_l
@ cdecl _isnan(double) msvcr120._isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) msvcr120._isnanf
+@ cdecl -arch=x86_64 _isnanf(float) msvcr120._isnanf
@ cdecl _isprint_l(long ptr) msvcr120._isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) msvcr120._isspace_l
@@ -1320,7 +1320,7 @@
@ cdecl _mktime64(ptr) msvcr120._mktime64
@ cdecl _msize(ptr) msvcr120._msize
@ cdecl _nextafter(double double) msvcr120._nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) msvcr120._nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) msvcr120._nextafterf
@ cdecl _onexit(ptr) msvcr120._onexit
@ varargs _open(str long) msvcr120._open
@ cdecl _open_osfhandle(long long) msvcr120._open_osfhandle
@@ -1348,7 +1348,7 @@
@ cdecl _rotr(long long) msvcr120._rotr
@ cdecl -ret64 _rotr64(int64 long) msvcr120._rotr64
@ cdecl _scalb(double long) msvcr120._scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) msvcr120._scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) msvcr120._scalbf
@ varargs _scanf_l(str ptr) msvcr120._scanf_l
@ varargs _scanf_s_l(str ptr) msvcr120._scanf_s_l
@ varargs _scprintf(str) msvcr120._scprintf
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 6c3c33c..0096bf0 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -683,7 +683,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -888,7 +888,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -934,7 +934,7 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index d0ce271..cf8d8b8 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -661,7 +661,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -866,7 +866,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -910,7 +910,7 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index e2b72e8..c812650 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -629,7 +629,7 @@
@ cdecl _ismbstrail(ptr ptr)
# stub _ismbstrail_l(long ptr)
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
@@ -838,7 +838,7 @@
# stub -arch=win32 _msize_debug(ptr long)
# stub -arch=win64 _msize_dbg(ptr long)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ cdecl _onexit(ptr) MSVCRT__onexit
@ varargs _open(str long) MSVCRT__open
@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
@@ -878,7 +878,7 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l
@ varargs _scprintf(str) MSVCRT__scprintf
@@ -1304,7 +1304,7 @@
@ cdecl freopen(str str ptr) MSVCRT_freopen
@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
@ cdecl frexp(double ptr) MSVCRT_frexp
-@ cdecl -arch=arm,x86_64 frexpf(float ptr) MSVCRT_frexpf
+@ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf
@ varargs fscanf(ptr str) MSVCRT_fscanf
@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s
@ cdecl fseek(ptr long long) MSVCRT_fseek
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index ff11028..6b9ea7f 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -501,7 +501,7 @@
@ cdecl _ismbstrail(ptr ptr)
@ stub _ismbstrail_l
@ cdecl _isnan(double) MSVCRT__isnan
-@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf
+@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
@ stub _ispunct_l
@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
@@ -729,7 +729,7 @@
@ cdecl _mktime64(ptr) MSVCRT__mktime64
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double) MSVCRT__nextafter
-@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf
+@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf
@ stub _o__CIacos
@ stub _o__CIasin
@ stub _o__CIatan
@@ -1871,7 +1871,7 @@
@ cdecl _rotr(long long)
@ cdecl -ret64 _rotr64(int64 long)
@ cdecl _scalb(double long) MSVCRT__scalb
-@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf
+@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf
@ cdecl _searchenv(str str ptr) MSVCRT__searchenv
@ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s
@ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter
--
2.7.4
More information about the wine-patches
mailing list