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@martin.st>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 52398912f9)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Martin Storsjo 2021-01-11 23:00:21 +02:00 committed by Michael Stefaniuc
parent 3fab693d00
commit 0d89678307
2 changed files with 4 additions and 4 deletions

View File

@ -79,7 +79,7 @@
# else # else
# define __stdcall __attribute__((ms_abi)) # define __stdcall __attribute__((ms_abi))
# endif # endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# define __stdcall __attribute__((pcs("aapcs-vfp"))) # define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi)) # define __stdcall __attribute__((ms_abi))
@ -120,7 +120,7 @@
#endif #endif
#ifndef WINAPIV #ifndef WINAPIV
# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# define WINAPIV __attribute__((pcs("aapcs"))) # define WINAPIV __attribute__((pcs("aapcs")))
# else # else
# define WINAPIV __cdecl # define WINAPIV __cdecl

View File

@ -72,7 +72,7 @@ extern "C" {
# else # else
# define __stdcall __attribute__((ms_abi)) # define __stdcall __attribute__((ms_abi))
# endif # endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# define __stdcall __attribute__((pcs("aapcs-vfp"))) # define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) # elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi)) # define __stdcall __attribute__((ms_abi))
@ -120,7 +120,7 @@ extern "C" {
# endif # endif
#endif #endif
#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) #if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(_WIN32)
# define WINAPIV __attribute__((pcs("aapcs"))) # define WINAPIV __attribute__((pcs("aapcs")))
#else #else
# define WINAPIV __cdecl # define WINAPIV __cdecl