include: Don't use floating point for WINAPI functions when building for soft-float on ARM.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Don't use floating point for WINAPI functions when building for soft-float on ARM.
5c50ec0c · Alexandre Julliard · 364e04ce · 5c50ec0c · 5c50ec0c
Commit 5c50ec0c authored Dec 08, 2017 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

crtdefs.h include/msvcrt/crtdefs.h +3 -3

windef.h include/windef.h +3 -3

No files found.
--- a/include/msvcrt/crtdefs.h
+++ b/include/msvcrt/crtdefs.h
@@ -60,7 +60,7 @@
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # else  /* __i386__ */
 #  define __stdcall
@@ -80,7 +80,7 @@
 #  else
 #   define __cdecl __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif !defined(_MSC_VER)
 #  define __cdecl
@@ -106,7 +106,7 @@
 #endif

 #ifndef WINAPIV
-# if defined(__arm__) && defined (__GNUC__)
+# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 #  define WINAPIV __attribute__((pcs("aapcs")))
 # else
 #  define WINAPIV __cdecl

--- a/include/windef.h
+++ b/include/windef.h
@@ -69,7 +69,7 @@ extern "C" {
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # else  /* __i386__ */
 #  define __stdcall
@@ -89,7 +89,7 @@ extern "C" {
 #  else
 #   define __cdecl __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 #   define __cdecl __attribute__((pcs("aapcs-vfp")))
 # elif !defined(_MSC_VER)
 #  define __cdecl
@@ -114,7 +114,7 @@ extern "C" {
 # endif
 #endif

-#if defined(__arm__) && defined (__GNUC__)
+#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
 # define WINAPIV __attribute__((pcs("aapcs")))
 #else
 # define WINAPIV __cdecl