Skip to content

W
wine-cw
Commit 52398912 authored by Martin Storsjo's avatar Martin Storsjo Committed by Alexandre Julliard
Browse files
Options

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: 's avatarMartin Storsjo <martin@martin.st> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 40052019
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/msvcrt/corecrt.h
View file @ 52398912
...@@ -79,7 +79,7 @@ ...@@ -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 @@ ...@@ -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
......
include/windef.h
View file @ 52398912
...@@ -72,7 +72,7 @@ extern "C" { ...@@ -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" { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment