From a954e08dfb031c8dacff87b433646ff85a53354701e63eb9613d8baac9f66b6b Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 4 Mar 2016 23:20:29 +0000
Subject: [PATCH] - bsc#969377 - xen does not build with GCC 6  
 ipxe-use-rpm-opt-flags.patch   gcc6-warnings-as-errors.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=411
---
 gcc6-warnings-as-errors.patch | 33 +++++++++++++++++++++++++++++++++
 ipxe-use-rpm-opt-flags.patch  | 27 +++++++++++++++++++++++++++
 xen.changes                   |  7 +++++++
 xen.spec                      |  4 ++++
 4 files changed, 71 insertions(+)
 create mode 100644 gcc6-warnings-as-errors.patch
 create mode 100644 ipxe-use-rpm-opt-flags.patch

diff --git a/gcc6-warnings-as-errors.patch b/gcc6-warnings-as-errors.patch
new file mode 100644
index 0000000..79ab47c
--- /dev/null
+++ b/gcc6-warnings-as-errors.patch
@@ -0,0 +1,33 @@
+References: bsc#969377 - xen does not build with GCC 6
+
+--- xen-4.6.1-testing/xen/arch/x86/cpu/mcheck/non-fatal.c.orig	2016-03-04 15:59:08.000000000 -0700
++++ xen-4.6.1-testing/xen/arch/x86/cpu/mcheck/non-fatal.c	2016-03-04 16:00:25.000000000 -0700
+@@ -94,8 +94,8 @@ static int __init init_nonfatal_mce_chec
+ 	if (mce_disabled || !mce_available(c))
+ 		return -ENODEV;
+ 
+-    if ( __get_cpu_var(poll_bankmask) == NULL )
+-        return -EINVAL;
++	if ( __get_cpu_var(poll_bankmask) == NULL )
++		return -EINVAL;
+ 
+ 	/*
+ 	 * Check for non-fatal errors every MCE_RATE s
+--- xen-4.6.1-testing/extras/mini-os-remote/lib/sys.c.orig	2016-03-04 15:27:26.000000000 -0700
++++ xen-4.6.1-testing/extras/mini-os-remote/lib/sys.c	2016-03-04 15:30:32.000000000 -0700
+@@ -634,6 +634,7 @@ int closedir(DIR *dir)
+ 
+ /* We assume that only the main thread calls select(). */
+ 
++#if defined(LIBC_VERBOSE) || defined(LIBC_DEBUG)
+ static const char file_types[] = {
+     [FTYPE_NONE]	= 'N',
+     [FTYPE_CONSOLE]	= 'C',
+@@ -646,6 +647,7 @@ static const char file_types[] = {
+     [FTYPE_KBD]		= 'K',
+     [FTYPE_FB]		= 'G',
+ };
++#endif
+ #ifdef LIBC_DEBUG
+ static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
+ {
diff --git a/ipxe-use-rpm-opt-flags.patch b/ipxe-use-rpm-opt-flags.patch
new file mode 100644
index 0000000..3f170db
--- /dev/null
+++ b/ipxe-use-rpm-opt-flags.patch
@@ -0,0 +1,27 @@
+References: bsc#969377 - xen does not build with GCC 6
+
+Index: xen-4.6.1-testing/tools/firmware/etherboot/patches/ipxe-use-rpm-opt-flags.patch
+===================================================================
+--- /dev/null
++++ xen-4.6.1-testing/tools/firmware/etherboot/patches/ipxe-use-rpm-opt-flags.patch
+@@ -0,0 +1,11 @@
++--- ipxe/src/Makefile.orig	2016-03-04 15:48:15.000000000 -0700
+++++ ipxe/src/Makefile	2016-03-04 15:48:40.000000000 -0700
++@@ -4,7 +4,7 @@
++ #
++ 
++ CLEANUP		:=
++-CFLAGS		:=
+++CFLAGS		:= $(RPM_OPT_FLAGS) -Wno-error=array-bounds
++ ASFLAGS		:=
++ LDFLAGS		:=
++ MAKEDEPS	:= Makefile
+Index: xen-4.6.1-testing/tools/firmware/etherboot/patches/series
+===================================================================
+--- xen-4.6.1-testing.orig/tools/firmware/etherboot/patches/series
++++ xen-4.6.1-testing/tools/firmware/etherboot/patches/series
+@@ -5,3 +5,4 @@ build_fix_3.patch
+ build-compare.patch
+ build_fix_4.patch
+ ipxe-no-error-logical-not-parentheses.patch
++ipxe-use-rpm-opt-flags.patch
diff --git a/xen.changes b/xen.changes
index 888f27d..eab8d68 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  4 16:11:02 MST 2016 - carnold@suse.com
+
+- bsc#969377 - xen does not build with GCC 6
+  ipxe-use-rpm-opt-flags.patch
+  gcc6-warnings-as-errors.patch
+
 -------------------------------------------------------------------
 Thu Mar  3 10:27:55 MST 2016 - carnold@suse.com
 
diff --git a/xen.spec b/xen.spec
index 638f027..b2954ec 100644
--- a/xen.spec
+++ b/xen.spec
@@ -301,6 +301,8 @@ Patch601:       xen.build-compare.doc_html.patch
 Patch602:       xen.build-compare.seabios.patch
 Patch603:       xen.build-compare.man.patch
 Patch604:       ipxe-no-error-logical-not-parentheses.patch
+Patch605:       ipxe-use-rpm-opt-flags.patch
+Patch606:       gcc6-warnings-as-errors.patch
 # Build patches
 Patch99996:     xen.stubdom.newlib.patch
 Patch99998:     tmp_build.patch
@@ -611,6 +613,8 @@ Authors:
 %patch602 -p1
 %patch603 -p1
 %patch604 -p1
+%patch605 -p1
+%patch606 -p1
 # Build patches
 %patch99996 -p1
 %patch99998 -p1