summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-05-19 11:33:01 +0200
committerMartin Stransky <stransky@redhat.com>2016-05-19 11:33:01 +0200
commit9b1de3a8754287c30c540a6a9c20816b6bdcca5f (patch)
tree0065aba31a753947c16ed0a8fad01f7be6c41fb2
parentMerge branch 'master' into f23 (diff)
parentAdded a fix for mozbz#1245783 - gcc6.1 crashes in JIT (diff)
downloadlibrewolf-fedora-ff-9b1de3a8754287c30c540a6a9c20816b6bdcca5f.tar.gz
librewolf-fedora-ff-9b1de3a8754287c30c540a6a9c20816b6bdcca5f.tar.bz2
librewolf-fedora-ff-9b1de3a8754287c30c540a6a9c20816b6bdcca5f.zip
Merge branch 'master' into f23
-rw-r--r--firefox.spec23
-rw-r--r--mozilla-1245783.patch15
2 files changed, 21 insertions, 17 deletions
diff --git a/firefox.spec b/firefox.spec
index 7e09f5d..2c7ddca 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -34,13 +34,6 @@
%define system_jpeg 1
-# Separated plugins are supported on x86(64) only
-%ifarch %{ix86} x86_64
-%define separated_plugins 1
-%else
-%define separated_plugins 0
-%endif
-
%ifarch %{ix86} x86_64
%define run_tests 0
%else
@@ -92,7 +85,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 46.0.1
-Release: 4%{?pre_tag}%{?dist}
+Release: 5%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -138,6 +131,7 @@ Patch400: mozilla-1255590.patch
Patch402: mozilla-1196777.patch
Patch403: mozilla-1216658.patch
Patch404: mozilla-1270046.patch
+Patch405: mozilla-1245783.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -286,6 +280,7 @@ cd %{tarballdir}
%patch402 -p1 -b .1196777
%patch403 -p1 -b .1216658
%patch404 -p1 -b .1270046
+%patch405 -p1 -b .1245783
# Debian extension patch
%patch500 -p1 -b .440908
@@ -327,10 +322,6 @@ echo "ac_add_options --disable-system-cairo" >> .mozconfig
echo "ac_add_options --enable-system-ffi" >> .mozconfig
%endif
-%if !%{?separated_plugins}
-echo "ac_add_options --disable-ipc" >> .mozconfig
-%endif
-
%ifarch %{arm}
echo "ac_add_options --disable-elf-hack" >> .mozconfig
%endif
@@ -375,11 +366,6 @@ echo "ac_add_options --disable-ion" >> .mozconfig
echo "ac_add_options --disable-yarr-jit" >> .mozconfig
%endif
-#Workarounf for mozbz#1245783
-%if 0%{?fedora} > 23
-echo "ac_add_options --disable-ion" >> .mozconfig
-%endif
-
%ifnarch %{ix86} x86_64
echo "ac_add_options --disable-webrtc" >> .mozconfig
%endif
@@ -805,6 +791,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu May 19 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-5
+- Added a fix for mozbz#1245783 - gcc6.1 crashes in JIT
+
* Thu May 12 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-4
- Added fix for rhbz#1332821 - Crash on "Select" in "Open with" dialog
diff --git a/mozilla-1245783.patch b/mozilla-1245783.patch
new file mode 100644
index 0000000..2405fef
--- /dev/null
+++ b/mozilla-1245783.patch
@@ -0,0 +1,15 @@
+--- firefox-45.0.1-orig/js/src/Makefile.in 2016-05-17 14:53:58.753178403 +0200
++++ firefox-45.0.1/js/src/Makefile.in 2016-05-17 14:53:28.432817862 +0200
+@@ -144,6 +144,11 @@ distclean::
+
+ CFLAGS += $(MOZ_ZLIB_CFLAGS)
+
++# Avoid GNU gcc bug #70526
++# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70526#c14
++CFLAGS += -fno-schedule-insns2
++CXXFLAGS += -fno-schedule-insns2
++
+ # Silence warnings on AIX/HP-UX from non-GNU compilers
+ ifndef GNU_CC
+ ifeq ($(OS_ARCH),AIX)
+
bgstack15