From 6554d4f5574f16dc0cfe096b20790d73d0c775b1 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Oct 30 2020 18:05:42 +0000
Subject: - Work around gcc-11 stringop-overflow diagnostics as well


---

diff --git a/xen.gcc11.fixes.patch b/xen.gcc11.fixes.patch
index e3c4058..f6b67ac 100644
--- a/xen.gcc11.fixes.patch
+++ b/xen.gcc11.fixes.patch
@@ -43,3 +43,16 @@
  {
      unsigned long pt_prot = 0;
      if (prot & PROT_READ)
+diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
+index 320e06f..618ae92 100644
+--- a/xen/arch/x86/tboot.c
++++ b/xen/arch/x86/tboot.c
+@@ -91,7 +91,7 @@ static void __init tboot_copy_memory(unsigned char *va, uint32_t size,
+ 
+ void __init tboot_probe(void)
+ {
+-    tboot_shared_t *tboot_shared;
++    tboot_shared_t * volatile tboot_shared;
+ 
+     /* Look for valid page-aligned address for shared page. */
+     if ( !opt_tboot_pa || (opt_tboot_pa & ~PAGE_MASK) )
diff --git a/xen.spec b/xen.spec
index 531de5f..34c318c 100644
--- a/xen.spec
+++ b/xen.spec
@@ -58,7 +58,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.14.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
 Source0: https://downloads.xenproject.org/release/xen/%{version}/xen-%{version}.tar.gz
@@ -966,6 +966,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 4.14.0-6
+- Work around gcc-11 stringop-overflow diagnostics as well
+
 * Wed Oct 28 2020 Michael Young <m.a.young@durham.ac.uk> - 4.14.0-7
 - x86 PV guest INVLPG-like flushes may leave stale TLB entries
 	[XSA-286, CVE-2020-27674] (#1891092)