Skip to content

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

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

While wine's configure checks and requires that the ms_abi attribute is supported on aarch64 (without it, variadic functions don't have the correct ABI), these headers are also included when building widl as a generic cross compilation tool as part of mingw-w64-tools. In the case of widl, the functions that use these attributes (and in particular, their ABI) doesn't matter as they aren't used/called, they're just included as a side effect of including the headers that widl actually needs. This fixes building the widl tool for aarch64 linux with GCC, even if wine itself can't be built in that configuration. Only windef.h is used/needed by widl, but update msvcrt/corecrt.h as well to keep these definitions in sync. Signed-off-by: 's avatarMartin Storsjo <martin@martin.st> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ada03e76
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/msvcrt/corecrt.h
View file @ dac1e16d
......@@ -81,7 +81,7 @@
# endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
# define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__)
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi))
# else /* __i386__ */
# define __stdcall
......@@ -102,7 +102,7 @@
#endif
#ifndef __ms_va_list
# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)
......
include/windef.h
View file @ dac1e16d
......@@ -74,7 +74,7 @@ extern "C" {
# endif
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
# define __stdcall __attribute__((pcs("aapcs-vfp")))
# elif defined(__aarch64__) && defined (__GNUC__)
# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi)
# define __stdcall __attribute__((ms_abi))
# else /* __i386__ */
# define __stdcall
......@@ -103,7 +103,7 @@ extern "C" {
#endif
#ifndef __ms_va_list
# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)
......
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