mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-02 02:23:38 +00:00
include: Force aligning stack pointer also for Mingw builds.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50189 Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
baec5f1eca
commit
5a0c9270b1
|
@ -61,7 +61,8 @@
|
|||
#define __has_attribute(x) 0
|
||||
#endif
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(__stdcall)
|
||||
#ifndef _MSC_VER
|
||||
# undef __stdcall
|
||||
# ifdef __i386__
|
||||
# ifdef __GNUC__
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
|
@ -87,27 +88,18 @@
|
|||
# endif /* __i386__ */
|
||||
#endif /* __stdcall */
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(__cdecl)
|
||||
#ifndef _MSC_VER
|
||||
# undef __cdecl
|
||||
# if defined(__i386__) && defined(__GNUC__)
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
# define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
|
||||
# else
|
||||
# define __cdecl __attribute__((__cdecl__))
|
||||
# endif
|
||||
# elif defined(__x86_64__) && defined (__GNUC__)
|
||||
# if __has_attribute(__force_align_arg_pointer__)
|
||||
# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
|
||||
# else
|
||||
# define __cdecl __attribute__((ms_abi))
|
||||
# endif
|
||||
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
|
||||
# define __cdecl __attribute__((pcs("aapcs-vfp")))
|
||||
# elif defined(__aarch64__) && defined (__GNUC__)
|
||||
# define __cdecl __attribute__((ms_abi))
|
||||
# else
|
||||
# define __cdecl
|
||||
# define __cdecl __stdcall
|
||||
# endif
|
||||
#endif /* __cdecl */
|
||||
#endif
|
||||
|
||||
#ifndef __ms_va_list
|
||||
# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
|
||||
|
|
|
@ -54,7 +54,8 @@ extern "C" {
|
|||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(__stdcall)
|
||||
#ifndef _MSC_VER
|
||||
# undef __stdcall
|
||||
# ifdef __i386__
|
||||
# ifdef __GNUC__
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
|
@ -80,27 +81,18 @@ extern "C" {
|
|||
# endif /* __i386__ */
|
||||
#endif /* __stdcall */
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(__cdecl)
|
||||
#ifndef _MSC_VER
|
||||
# undef __cdecl
|
||||
# if defined(__i386__) && defined(__GNUC__)
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
|
||||
# define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
|
||||
# else
|
||||
# define __cdecl __attribute__((__cdecl__))
|
||||
# endif
|
||||
# elif defined(__x86_64__) && defined (__GNUC__)
|
||||
# if __has_attribute(__force_align_arg_pointer__)
|
||||
# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
|
||||
# else
|
||||
# define __cdecl __attribute__((ms_abi))
|
||||
# endif
|
||||
# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__)
|
||||
# define __cdecl __attribute__((pcs("aapcs-vfp")))
|
||||
# elif defined(__aarch64__) && defined (__GNUC__)
|
||||
# define __cdecl __attribute__((ms_abi))
|
||||
# else
|
||||
# define __cdecl
|
||||
# define __cdecl __stdcall
|
||||
# endif
|
||||
#endif /* __cdecl */
|
||||
#endif
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(__fastcall)
|
||||
# define __fastcall __stdcall
|
||||
|
|
Loading…
Reference in a new issue