From 9925a9a8fc056188a1a9538093ae601e4639e44b0012375113e1e9aa8e3c0665 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Thu, 21 May 2020 07:12:32 +0000
Subject: [PATCH] Accepting request 807895 from
 home:gary_lin:branches:Virtualization

disable gcc10 outline-atomics in AArch64 (bsc#1171643)

OBS-URL: https://build.opensuse.org/request/show/807895
OBS-URL: https://build.opensuse.org/package/show/Virtualization/ovmf?expand=0&rev=162
---
 ovmf-bsc1171643-workaround-outline-atomics.patch | 13 +++++++++++++
 ovmf.changes                                     |  6 ++++++
 ovmf.spec                                        |  4 ++++
 3 files changed, 23 insertions(+)
 create mode 100644 ovmf-bsc1171643-workaround-outline-atomics.patch

diff --git a/ovmf-bsc1171643-workaround-outline-atomics.patch b/ovmf-bsc1171643-workaround-outline-atomics.patch
new file mode 100644
index 0000000..4d5215d
--- /dev/null
+++ b/ovmf-bsc1171643-workaround-outline-atomics.patch
@@ -0,0 +1,13 @@
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 2b17d3b..cc510ae 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -2010,7 +2010,7 @@ DEFINE GCC5_ARM_ASM_FLAGS            = DEF(GCC49_ARM_ASM_FLAGS)
+ DEFINE GCC5_AARCH64_ASM_FLAGS        = DEF(GCC49_AARCH64_ASM_FLAGS)
+ DEFINE GCC5_ARM_CC_FLAGS             = DEF(GCC49_ARM_CC_FLAGS)
+ DEFINE GCC5_ARM_CC_XIPFLAGS          = DEF(GCC49_ARM_CC_XIPFLAGS)
+-DEFINE GCC5_AARCH64_CC_FLAGS         = DEF(GCC49_AARCH64_CC_FLAGS)
++DEFINE GCC5_AARCH64_CC_FLAGS         = DEF(GCC49_AARCH64_CC_FLAGS) -mno-outline-atomics
+ DEFINE GCC5_AARCH64_CC_XIPFLAGS      = DEF(GCC49_AARCH64_CC_XIPFLAGS)
+ DEFINE GCC5_ARM_DLINK_FLAGS          = DEF(GCC49_ARM_DLINK_FLAGS)
+ DEFINE GCC5_ARM_DLINK2_FLAGS         = DEF(GCC49_ARM_DLINK2_FLAGS) -Wno-error
diff --git a/ovmf.changes b/ovmf.changes
index ba7f385..0650183 100644
--- a/ovmf.changes
+++ b/ovmf.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 21 03:36:17 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Add ovmf-bsc1171643-workaround-outline-atomics.patch to disable
+  gcc10 outline-atomics in AArch64 (bsc#1171643)
+
 -------------------------------------------------------------------
 Mon Apr 20 06:11:25 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/ovmf.spec b/ovmf.spec
index f46feb6..404acb6 100644
--- a/ovmf.spec
+++ b/ovmf.spec
@@ -49,6 +49,7 @@ Patch3:         %{name}-pie.patch
 Patch4:         %{name}-disable-ia32-firmware-piepic.patch
 Patch5:         %{name}-set-fixed-enroll-time.patch
 Patch6:         %{name}-bsc1163927-fix-ping-and-ip6dxe.patch
+Patch7:         %{name}-bsc1171643-workaround-outline-atomics.patch
 Patch100:       openssl-fix-syntax-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bc
@@ -168,6 +169,9 @@ rm -rf $PKG_TO_REMOVE
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%if %{gcc_version} >= 10
+%patch7 -p1
+%endif
 
 # add openssl
 pushd CryptoPkg/Library/OpensslLib/openssl