From dbeac13d86978473888e060f6cb200f9ac70e353 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 6 Nov 2018 17:04:54 +0100
Subject: [PATCH] Rebuild without GCC workaround

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
(cherry picked from commit dd7e950818b74d65a96fa9a01e26db984c00c040)
---
 mesa.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index 724c275..0676a87 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -43,7 +43,7 @@ Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 18.2.6
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -349,9 +349,6 @@ autoreconf -vfi
 %global asm_flags --disable-asm
 %endif
 
-#workaround store merging bug in gcc 8.2.1-4 (#1645400)
-export CFLAGS="%{optflags} -fno-store-merging"
-export CXXFLAGS="%{optflags} -fno-store-merging"
 %configure \
     %{?asm_flags} \
     --enable-libglvnd \
@@ -621,6 +618,9 @@ popd
 %{_includedir}/vulkan/
 
 %changelog
+* Tue Dec 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.6-2
+- Remove GCC workaround
+
 * Tue Dec  4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.2.6-1
 - Update to 18.2.6