--- xen-4.6.0/tools/xentrace/xenalyze.c.orig	2015-10-05 15:33:39.000000000 +0100
+++ xen-4.6.0/tools/xentrace/xenalyze.c	2016-02-07 16:20:14.107618700 +0000
@@ -2132,10 +2132,12 @@
         } while (I <= J); /* Keep going until our pointers meet or pass */
 
         /* Re-adjust L and R, based on which element we're looking for */
-        if(J_weight<K_weight)
+        if(J_weight<K_weight) {
             L=I; L_weight = I_weight;
-        if(K_weight<I_weight)
+        }
+        if(K_weight<I_weight) {
             R=J; R_weight = J_weight;
+        }
     }
 
     return A[L];
@@ -2211,10 +2213,12 @@
         } while (I <= J); /* Keep going until our pointers meet or pass */
 
         /* Re-adjust L and R, based on which element we're looking for */
-        if(J_weight<K_weight)
+        if(J_weight<K_weight) {
             L=I; L_weight = I_weight;
-        if(K_weight<I_weight)
+        }
+        if(K_weight<I_weight) {
             R=J; R_weight = J_weight;
+        }
     }
 
     return A[L];
@@ -4121,6 +4125,7 @@
     struct cr3_value_struct **qsort_array;
     int i, N=0;
 
+#if 0
     int cr3_compare_total(const void *_a, const void *_b) {
         struct cr3_value_struct *a=*(typeof(&a))_a;
         struct cr3_value_struct *b=*(typeof(&a))_b;
@@ -4137,6 +4142,7 @@
         } else
             return -1;
     }
+#endif
 
     int cr3_compare_start(const void *_a, const void *_b) {
         struct cr3_value_struct *a=*(typeof(&a))_a;
--- xen-4.6.0/tools/qemu-xen-traditional/hw/bt-l2cap.c.orig	2015-09-08 15:42:31.000000000 +0100
+++ xen-4.6.0/tools/qemu-xen-traditional/hw/bt-l2cap.c	2016-02-07 12:34:17.440826593 +0000
@@ -999,7 +999,7 @@
 
     if (hdr->data[0] & 1) {
         if (len != 4)
-            /* TODO: Signal an error? */;
+            /* TODO: Signal an error? */
             return;
 
         return l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data));
--- xen-4.6.0/tools/qemu-xen-traditional/hw/bt-sdp.c.orig	2015-09-08 15:42:31.000000000 +0100
+++ xen-4.6.0/tools/qemu-xen-traditional/hw/bt-sdp.c	2016-02-07 12:53:39.576577307 +0000
@@ -172,7 +172,7 @@
     } else
         start = 0;
 
-    if (len > 1);
+    if (len > 1)
         return -SDP_INVALID_SYNTAX;
 
     /* Output the results */
--- xen-4.6.0/stubdom/newlib.gcc6.patch.orig	2016-02-07 22:51:53.809083403 +0000
+++ xen-4.6.0/stubdom/newlib.gcc6.patch	2016-02-07 22:51:27.006105528 +0000
@@ -0,0 +1,24 @@
+--- newlib-1.16.0/newlib/libm/math/k_rem_pio2.c.orig	2000-02-17 19:39:51.000000000 +0000
++++ newlib-1.16.0/newlib/libm/math/k_rem_pio2.c	2016-02-07 13:00:30.069397106 +0000
+@@ -187,7 +187,8 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
+--- newlib-1.16.0/newlib/libm/math/kf_rem_pio2.c.orig	2016-02-07 16:47:05.925457144 +0000
++++ newlib-1.16.0/newlib/libm/math/kf_rem_pio2.c	2016-02-07 22:48:25.921499258 +0000
+@@ -77,7 +77,8 @@
+ 
+     /* compute q[0],q[1],...q[jk] */
+ 	for (i=0;i<=jk;i++) {
+-	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;
++	    for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];
++	    q[i] = fw;
+ 	}
+ 
+ 	jz = jk;
--- xen-4.6.0/stubdom/Makefile.orig	2015-10-05 15:33:39.000000000 +0100
+++ xen-4.6.0/stubdom/Makefile	2016-02-07 13:10:02.036072565 +0000
@@ -80,6 +80,7 @@
 	patch -d $@ -p0 < newlib.patch
 	patch -d $@ -p0 < newlib-chk.patch
 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+	patch -d $@ -p1 < newlib.gcc6.patch
 	find $@ -type f | xargs perl -i.bak \
 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
 	touch $@
--- xen-4.6.0/tools/qemu-xen-traditional/block-qcow2.c.orig	2015-09-08 15:42:31.000000000 +0100
+++ xen-4.6.0/tools/qemu-xen-traditional/block-qcow2.c	2016-02-07 13:16:47.112164538 +0000
@@ -617,7 +617,7 @@
         if (offset + i * cluster_size != (be64_to_cpu(l2_table[i]) & ~mask))
             break;
 
-	return (i - start);
+    return (i - start);
 }
 
 static int count_contiguous_free_clusters(uint64_t nb_clusters, uint64_t *l2_table)
--- xen-4.6.0/tools/qemu-xen-traditional/xenstore.c.orig	2015-09-08 15:42:31.000000000 +0100
+++ xen-4.6.0/tools/qemu-xen-traditional/xenstore.c	2016-02-07 22:58:50.267277387 +0000
@@ -621,7 +621,7 @@
         params = xs_read(xsh, XBT_NULL, buf, &len);
         if (params == NULL)
             continue;
-	    pstrcpy(bs->filename, sizeof(bs->filename), params);
+	pstrcpy(bs->filename, sizeof(bs->filename), params);
 	}
 #else
         if (params[0]) {