include: Force stack alignment on x86_64.

Signed-off-by: Justas Lavišius <bucaneer@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit dccb57df) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

include: Force stack alignment on x86_64.
13940871 · Justas Lavišius · Michael Stefaniuc · 31b09cda · 13940871
Commit 13940871 authored Jan 27, 2016 by Justas Lavišius Committed by Michael Stefaniuc Jul 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

windef.h include/windef.h +10 -2

No files found.
--- a/include/windef.h
+++ b/include/windef.h
@@ -64,7 +64,11 @@ extern "C" {
 #   error You need to define __stdcall for your compiler
 #  endif
 # elif defined(__x86_64__) && defined (__GNUC__)
-#  define __stdcall __attribute__((ms_abi))
+#  if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3))
+#   define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
+#  else
+#   define __stdcall __attribute__((ms_abi))
+#  endif
 # else  /* __i386__ */
 #  define __stdcall
 # endif  /* __i386__ */
@@ -78,7 +82,11 @@ extern "C" {
 #   define __cdecl __attribute__((__cdecl__))
 #  endif
 # elif defined(__x86_64__) && defined (__GNUC__)
-#  define __cdecl __attribute__((ms_abi))
+#  if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3))
+#   define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__))
+#  else
+#   define __cdecl __attribute__((ms_abi))
+#  endif
 # elif !defined(_MSC_VER)
 #  define __cdecl
 # endif