[Xen-devel] [PATCH 2/6] xen/build: Use the system stdarg.h header

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

The C spec identifies stdarg.h as freestanding, and available for use in
non-hosted environments, such as Xen.

This replaces the in-tree xen/stdarg.h, which is completely tied to GCC.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Julien Grall <julien.grall@xxxxxxx>
CC: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Tim Deegan <tim@xxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/arch/arm/early_printk.c |  1 -
 xen/common/device_tree.c    |  1 -
 xen/include/xen/lib.h       |  1 -
 xen/include/xen/stdarg.h    | 10 ----------
 xen/include/xen/types.h     |  3 +++
 5 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 xen/include/xen/stdarg.h

diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c
index c85db69..199bcf1 100644
--- a/xen/arch/arm/early_printk.c
+++ b/xen/arch/arm/early_printk.c
@@ -11,7 +11,6 @@
 #include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
-#include <xen/stdarg.h>
 #include <xen/string.h>
 #include <xen/early_printk.h>
 
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index b39c8ca..b686a62 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -19,7 +19,6 @@
 #include <xen/lib.h>
 #include <xen/libfdt/libfdt.h>
 #include <xen/mm.h>
-#include <xen/stdarg.h>
 #include <xen/string.h>
 #include <xen/cpumask.h>
 #include <xen/ctype.h>
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 1c652bb..66f1d04 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -2,7 +2,6 @@
 #define __LIB_H__
 
 #include <xen/inttypes.h>
-#include <xen/stdarg.h>
 #include <xen/types.h>
 #include <xen/xmalloc.h>
 #include <xen/string.h>
diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h
deleted file mode 100644
index 29249a1..0000000
--- a/xen/include/xen/stdarg.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __XEN_STDARG_H__
-#define __XEN_STDARG_H__
-
-typedef __builtin_va_list va_list;
-#define va_copy(dest, src)    __builtin_va_copy((dest), (src))
-#define va_start(ap, last)    __builtin_va_start((ap), (last))
-#define va_end(ap)            __builtin_va_end(ap)
-#define va_arg                __builtin_va_arg
-
-#endif /* __XEN_STDARG_H__ */
diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index 8596ded..384a02f 100644
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -1,6 +1,9 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
+/* Use the C freestanding headers. */
+#include <stdarg.h>
+
 #include <asm/types.h>
 
 #define BITS_TO_LONGS(bits) \
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel