Martin Storsjo : include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 0d89678307a32157cae4a39a4de7192597ef73fd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0d89678307a32157cae4a39a4...

Author: Martin Storsjo <martin(a)martin.st>
Date:   Mon Jan 11 23:00:21 2021 +0200

include: Don't use __attribute__((pcs("aapcs-vfp"))) when building in PE mode.

Clang doesn't support this attribute for windows targets right now;
the attribute is only needed for selecting a potentially non-default
calling convention on e.g. linux.

Signed-off-by: Martin Storsjo <martin(a)martin.st>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 52398912f954a28007468c41be7d108e0f9f11bd)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 include/msvcrt/corecrt.h | 4 ++--
 include/windef.h         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h
index a66f43877ac..4adbe0920f6 100644
--- a/include/msvcrt/corecrt.h
+++ b/include/msvcrt/corecrt.h
@@ -79,7 +79,7 @@
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
 #  define __stdcall __attribute__((ms_abi))
@@ -120,7 +120,7 @@
 #endif
 
 #ifndef WINAPIV
-# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
+# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
 #  define WINAPIV __attribute__((pcs("aapcs")))
 # else
 #  define WINAPIV __cdecl
diff --git a/include/windef.h b/include/windef.h
index 5351afe66db..ac2ec619fbd 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -72,7 +72,7 @@ extern "C" {
 #  else
 #   define __stdcall __attribute__((ms_abi))
 #  endif
-# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
+# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
 #   define __stdcall __attribute__((pcs("aapcs-vfp")))
 # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
 #  define __stdcall __attribute__((ms_abi))
@@ -120,7 +120,7 @@ extern "C" {
 # endif
 #endif
 
-#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
+#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
 # define WINAPIV __attribute__((pcs("aapcs")))
 #else
 # define WINAPIV __cdecl