From 2967f737ef378b2d9196a5acca97b2bd28d8aece Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 2 Mar 2017 11:52:32 +0100
Subject: Test another ARMv7 build setup (rhbz#1426850)

---
 firefox.spec | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 6f52a09..0ef1399 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
 # Temporary disabled due to js crash
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
 
 # Use system nspr/nss?
 %define system_nss        1
@@ -97,7 +97,7 @@ ExcludeArch: armv7hl
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        51.0.1
-Release:        9%{?pre_tag}%{?dist}
+Release:        10%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -342,21 +342,25 @@ echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
 echo "ac_add_options --enable-dtrace" >> .mozconfig
 %else
-echo "ac_add_options --disable-debug" >> .mozconfig
-%ifarch ppc64le aarch64
-echo 'ac_add_options --enable-optimize="-g -O2"' >> .mozconfig
-%else
+# Fedora 26 (gcc7) needs to disable default build flags (mozbz#1342344)
 %if 0%{?fedora} > 25
-%ifarch s390 s390x
-# crashes in xpcshell with "-g -O2", potential gcc issue
-echo "ac_add_options --enable-optimize" >> .mozconfig
-%else
-echo 'ac_add_options --enable-optimize="-g -O2"' >> .mozconfig
+%ifnarch s390 s390x
+%define optimize_flags "-g -O2"
 %endif
-%else
-echo "ac_add_options --enable-optimize" >> .mozconfig
 %endif
+%ifarch armv7hl
+# ARMv7 need that (rhbz#1426850)
+%define optimize_flags "-g -O2 -fno-schedule-insns"
 %endif
+%ifarch ppc64le aarch64
+%define optimize_flags "-g -O2"
+%endif
+%if %{?optimize_flags}
+echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
+%else
+echo 'ac_add_options --enable-optimize' >> .mozconfig
+%endif
+echo "ac_add_options --disable-debug" >> .mozconfig
 %endif
 
 # s390(x) fails to start with jemalloc enabled
@@ -796,6 +800,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Mar 2 2017 Martin Stransky <stransky@redhat.com> - 51.0.1-10
+- Test another ARMv7 build setup (rhbz#1426850)
+
 * Mon Feb 27 2017 Martin Stransky <stransky@redhat.com> - 51.0.1-9
 - Disabled ARMv7 due to build failures (rhbz#1426850)
 
-- 
cgit