MdePkg: Enable new MS VA intrinsics for GNUC x86 64bits build

[mirror_edk2.git] / MdePkg / Include / Base.h

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 7dbf9386b6b47e6f43630a811ded4483a7d76dba..e03fa823928492115854d12b85cf116dba38ccfc 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -590,6 +590,30 @@ struct _LIST_ENTRY {
 #define VA_COPY(Dest, Start)          __va_copy (Dest, Start)\r
 \r
 #elif defined(__GNUC__) && !defined(NO_BUILTIN_VA_FUNCS)\r
+\r
+#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS)\r
+//\r
+// X64 only. Use MS ABI version of GCC built-in macros for variable argument lists.\r
+//\r
+///\r
+/// Both GCC and LLVM 3.8 for X64 support new variable argument intrinsics for Microsoft ABI\r
+///\r
+\r
+///\r
+/// Variable used to traverse the list of arguments. This type can vary by\r
+/// implementation and could be an array or structure.\r
+///\r
+typedef __builtin_ms_va_list VA_LIST;\r
+\r
+#define VA_START(Marker, Parameter)  __builtin_ms_va_start (Marker, Parameter)\r
+\r
+#define VA_ARG(Marker, TYPE)         ((sizeof (TYPE) < sizeof (UINTN)) ? (TYPE)(__builtin_va_arg (Marker, UINTN)) : (TYPE)(__builtin_va_arg (Marker, TYPE)))\r
+\r
+#define VA_END(Marker)               __builtin_ms_va_end (Marker)\r
+\r
+#define VA_COPY(Dest, Start)         __builtin_ms_va_copy (Dest, Start)\r
+\r
+#else\r
 //\r
 // Use GCC built-in macros for variable argument lists.\r
 //\r
@@ -608,6 +632,8 @@ typedef __builtin_va_list VA_LIST;
 \r
 #define VA_COPY(Dest, Start)         __builtin_va_copy (Dest, Start)\r
 \r
+#endif\r
+\r
 #else\r
 ///\r
 /// Variable used to traverse the list of arguments. This type can vary by\r