Jacek Caban : mscvrt: Always provide float variants of math functions in importlib on x86.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f15515cc2f6987017dd351a4e0ce5b7684d8709
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0f15515cc2f6987017dd351a4...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Sun Aug 25 18:49:55 2019 +0200

mscvrt: Always provide float variants of math functions in importlib on x86.

We have them declared as inline wrappers around double variant in
math.h, but that's not enough. clang is smart enough to optimize them
back to *f variants anyway.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcr100/Makefile.in | 1 +
 dlls/msvcr110/Makefile.in | 1 +
 dlls/msvcr120/Makefile.in | 1 +
 dlls/msvcr80/Makefile.in  | 1 +
 dlls/msvcr90/Makefile.in  | 1 +
 dlls/msvcrt/Makefile.in   | 1 +
 dlls/msvcrt/mathf.c       | 4 +++-
 dlls/ucrtbase/Makefile.in | 1 +
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index e95c929..03a94f8 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -25,6 +25,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in
index 00928ca..c29fa23 100644
--- a/dlls/msvcr110/Makefile.in
+++ b/dlls/msvcr110/Makefile.in
@@ -25,6 +25,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in
index fa09d30..57b9c8a 100644
--- a/dlls/msvcr120/Makefile.in
+++ b/dlls/msvcr120/Makefile.in
@@ -25,6 +25,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in
index 90c43f7..a3757d4 100644
--- a/dlls/msvcr80/Makefile.in
+++ b/dlls/msvcr80/Makefile.in
@@ -25,6 +25,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in
index 5d644a3..d4f857d 100644
--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -25,6 +25,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 014243c..d0237fd 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -24,6 +24,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	onexit.c \
diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c
index 781df2b..9f27e64 100644
--- a/dlls/msvcrt/mathf.c
+++ b/dlls/msvcrt/mathf.c
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-#if !defined(__i386__) && _MSVCR_VER > 0 && _MSVCR_VER < 80
+#if defined(__i386__) || (_MSVCR_VER > 0 && _MSVCR_VER < 80)
 float sinf(float x) { return sin(x); }
 float cosf(float x) { return cos(x); }
 float tanf(float x) { return tan(x); }
@@ -34,4 +34,6 @@ float expf(float x) { return exp(x); }
 float logf(float x) { return log(x); }
 float powf(float x, float y) { return pow(x, y); }
 float sqrtf(float x) { return sqrt(x); }
+float floorf(float x) { return floor(x); }
+float ceilf(float x) { return ceil(x); }
 #endif
diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in
index 63fcc9b..2caef7c 100644
--- a/dlls/ucrtbase/Makefile.in
+++ b/dlls/ucrtbase/Makefile.in
@@ -24,6 +24,7 @@ C_SRCS = \
 	lock.c \
 	main.c \
 	math.c \
+	mathf.c \
 	mbcs.c \
 	misc.c \
 	printf.c \