From: Alexandre Julliard julliard@winehq.org
--- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/math.c | 28 ---------------------------- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 12 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index d54e8d49964..efb835749b6 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D_CRTDLL -D_CRTIMP= MODULE = crtdll.dll -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index d17aa79b3d7..b7ed6c9cf87 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 0bc15e27d94..1337b52224a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index cc3d5b2bdff..f854f0d5417 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 5782a64bf03..9415d5b5b66 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index f849158e2ee..6079e87841f 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index b3c44b3a530..2bf999f37f1 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 1f7ba4cdcde..0faac8f4150 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 63e6630d7bd..ad42e217d56 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32
C_SRCS = \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 854403a71bf..2bbdcdcc7d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2075,22 +2075,6 @@ float CDECL modff( float x, float *iptr )
#endif
-#if !defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110) - -/********************************************************************* - * fabsf (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -float CDECL fabsf( float x ) -{ - union { float f; UINT32 i; } u = { x }; - u.i &= 0x7fffffff; - return u.f; -} - -#endif - /********************************************************************* * acos (MSVCRT.@) * @@ -5095,18 +5079,6 @@ float CDECL fmaf( float x, float y, float z ) return u.f; }
-/********************************************************************* - * fabs (MSVCRT.@) - * - * Copied from musl: src/math/fabsf.c - */ -double CDECL fabs( double x ) -{ - union { double f; UINT64 i; } u = { x }; - u.i &= ~0ull >> 1; - return u.f; -} - /********************************************************************* * frexp (MSVCRT.@) * diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 95f0bca93b4..994195eebc6 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= -D_DEBUG= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32
diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index abab9d4f02c..e9cdf6127a0 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase -IMPORTS = ntdll +IMPORTS = $(MUSL_PE_LIBS) ntdll DELAYIMPORTS = advapi32 user32 PARENTSRC = ../msvcrt