2 files changed, 64 insertions, 20 deletions

diff --git a/include/system/efistdarg.h b/include/system/efistdarg.h
index 837c4f23..034977cc 100644
--- a/include/system/efistdarg.h
+++ b/include/system/efistdarg.h
@@ -8,6 +8,10 @@
 #ifndef _EFISTDARG_H_
 #define _EFISTDARG_H_
 
+#ifndef GNU_EFI_USE_EXTERNAL_STDARG
+#define GNU_EFI_USE_EXTERNAL_STDARG
+#endif
+
 #include <stdarg.h>
 
 #endif /* !_EFISTDARG_H_ */
diff --git a/include/system/stdarg.h b/include/system/stdarg.h
index af1ac59b..ce722249 100644
--- a/include/system/stdarg.h
+++ b/include/system/stdarg.h
@@ -2,39 +2,79 @@
 /*
  * stdarg.h - try to make consistent va_* handling for EFI
  */
-#ifdef SHIM_UNIT_TEST
-#include_next <stdarg.h>
-#else
 #ifndef _STDARG_H
-#define _STDARG_H
+
+/*
+ * clang doesn't know about __builtin_sysv_va_list, apparently.
+ */
+#ifdef __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wcpp"
+typedef __builtin_va_list __builtin_sysv_va_list;
+#warning clang builds may not work at all for anything other than scan-build
+#pragma GCC diagnostic pop
+#endif
 
 #ifndef GNU_EFI_USE_EXTERNAL_STDARG
 #define GNU_EFI_USE_EXTERNAL_STDARG
 #endif
 
+#ifdef SHIM_UNIT_TEST
+#include_next <stdarg.h>
+#endif
+
 #if defined(__aarch64__) || defined(__arm__) || defined(__i386__) || \
 	defined(__i486__) || defined(__i686__) || defined(SHIM_UNIT_TEST)
-typedef __builtin_va_list va_list;
-#define va_copy(dest, start)  __builtin_va_copy(dest, start)
-#define va_start(marker, arg) __builtin_va_start(marker, arg)
-#define va_arg(marker, type)  __builtin_va_arg(marker, type)
-#define va_end(marker)        __builtin_va_end(marker)
+
+typedef __builtin_va_list ms_va_list;
+typedef __builtin_va_list __builtin_ms_va_list;
+#define ms_va_copy(dest, start)  __builtin_va_copy(dest, start)
+#define ms_va_start(marker, arg) __builtin_va_start(marker, arg)
+#define ms_va_arg(marker, type)  __builtin_va_arg(marker, type)
+#define ms_va_end(marker)        __builtin_va_end(marker)
+
+typedef __builtin_va_list sysv_va_list;
+#define sysv_va_copy(dest, start)  __builtin_va_copy(dest, start)
+#define sysv_va_start(marker, arg) __builtin_va_start(marker, arg)
+#define sysv_va_arg(marker, type)  __builtin_va_arg(marker, type)
+#define sysv_va_end(marker)        __builtin_va_end(marker)
+/*
+ * OpenSSL's X509ConstructCertificateStack needs this.
+ */
+typedef __builtin_va_list VA_LIST;
+#define VA_COPY(dest, start)  __builtin_va_copy(dest, start)
+#define VA_START(marker, arg) __builtin_va_start(marker, arg)
+#define VA_END(marker)        __builtin_va_end(marker)
+#define VA_ARG(marker, type)  __builtin_va_arg(marker, type)
+
 #elif defined(__x86_64__)
-typedef __builtin_ms_va_list va_list;
-#define va_copy(dest, start)  __builtin_ms_va_copy(dest, start)
-#define va_start(marker, arg) __builtin_ms_va_start(marker, arg)
-#define va_arg(marker, type)  __builtin_va_arg(marker, type)
-#define va_end(marker)        __builtin_ms_va_end(marker)
+
+typedef __builtin_ms_va_list ms_va_list;
+#define ms_va_copy(dest, start)  __builtin_ms_va_copy(dest, start)
+#define ms_va_start(marker, arg) __builtin_ms_va_start(marker, arg)
+#define ms_va_arg(marker, type)  __builtin_va_arg(marker, type)
+#define ms_va_end(marker)        __builtin_ms_va_end(marker)
+typedef __builtin_sysv_va_list sysv_va_list;
+#define sysv_va_copy(dest, start)  __builtin_sysv_va_copy(dest, start)
+#define sysv_va_start(marker, arg) __builtin_sysv_va_start(marker, arg)
+#define sysv_va_arg(marker, type)  __builtin_va_arg(marker, type)
+#define sysv_va_end(marker)        __builtin_sysv_va_end(marker)
+/*
+ * OpenSSL's X509ConstructCertificateStack needs this.
+ */
+typedef __builtin_ms_va_list VA_LIST;
+#define VA_COPY(dest, start)  __builtin_ms_va_copy(dest, start)
+#define VA_START(marker, arg) __builtin_ms_va_start(marker, arg)
+#define VA_END(marker)        __builtin_ms_va_end(marker)
+#define VA_ARG(marker, type)  __builtin_va_arg(marker, type)
+
 #else
 #error what arch is this
 #endif
 
-typedef va_list VA_LIST;
-#define VA_COPY(dest, start)  va_copy(dest, start)
-#define VA_START(marker, arg) va_start(marker, arg)
-#define VA_END(marker)        va_end(marker)
-#define VA_ARG(marker, type)  va_arg(marker, type)
+#ifndef _STDARG_H
+#define _STDARG_H
+#endif /* !_STDARG_H #2 */
 
 #endif /* !_STDARG_H */
-#endif /* !SHIM_UNIT_TEST */
 // vim:fenc=utf-8:tw=75:noet