From bcfd7dd3ff03b39821f12424b52a773aca73d08b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 15 Dec 2008 15:39:34 +0100 Subject: [PATCH] msvcrt: The _CI* math functions are only exported on i386. --- dlls/crtdll/crtdll.spec | 32 ++++++++++++++++---------------- dlls/msvcr71/msvcr71.spec | 32 ++++++++++++++++---------------- dlls/msvcrt/math.c | 23 ----------------------- dlls/msvcrt/msvcrt.spec | 32 ++++++++++++++++---------------- dlls/msvcrt20/msvcrt20.spec | 32 ++++++++++++++++---------------- dlls/msvcrt40/msvcrt40.spec | 32 ++++++++++++++++---------------- dlls/msvcrtd/msvcrtd.spec | 32 ++++++++++++++++---------------- 7 files changed, 96 insertions(+), 119 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 505a6e9aa66..7584467ee60 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -3,22 +3,22 @@ @ cdecl ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z @ cdecl ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z -@ cdecl _CIacos() msvcrt._CIacos -@ cdecl _CIasin() msvcrt._CIasin -@ cdecl _CIatan() msvcrt._CIatan -@ cdecl _CIatan2() msvcrt._CIatan2 -@ cdecl _CIcos() msvcrt._CIcos -@ cdecl _CIcosh() msvcrt._CIcosh -@ cdecl _CIexp() msvcrt._CIexp -@ cdecl _CIfmod() msvcrt._CIfmod -@ cdecl _CIlog() msvcrt._CIlog -@ cdecl _CIlog10() msvcrt._CIlog10 -@ cdecl _CIpow() msvcrt._CIpow -@ cdecl _CIsin() msvcrt._CIsin -@ cdecl _CIsinh() msvcrt._CIsinh -@ cdecl _CIsqrt() msvcrt._CIsqrt -@ cdecl _CItan() msvcrt._CItan -@ cdecl _CItanh() msvcrt._CItanh +@ cdecl -arch=i386 _CIacos() msvcrt._CIacos +@ cdecl -arch=i386 _CIasin() msvcrt._CIasin +@ cdecl -arch=i386 _CIatan() msvcrt._CIatan +@ cdecl -arch=i386 _CIatan2() msvcrt._CIatan2 +@ cdecl -arch=i386 _CIcos() msvcrt._CIcos +@ cdecl -arch=i386 _CIcosh() msvcrt._CIcosh +@ cdecl -arch=i386 _CIexp() msvcrt._CIexp +@ cdecl -arch=i386 _CIfmod() msvcrt._CIfmod +@ cdecl -arch=i386 _CIlog() msvcrt._CIlog +@ cdecl -arch=i386 _CIlog10() msvcrt._CIlog10 +@ cdecl -arch=i386 _CIpow() msvcrt._CIpow +@ cdecl -arch=i386 _CIsin() msvcrt._CIsin +@ cdecl -arch=i386 _CIsinh() msvcrt._CIsinh +@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt +@ cdecl -arch=i386 _CItan() msvcrt._CItan +@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ extern _HUGE_dll msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl __GetMainArgs(ptr ptr ptr long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 968e8b5844b..f02052b69e6 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -50,22 +50,22 @@ @ stub ?vswprintf@@YAHPA_WIPB_WPAD@Z @ cdecl -i386 ?what@exception@@UBEPBDXZ() msvcrt.?what@exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT -@ cdecl _CIacos() msvcrt._CIacos -@ cdecl _CIasin() msvcrt._CIasin -@ cdecl _CIatan() msvcrt._CIatan -@ cdecl _CIatan2() msvcrt._CIatan2 -@ cdecl _CIcos() msvcrt._CIcos -@ cdecl _CIcosh() msvcrt._CIcosh -@ cdecl _CIexp() msvcrt._CIexp -@ cdecl _CIfmod() msvcrt._CIfmod -@ cdecl _CIlog() msvcrt._CIlog -@ cdecl _CIlog10() msvcrt._CIlog10 -@ cdecl _CIpow() msvcrt._CIpow -@ cdecl _CIsin() msvcrt._CIsin -@ cdecl _CIsinh() msvcrt._CIsinh -@ cdecl _CIsqrt() msvcrt._CIsqrt -@ cdecl _CItan() msvcrt._CItan -@ cdecl _CItanh() msvcrt._CItanh +@ cdecl -arch=i386 _CIacos() msvcrt._CIacos +@ cdecl -arch=i386 _CIasin() msvcrt._CIasin +@ cdecl -arch=i386 _CIatan() msvcrt._CIatan +@ cdecl -arch=i386 _CIatan2() msvcrt._CIatan2 +@ cdecl -arch=i386 _CIcos() msvcrt._CIcos +@ cdecl -arch=i386 _CIcosh() msvcrt._CIcosh +@ cdecl -arch=i386 _CIexp() msvcrt._CIexp +@ cdecl -arch=i386 _CIfmod() msvcrt._CIfmod +@ cdecl -arch=i386 _CIlog() msvcrt._CIlog +@ cdecl -arch=i386 _CIlog10() msvcrt._CIlog10 +@ cdecl -arch=i386 _CIpow() msvcrt._CIpow +@ cdecl -arch=i386 _CIsin() msvcrt._CIsin +@ cdecl -arch=i386 _CIsinh() msvcrt._CIsinh +@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt +@ cdecl -arch=i386 _CItan() msvcrt._CItan +@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ stub _CRT_RTC_INIT @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9ea82458e8f..0c6290c83b9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -357,29 +357,6 @@ double CDECL _CItanh(void) return MSVCRT_tanh(x); } -#else /* defined(__GNUC__) && defined(__i386__) */ - -/* The above cannot be called on non x86 platforms, stub them for linking */ - -#define IX86_ONLY(func) double func(void) { return 0.0; } - -IX86_ONLY(_CIacos) -IX86_ONLY(_CIasin) -IX86_ONLY(_CIatan) -IX86_ONLY(_CIatan2) -IX86_ONLY(_CIcos) -IX86_ONLY(_CIcosh) -IX86_ONLY(_CIexp) -IX86_ONLY(_CIfmod) -IX86_ONLY(_CIlog) -IX86_ONLY(_CIlog10) -IX86_ONLY(_CIpow) -IX86_ONLY(_CIsin) -IX86_ONLY(_CIsinh) -IX86_ONLY(_CIsqrt) -IX86_ONLY(_CItan) -IX86_ONLY(_CItanh) - #endif /* defined(__GNUC__) && defined(__i386__) */ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7a9c654e55d..31a56b478c2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -51,22 +51,22 @@ @ cdecl ?terminate@@YAXXZ() MSVCRT_terminate @ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected @ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception -@ cdecl _CIacos() -@ cdecl _CIasin() -@ cdecl _CIatan() -@ cdecl _CIatan2() -@ cdecl _CIcos() -@ cdecl _CIcosh() -@ cdecl _CIexp() -@ cdecl _CIfmod() -@ cdecl _CIlog() -@ cdecl _CIlog10() -@ cdecl _CIpow() -@ cdecl _CIsin() -@ cdecl _CIsinh() -@ cdecl _CIsqrt() -@ cdecl _CItan() -@ cdecl _CItanh() +@ cdecl -arch=i386 _CIacos() +@ cdecl -arch=i386 _CIasin() +@ cdecl -arch=i386 _CIatan() +@ cdecl -arch=i386 _CIatan2() +@ cdecl -arch=i386 _CIcos() +@ cdecl -arch=i386 _CIcosh() +@ cdecl -arch=i386 _CIexp() +@ cdecl -arch=i386 _CIfmod() +@ cdecl -arch=i386 _CIlog() +@ cdecl -arch=i386 _CIlog10() +@ cdecl -arch=i386 _CIpow() +@ cdecl -arch=i386 _CIsin() +@ cdecl -arch=i386 _CIsinh() +@ cdecl -arch=i386 _CIsqrt() +@ cdecl -arch=i386 _CItan() +@ cdecl -arch=i386 _CItanh() @ cdecl _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index d7a0b55e3f3..67608b86649 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -437,22 +437,22 @@ @ stub ?xsgetn@streambuf@@UAEHPADH@Z # @ stub ?xsputn@streambuf@@UAEHPBDH@Z # @ stub $I10_OUTPUT # -@ cdecl _CIacos() msvcrt._CIacos -@ cdecl _CIasin() msvcrt._CIasin -@ cdecl _CIatan() msvcrt._CIatan -@ cdecl _CIatan2() msvcrt._CIatan2 -@ cdecl _CIcos() msvcrt._CIcos -@ cdecl _CIcosh() msvcrt._CIcosh -@ cdecl _CIexp() msvcrt._CIexp -@ cdecl _CIfmod() msvcrt._CIfmod -@ cdecl _CIlog() msvcrt._CIlog -@ cdecl _CIlog10() msvcrt._CIlog10 -@ cdecl _CIpow() msvcrt._CIpow -@ cdecl _CIsin() msvcrt._CIsin -@ cdecl _CIsinh() msvcrt._CIsinh -@ cdecl _CIsqrt() msvcrt._CIsqrt -@ cdecl _CItan() msvcrt._CItan -@ cdecl _CItanh() msvcrt._CItanh +@ cdecl -arch=i386 _CIacos() msvcrt._CIacos +@ cdecl -arch=i386 _CIasin() msvcrt._CIasin +@ cdecl -arch=i386 _CIatan() msvcrt._CIatan +@ cdecl -arch=i386 _CIatan2() msvcrt._CIatan2 +@ cdecl -arch=i386 _CIcos() msvcrt._CIcos +@ cdecl -arch=i386 _CIcosh() msvcrt._CIcosh +@ cdecl -arch=i386 _CIexp() msvcrt._CIexp +@ cdecl -arch=i386 _CIfmod() msvcrt._CIfmod +@ cdecl -arch=i386 _CIlog() msvcrt._CIlog +@ cdecl -arch=i386 _CIlog10() msvcrt._CIlog10 +@ cdecl -arch=i386 _CIpow() msvcrt._CIpow +@ cdecl -arch=i386 _CIsin() msvcrt._CIsin +@ cdecl -arch=i386 _CIsinh() msvcrt._CIsinh +@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt +@ cdecl -arch=i386 _CItan() msvcrt._CItan +@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index ff14676a36f..00daff3a194 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -481,22 +481,22 @@ @ stub ?xsgetn@streambuf@@UAEHPADH@Z @ stub ?xsputn@streambuf@@UAEHPBDH@Z @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT -@ cdecl _CIacos() msvcrt._CIacos -@ cdecl _CIasin() msvcrt._CIasin -@ cdecl _CIatan() msvcrt._CIatan -@ cdecl _CIatan2() msvcrt._CIatan2 -@ cdecl _CIcos() msvcrt._CIcos -@ cdecl _CIcosh() msvcrt._CIcosh -@ cdecl _CIexp() msvcrt._CIexp -@ cdecl _CIfmod() msvcrt._CIfmod -@ cdecl _CIlog() msvcrt._CIlog -@ cdecl _CIlog10() msvcrt._CIlog10 -@ cdecl _CIpow() msvcrt._CIpow -@ cdecl _CIsin() msvcrt._CIsin -@ cdecl _CIsinh() msvcrt._CIsinh -@ cdecl _CIsqrt() msvcrt._CIsqrt -@ cdecl _CItan() msvcrt._CItan -@ cdecl _CItanh() msvcrt._CItanh +@ cdecl -arch=i386 _CIacos() msvcrt._CIacos +@ cdecl -arch=i386 _CIasin() msvcrt._CIasin +@ cdecl -arch=i386 _CIatan() msvcrt._CIatan +@ cdecl -arch=i386 _CIatan2() msvcrt._CIatan2 +@ cdecl -arch=i386 _CIcos() msvcrt._CIcos +@ cdecl -arch=i386 _CIcosh() msvcrt._CIcosh +@ cdecl -arch=i386 _CIexp() msvcrt._CIexp +@ cdecl -arch=i386 _CIfmod() msvcrt._CIfmod +@ cdecl -arch=i386 _CIlog() msvcrt._CIlog +@ cdecl -arch=i386 _CIlog10() msvcrt._CIlog10 +@ cdecl -arch=i386 _CIpow() msvcrt._CIpow +@ cdecl -arch=i386 _CIsin() msvcrt._CIsin +@ cdecl -arch=i386 _CIsinh() msvcrt._CIsinh +@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt +@ cdecl -arch=i386 _CItan() msvcrt._CItan +@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index d05892264e4..0b8e8f0ed83 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -50,22 +50,22 @@ @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ @ cdecl -i386 ?what@exception@@UBEPBDXZ() msvcrt.?what@exception@@UBEPBDXZ -@ cdecl _CIacos() msvcrt._CIacos -@ cdecl _CIasin() msvcrt._CIasin -@ cdecl _CIatan() msvcrt._CIatan -@ cdecl _CIatan2() msvcrt._CIatan2 -@ cdecl _CIcos() msvcrt._CIcos -@ cdecl _CIcosh() msvcrt._CIcosh -@ cdecl _CIexp() msvcrt._CIexp -@ cdecl _CIfmod() msvcrt._CIfmod -@ cdecl _CIlog() msvcrt._CIlog -@ cdecl _CIlog10() msvcrt._CIlog10 -@ cdecl _CIpow() msvcrt._CIpow -@ cdecl _CIsin() msvcrt._CIsin -@ cdecl _CIsinh() msvcrt._CIsinh -@ cdecl _CIsqrt() msvcrt._CIsqrt -@ cdecl _CItan() msvcrt._CItan -@ cdecl _CItanh() msvcrt._CItanh +@ cdecl -arch=i386 _CIacos() msvcrt._CIacos +@ cdecl -arch=i386 _CIasin() msvcrt._CIasin +@ cdecl -arch=i386 _CIatan() msvcrt._CIatan +@ cdecl -arch=i386 _CIatan2() msvcrt._CIatan2 +@ cdecl -arch=i386 _CIcos() msvcrt._CIcos +@ cdecl -arch=i386 _CIcosh() msvcrt._CIcosh +@ cdecl -arch=i386 _CIexp() msvcrt._CIexp +@ cdecl -arch=i386 _CIfmod() msvcrt._CIfmod +@ cdecl -arch=i386 _CIlog() msvcrt._CIlog +@ cdecl -arch=i386 _CIlog10() msvcrt._CIlog10 +@ cdecl -arch=i386 _CIpow() msvcrt._CIpow +@ cdecl -arch=i386 _CIsin() msvcrt._CIsin +@ cdecl -arch=i386 _CIsinh() msvcrt._CIsinh +@ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt +@ cdecl -arch=i386 _CItan() msvcrt._CItan +@ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CrtCheckMemory() @ stub _CrtDbgBreak @ varargs _CrtDbgReport(long ptr long ptr ptr)