From 8cbd6fd9e858dbc6f206775c8d1d31ebf39f02a0 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 14 Dec 2021 16:54:55 -0500 Subject: fix pgo.patch --- .gitignore | 1 + pgo.patch | 49 ++++++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index ae40b64..820c762 100644 --- a/.gitignore +++ b/.gitignore @@ -480,3 +480,4 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-94.0-20211031.tar.xz *.spec? .*.swp +*.source.tar.xz diff --git a/pgo.patch b/pgo.patch index 13a445b..257930a 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 @@ + 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 @@ + 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 -- cgit