From 6cc58a85c3b3475de084943fbcc495cf557d4154 Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Jan 15 2012 18:40:27 +0000
Subject: Actually apply the xend-pci-loop.patch, compile fixes for gcc-4.7


---

diff --git a/localgcc47fix.patch b/localgcc47fix.patch
new file mode 100644
index 0000000..d959df9
--- /dev/null
+++ b/localgcc47fix.patch
@@ -0,0 +1,32 @@
+--- xen-4.1.2/xen/arch/x86/i8259.c.orig	2011-10-20 18:05:48.000000000 +0100
++++ xen-4.1.2/xen/arch/x86/i8259.c	2012-01-15 00:37:08.583827754 +0000
+@@ -62,7 +62,7 @@
+     IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
+     IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
+ 
+-    static void (*interrupt[])(void) = {
++    static void (asmlinkage *interrupt[])(void) = {
+         IRQLIST_16(0x0), IRQLIST_16(0x1), IRQLIST_16(0x2), IRQLIST_16(0x3),
+         IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
+         IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
+--- xen-4.1.2/xen/include/asm-x86/hvm/svm/intr.h.orig	2011-10-20 18:05:50.000000000 +0100
++++ xen-4.1.2/xen/include/asm-x86/hvm/svm/intr.h	2012-01-15 16:38:13.199784658 +0000
+@@ -21,6 +21,6 @@
+ #ifndef __ASM_X86_HVM_SVM_INTR_H__
+ #define __ASM_X86_HVM_SVM_INTR_H__
+ 
+-void svm_intr_assist(void);
++asmlinkage void svm_intr_assist(void);
+ 
+ #endif /* __ASM_X86_HVM_SVM_INTR_H__ */
+--- xen-4.1.2/xen/include/asm-x86/hvm/vmx/vmx.h.orig	2011-10-20 18:05:50.000000000 +0100
++++ xen-4.1.2/xen/include/asm-x86/hvm/vmx/vmx.h	2012-01-15 17:06:07.495853077 +0000
+@@ -63,7 +63,7 @@
+ 
+ void vmx_asm_vmexit_handler(struct cpu_user_regs);
+ void vmx_asm_do_vmentry(void);
+-void vmx_intr_assist(void);
++asmlinkage void vmx_intr_assist(void);
+ void vmx_do_resume(struct vcpu *);
+ void vmx_vlapic_msr_changed(struct vcpu *v);
+ void vmx_realmode(struct cpu_user_regs *regs);
diff --git a/xen.spec b/xen.spec
index 3301dd8..34ab1f2 100644
--- a/xen.spec
+++ b/xen.spec
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -51,6 +51,7 @@ Patch32: xen-4.1-testing.23190.patch
 Patch33: xend.empty.xml.patch
 Patch34: xend.catchbt.patch
 Patch35: xend-pci-loop.patch
+Patch36: localgcc47fix.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -180,6 +181,8 @@ to build the xen packages.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %patch100 -p1
 
@@ -562,6 +565,10 @@ rm -rf %{buildroot}
 %doc licensedir/*
 
 %changelog
+* Sun Jan 15 2012 Michael Young <m.a.young@durham.ac.uk> - 4.1.2-4
+- actually apply the xend-pci-loop.patch
+- compile fixes for gcc-4.7
+
 * Wed Jan 11 2012 Michael Young <m.a.young@durham.ac.uk> - 4.1.2-3
 - Add xend-pci-loop.patch to stop xend crashing with weird PCI cards (#767742)
 - avoid a backtrace if xend can't log to the standard file or a