From 1ecae28b94cdd4089cbb0e0fc86d038500182b5d Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Apr 03 2016 18:07:47 +0000
Subject: build with -fno-tree-coalesce-vars to avoid a crash on boot


---

diff --git a/xen.gcc6.fix.patch b/xen.gcc6.fix.patch
index 336ca35..5516e75 100644
--- a/xen.gcc6.fix.patch
+++ b/xen.gcc6.fix.patch
@@ -169,3 +169,14 @@
  	}
  #else
          if (params[0]) {
+--- xen-4.6.1/config/StdGNU.mk.orig	2016-02-09 14:44:19.000000000 +0000
++++ xen-4.6.1/config/StdGNU.mk	2016-04-03 17:46:41.413520321 +0100
+@@ -37,7 +37,7 @@
+ SHLIB_LDFLAGS = -shared
+ 
+ ifneq ($(debug),y)
+-CFLAGS += -O2 -fomit-frame-pointer
++CFLAGS += -O2 -fomit-frame-pointer -fno-tree-coalesce-vars
+ else
+ # Less than -O1 produces bad code and large stack frames
+ CFLAGS += -O1 -fno-omit-frame-pointer
diff --git a/xen.spec b/xen.spec
index 5e81884..88a3e6c 100644
--- a/xen.spec
+++ b/xen.spec
@@ -51,7 +51,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -895,6 +895,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Apr 03 2016 Michael Young <m.a.young@durham.ac.uk> - 4.6.1-5
+- build with -fno-tree-coalesce-vars to avoid a crash on boot
+
 * Tue Mar 29 2016 Michael Young <m.a.young@durham.ac.uk> - 4.6.1-4
 - fix for build problems on F25
 - broken AMD FPU FIP/FDP/FOP leak workaround [XSA-172, CVE-2016-3158,