summaryrefslogtreecommitdiff
path: root/mozilla-1516081.patch
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2019-08-29 10:45:13 +0200
committerJan Horak <jhorak@redhat.com>2019-08-29 10:45:13 +0200
commit91a10435a53f9fba7a4895fee9f29271e45699d2 (patch)
treec973da3ddf980fe70089e12e5e6b727e5612e9da /mozilla-1516081.patch
parentFixed wrong spec file (diff)
parentUpdate to 69 (diff)
downloadlibrewolf-fedora-ff-91a10435a53f9fba7a4895fee9f29271e45699d2.tar.gz
librewolf-fedora-ff-91a10435a53f9fba7a4895fee9f29271e45699d2.tar.bz2
librewolf-fedora-ff-91a10435a53f9fba7a4895fee9f29271e45699d2.zip
Merge branch 'master' into f30
Diffstat (limited to 'mozilla-1516081.patch')
-rw-r--r--mozilla-1516081.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/mozilla-1516081.patch b/mozilla-1516081.patch
index 8eec605..1ecff39 100644
--- a/mozilla-1516081.patch
+++ b/mozilla-1516081.patch
@@ -1,7 +1,7 @@
-diff -up firefox-65.0/build/moz.configure/toolchain.configure.1516081 firefox-65.0/build/moz.configure/toolchain.configure
---- firefox-65.0/build/moz.configure/toolchain.configure.1516081 2019-01-24 19:48:38.000000000 +0100
-+++ firefox-65.0/build/moz.configure/toolchain.configure 2019-01-28 14:09:00.813320242 +0100
-@@ -1364,7 +1364,7 @@ def pgo_flags(compiler, build_env, targe
+diff -up firefox-69.0/build/moz.configure/toolchain.configure.1516081 firefox-69.0/build/moz.configure/toolchain.configure
+--- firefox-69.0/build/moz.configure/toolchain.configure.1516081 2019-08-27 03:31:51.000000000 +0200
++++ firefox-69.0/build/moz.configure/toolchain.configure 2019-08-29 10:42:45.872919255 +0200
+@@ -1411,7 +1411,7 @@ def pgo_flags(compiler, build_env, targe
if compiler.type == 'gcc':
return namespace(
@@ -10,19 +10,19 @@ diff -up firefox-65.0/build/moz.configure/toolchain.configure.1516081 firefox-65
gen_ldflags=['-fprofile-generate'],
use_cflags=['-fprofile-use', '-fprofile-correction',
'-Wcoverage-mismatch'],
-@@ -1385,7 +1385,8 @@ def pgo_flags(compiler, build_env, targe
+@@ -1434,7 +1434,8 @@ def pgo_flags(compiler, build_env, targe
if gen_ldflags:
return namespace(
-- gen_cflags=['-fprofile-instr-generate'],
-+ gen_cflags=['-fprofile-instr-generate',
+- gen_cflags=[prefix + '-fprofile-generate'],
++ gen_cflags=[prefix + '-fprofile-generate',
+ '-DMOZ_PROFILE_INSTRUMENTATION'],
gen_ldflags=gen_ldflags,
- use_cflags=['-fprofile-instr-use=%s' % profdata,
- '-Wno-error=profile-instr-out-of-date',
-diff -up firefox-65.0/toolkit/components/terminator/nsTerminator.cpp.1516081 firefox-65.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-65.0/toolkit/components/terminator/nsTerminator.cpp.1516081 2019-01-28 14:09:00.813320242 +0100
-+++ firefox-65.0/toolkit/components/terminator/nsTerminator.cpp 2019-01-28 14:11:56.745577302 +0100
+ use_cflags=[prefix + '-fprofile-use=%s' % profdata,
+ # Some error messages about mismatched profile data
+diff -up firefox-69.0/toolkit/components/terminator/nsTerminator.cpp.1516081 firefox-69.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-69.0/toolkit/components/terminator/nsTerminator.cpp.1516081 2019-08-27 03:32:05.000000000 +0200
++++ firefox-69.0/toolkit/components/terminator/nsTerminator.cpp 2019-08-29 09:51:08.513440687 +0200
@@ -419,6 +419,12 @@ void nsTerminator::StartWatchdog() {
}
}
bgstack15