include: Check whether the ms_abi attribute is supported on aarch64.

Updated to maintain sync with dac1e16d. Signed-off-by: Kevin Puetz <PuetzKevinA@JohnDeere.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Check whether the ms_abi attribute is supported on aarch64.
849e521d · Kevin Puetz · Alexandre Julliard · 9cbe2735 · 849e521d · 849e521d
Commit 849e521d authored Jan 04, 2021 by Kevin Puetz Committed by Alexandre Julliard Jan 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

debug.h include/wine/debug.h +1 -1

test.h include/wine/test.h +1 -1

No files found.
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -157,7 +157,7 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine
   quotes.  The string will be valid for some time, but not indefinitely
   as strings are re-used.  */
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
+#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
 # define __wine_dbg_cdecl __cdecl
 # define __wine_dbg_va_list __builtin_ms_va_list
 # define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg)

--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -78,7 +78,7 @@ extern void winetest_wait_child_process( HANDLE process );
 #define START_TEST(name) void func_##name(void)
 #endif
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
+#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
 #define __winetest_cdecl __cdecl
 #define __winetest_va_list __builtin_ms_va_list
 #else