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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 849e521dbaf04ffc55b4df17d56b6e09dfa23252
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=849e521dbaf04ffc55b4df17d56b6e09dfa23252

Author: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Date:   Mon Jan  4 11:19:39 2021 -0600

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

Updated to maintain sync with dac1e16dd4edc8404c59dc63ae708cd8bb50a38a.

Signed-off-by: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/wine/debug.h | 2 +-
 include/wine/test.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wine/debug.h b/include/wine/debug.h
index e064aaefb8e..2255f62e502 100644
--- 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)
diff --git a/include/wine/test.h b/include/wine/test.h
index 38c8922458e..787fea0ba24 100644
--- 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