From 5c50ec0c747c1d1406e21304357f1a132b24861c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 8 Dec 2017 12:43:19 +0100 Subject: [PATCH] include: Don't use floating point for WINAPI functions when building for soft-float on ARM. Signed-off-by: Alexandre Julliard --- include/msvcrt/crtdefs.h | 6 +++--- include/windef.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index ff0f4bd7901..a9edef57c4f 100644 --- 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 diff --git a/include/windef.h b/include/windef.h index d2afcf47c33..8a9f9449a67 100644 --- 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