Merge Clang fixes from xenkernel41.

6 files changed, 92 insertions, 1 deletions

diff --git a/sysutils/xenkernel42/distinfo b/sysutils/xenkernel42/distinfo
index dd6ff8b5e59..61f5103322b 100644
--- a/sysutils/xenkernel42/distinfo
+++ b/sysutils/xenkernel42/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2013/05/15 05:32:12 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2013/06/13 21:49:59 joerg Exp $
 
 SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
 RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
 Size (xen-4.2.2.tar.gz) = 15602746 bytes
+SHA1 (patch-Config.mk) = a43ed1b3304d6383dc093acd128a7f373d0ca266
+SHA1 (patch-xen_Makefile) = e0d1b74518b9675ddc64295d1523ded9a8757c0a
+SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
+SHA1 (patch-xen_arch_x86_time.c) = e5ce7e83d1dcbcc1cdffd6921f25fce4d7389ac8
+SHA1 (patch-xen_include_xen_lib.h) = 36dcaf3874a1b1214babc45d7e19fe3b556c1044
diff --git a/sysutils/xenkernel42/patches/patch-Config.mk b/sysutils/xenkernel42/patches/patch-Config.mk
new file mode 100644
index 00000000000..32d0565e6b8
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-Config.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-Config.mk,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- Config.mk.orig	2012-12-18 12:54:16.000000000 +0000
++++ Config.mk
+@@ -16,6 +16,8 @@ SHELL     ?= /bin/sh
+ HOSTCC      = gcc
+ HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTCFLAGS += -fno-strict-aliasing
++HOSTCFLAGS += ${EXTRA_CFLAGS}
++CFLAGS     += ${EXTRA_CFLAGS}
+ 
+ DISTDIR     ?= $(XEN_ROOT)/dist
+ DESTDIR     ?= /
diff --git a/sysutils/xenkernel42/patches/patch-xen_Makefile b/sysutils/xenkernel42/patches/patch-xen_Makefile
new file mode 100644
index 00000000000..41f02df385c
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-xen_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_Makefile,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/Makefile.orig	2013-04-23 16:42:55.000000000 +0000
++++ xen/Makefile
+@@ -118,7 +118,7 @@ include/xen/compile.h: include/xen/compi
+ 	    -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
+ 	    -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
+ 	    -e 's/@@hostname@@/$(shell hostname)/g' \
+-	    -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
++	    -e 's!@@compiler@@!$(shell $(CC) $(EXTRA_CFLAGS) $(CFLAGS) --version 2>&1 | head -1)!g' \
+ 	    -e 's/@@version@@/$(XEN_VERSION)/g' \
+ 	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+ 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
diff --git a/sysutils/xenkernel42/patches/patch-xen_arch_x86_Rules.mk b/sysutils/xenkernel42/patches/patch-xen_arch_x86_Rules.mk
new file mode 100644
index 00000000000..8f7d62dd91a
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-xen_arch_x86_Rules.mk
@@ -0,0 +1,12 @@
+$NetBSD: patch-xen_arch_x86_Rules.mk,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/arch/x86/Rules.mk.orig	2013-03-25 13:28:19.000000000 +0000
++++ xen/arch/x86/Rules.mk
+@@ -21,6 +21,7 @@ CFLAGS += -iwithprefix include -Werror -
+ CFLAGS += -I$(BASEDIR)/include 
+ CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
+ CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
++CFLAGS += $(EXTRA_CFLAGS)
+ 
+ # Prevent floating-point variables from creeping into Xen.
+ CFLAGS += -msoft-float
diff --git a/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c b/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c
new file mode 100644
index 00000000000..a523223bc07
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/arch/x86/time.c.orig	2013-04-23 16:42:55.000000000 +0000
++++ xen/arch/x86/time.c
+@@ -107,7 +107,7 @@ static inline u32 mul_frac(u32 multiplic
+ {
+     u32 product_int, product_frac;
+     asm (
+-        "mul %3"
++        "mull %3"
+         : "=a" (product_frac), "=d" (product_int)
+         : "0" (multiplicand), "r" (multiplier) );
+     return product_int;
+@@ -131,10 +131,10 @@ static inline u64 scale_delta(u64 delta,
+ 
+ #ifdef CONFIG_X86_32
+     asm (
+-        "mul  %5       ; "
++        "mull  %5       ; "
+         "mov  %4,%%eax ; "
+         "mov  %%edx,%4 ; "
+-        "mul  %5       ; "
++        "mull  %5       ; "
+         "xor  %5,%5    ; "
+         "add  %4,%%eax ; "
+         "adc  %5,%%edx ; "
+@@ -142,7 +142,7 @@ static inline u64 scale_delta(u64 delta,
+         : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
+ #else
+     asm (
+-        "mul %2 ; shrd $32,%1,%0"
++        "mulq %2 ; shrd $32,%1,%0"
+         : "=a" (product), "=d" (delta)
+         : "rm" (delta), "0" ((u64)scale->mul_frac) );
+ #endif
diff --git a/sysutils/xenkernel42/patches/patch-xen_include_xen_lib.h b/sysutils/xenkernel42/patches/patch-xen_include_xen_lib.h
new file mode 100644
index 00000000000..56d4927e65c
--- /dev/null
+++ b/sysutils/xenkernel42/patches/patch-xen_include_xen_lib.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_include_xen_lib.h,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/include/xen/lib.h.orig	2013-06-13 19:59:04.000000000 +0000
++++ xen/include/xen/lib.h
+@@ -42,7 +42,7 @@ do {                                    
+ #define ASSERT(p) \
+     do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0)
+ #else
+-#define ASSERT(p) do { if ( 0 && (p) ); } while (0)
++#define ASSERT(p) do { if ( 0 && (p) ) (void)0; } while (0)
+ #endif
+ 
+ #define ABS(_x) ({                              \