Updated to 95.0

1 files changed, 36 insertions, 33 deletions

diff --git a/pgo.patch b/pgo.patch
index 13a445b..bd92d1f 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,26 +1,29 @@
-diff -up firefox-88.0/build/moz.configure/lto-pgo.configure.pgo firefox-88.0/build/moz.configure/lto-pgo.configure
---- firefox-88.0/build/moz.configure/lto-pgo.configure.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/moz.configure/lto-pgo.configure	2021-04-19 13:45:00.240696430 +0200
-@@ -240,13 +240,13 @@ def lto(
-                 cflags.append("-flto")
-                 ldflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
--                ldflags.append("-flto=thin")
-+                cflags.append("-flto")
-+                ldflags.append("-flto")
-         elif c_compiler.type == "clang-cl":
-             if len(value) and value[0].lower() == "full":
-                 cflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
-+                cflags.append("-flto")
-             # 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-88.0/build/pgo/profileserver.py.pgo firefox-88.0/build/pgo/profileserver.py
---- firefox-88.0/build/pgo/profileserver.py.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/pgo/profileserver.py	2021-04-19 13:45:00.240696430 +0200
+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
+@@ -248,8 +248,8 @@ def lto(
+             cflags.append("-flto")
+             ldflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
+-            ldflags.append("-flto=thin")
++            cflags.append("-flto")
++            ldflags.append("-flto")
+ 
+         if target.os == "Android" and value == "cross":
+             # Work around https://github.com/rust-lang/rust/issues/90088
+@@ -265,7 +265,7 @@ def lto(
+         if value == "full":
+             cflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
++            cflags.append("-flto")
+         # 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
 @@ -11,7 +11,7 @@ import glob
  import subprocess
  
@@ -67,9 +70,9 @@ diff -up firefox-88.0/build/pgo/profileserver.py.pgo firefox-88.0/build/pgo/prof
          llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
-diff -up firefox-88.0/build/unix/mozconfig.unix.pgo firefox-88.0/build/unix/mozconfig.unix
---- firefox-88.0/build/unix/mozconfig.unix.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/unix/mozconfig.unix	2021-04-19 13:45:00.240696430 +0200
+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
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -86,19 +89,19 @@ diff -up firefox-88.0/build/unix/mozconfig.unix.pgo firefox-88.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-88.0/extensions/spellcheck/src/moz.build.pgo firefox-88.0/extensions/spellcheck/src/moz.build
---- firefox-88.0/extensions/spellcheck/src/moz.build.pgo	2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/extensions/spellcheck/src/moz.build	2021-04-19 13:45:00.240696430 +0200
+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"]
 +
 +CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-88.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2021-04-19 13:45:00.240696430 +0200
-+++ firefox-88.0/toolkit/components/terminator/nsTerminator.cpp	2021-04-19 13:46:01.144530790 +0200
-@@ -456,6 +456,11 @@ void nsTerminator::StartWatchdog() {
+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
+@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
    }
  #endif