[PATCH] msvcrt: Only export __p__* functions on i386

Martin Storsjo martin at martin.st
Fri Dec 20 15:06:30 CST 2019


The previous specification, -arch=win32, is incorrect - these functions
aren't available on arm.

Signed-off-by: Martin Storsjo <martin at martin.st>
---
 dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index b3b9cca0b9..4f55bcb45a 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -245,35 +245,35 @@
 @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan
 @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf
 @ extern __mb_cur_max MSVCRT___mb_cur_max
-@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc
-@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv
-@ cdecl -arch=win32 __p___initenv()
-@ cdecl -arch=win32 __p___mb_cur_max()
-@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv
-@ cdecl -arch=win32 __p___winitenv()
-@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln
-@ cdecl -arch=win32 __p__amblksiz()
-@ cdecl -arch=win32 __p__commode()
-@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight
-@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias
-@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ
-@ stub -arch=win32 __p__fileinfo()
-@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode
+@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc
+@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv
+@ cdecl -arch=i386 __p___initenv()
+@ cdecl -arch=i386 __p___mb_cur_max()
+@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv
+@ cdecl -arch=i386 __p___winitenv()
+@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln
+@ cdecl -arch=i386 __p__amblksiz()
+@ cdecl -arch=i386 __p__commode()
+@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight
+@ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias
+@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ
+@ stub -arch=i386 __p__fileinfo()
+@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode
 @ cdecl -arch=i386 __p__iob() __iob_func
-@ stub -arch=win32 __p__mbcasemap()
-@ cdecl -arch=win32 __p__mbctype()
-@ cdecl -arch=win32 __p__osver()
-@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype
-@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr
-@ stub -arch=win32 __p__pwctype()
-@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone
-@ cdecl -arch=win32 __p__tzname()
-@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln
-@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron
-@ cdecl -arch=win32 __p__winmajor()
-@ cdecl -arch=win32 __p__winminor()
-@ cdecl -arch=win32 __p__winver()
-@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr
+@ stub -arch=i386 __p__mbcasemap()
+@ cdecl -arch=i386 __p__mbctype()
+@ cdecl -arch=i386 __p__osver()
+@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype
+@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr
+@ stub -arch=i386 __p__pwctype()
+@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone
+@ cdecl -arch=i386 __p__tzname()
+@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln
+@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron
+@ cdecl -arch=i386 __p__winmajor()
+@ cdecl -arch=i386 __p__winminor()
+@ cdecl -arch=i386 __p__winver()
+@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr
 @ cdecl __pctype_func() MSVCRT___pctype_func
 @ extern __pioinfo MSVCRT___pioinfo
 # stub __pwctype_func()
-- 
2.17.1




More information about the wine-devel mailing list