From 9956bb1eafb6bf3ea0f56a3376530d423b1a1dd8 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 11 Jan 2022 19:47:58 +0100
Subject: Update to Firefox 96

---
 pgo.patch | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'pgo.patch')

diff --git a/pgo.patch b/pgo.patch
index bd92d1f..e7e715b 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,6 +1,6 @@
-diff -up firefox-95.0/build/moz.configure/lto-pgo.configure.pgo firefox-95.0/build/moz.configure/lto-pgo.configure
---- firefox-95.0/build/moz.configure/lto-pgo.configure.pgo	2021-12-03 16:04:48.441167077 +0100
-+++ firefox-95.0/build/moz.configure/lto-pgo.configure	2021-12-03 16:06:19.129415806 +0100
+diff -up firefox-96.0/build/moz.configure/lto-pgo.configure.pgo firefox-96.0/build/moz.configure/lto-pgo.configure
+--- firefox-96.0/build/moz.configure/lto-pgo.configure.pgo	2022-01-06 19:32:35.000000000 +0100
++++ firefox-96.0/build/moz.configure/lto-pgo.configure	2022-01-11 15:43:02.193378698 +0100
 @@ -248,8 +248,8 @@ def lto(
              cflags.append("-flto")
              ldflags.append("-flto")
@@ -21,9 +21,9 @@ diff -up firefox-95.0/build/moz.configure/lto-pgo.configure.pgo firefox-95.0/bui
          # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
          # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
          cflags.append("-fuse-ld=lld")
-diff -up firefox-95.0/build/pgo/profileserver.py.pgo firefox-95.0/build/pgo/profileserver.py
---- firefox-95.0/build/pgo/profileserver.py.pgo	2021-11-29 15:01:10.000000000 +0100
-+++ firefox-95.0/build/pgo/profileserver.py	2021-12-03 16:04:48.441167077 +0100
+diff -up firefox-96.0/build/pgo/profileserver.py.pgo firefox-96.0/build/pgo/profileserver.py
+--- firefox-96.0/build/pgo/profileserver.py.pgo	2022-01-06 16:56:23.000000000 +0100
++++ firefox-96.0/build/pgo/profileserver.py	2022-01-11 15:43:02.193378698 +0100
 @@ -11,7 +11,7 @@ import glob
  import subprocess
  
@@ -70,9 +70,9 @@ diff -up firefox-95.0/build/pgo/profileserver.py.pgo firefox-95.0/build/pgo/prof
          llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
-diff -up firefox-95.0/build/unix/mozconfig.unix.pgo firefox-95.0/build/unix/mozconfig.unix
---- firefox-95.0/build/unix/mozconfig.unix.pgo	2021-11-29 15:01:10.000000000 +0100
-+++ firefox-95.0/build/unix/mozconfig.unix	2021-12-03 16:04:48.441167077 +0100
+diff -up firefox-96.0/build/unix/mozconfig.unix.pgo firefox-96.0/build/unix/mozconfig.unix
+--- firefox-96.0/build/unix/mozconfig.unix.pgo	2022-01-06 16:56:24.000000000 +0100
++++ firefox-96.0/build/unix/mozconfig.unix	2022-01-11 15:43:02.193378698 +0100
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -89,18 +89,18 @@ diff -up firefox-95.0/build/unix/mozconfig.unix.pgo firefox-95.0/build/unix/mozc
      # We want to make sure we use binutils and other binaries in the tooltool
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-95.0/extensions/spellcheck/src/moz.build.pgo firefox-95.0/extensions/spellcheck/src/moz.build
---- firefox-95.0/extensions/spellcheck/src/moz.build.pgo	2021-11-29 15:01:12.000000000 +0100
-+++ firefox-95.0/extensions/spellcheck/src/moz.build	2021-12-03 16:04:48.441167077 +0100
-@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
- 
- if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-     CXXFLAGS += ["-Wno-error=shadow"]
+diff -up firefox-96.0/extensions/spellcheck/src/moz.build.pgo firefox-96.0/extensions/spellcheck/src/moz.build
+--- firefox-96.0/extensions/spellcheck/src/moz.build.pgo	2022-01-11 15:43:02.193378698 +0100
++++ firefox-96.0/extensions/spellcheck/src/moz.build	2022-01-11 15:49:52.929362701 +0100
+@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
+     "mozInlineSpellChecker.h",
+     "mozSpellChecker.h",
+ ]
 +
 +CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-95.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-95.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-95.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2021-11-29 15:01:30.000000000 +0100
-+++ firefox-95.0/toolkit/components/terminator/nsTerminator.cpp	2021-12-03 16:04:48.442167068 +0100
+diff -up firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-96.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-96.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-01-06 16:58:15.000000000 +0100
++++ firefox-96.0/toolkit/components/terminator/nsTerminator.cpp	2022-01-11 15:43:02.193378698 +0100
 @@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
    }
  #endif
-- 
cgit