summarylogtreecommitdiffstats
path: root/0024-Fix-building-with-PGO-when-using-GCC.patch
diff options
context:
space:
mode:
authorBjörn Bidar2021-06-12 00:25:30 +0300
committerBjörn Bidar2021-08-21 06:51:44 +0300
commit6b850f75313f5a625728ce34c98267261a62f839 (patch)
tree08bbf47f18cd8f0ef8c41f9910e1c978f083860f /0024-Fix-building-with-PGO-when-using-GCC.patch
parent2b2b66786ae469ebed4309d757bb13808b737fdf (diff)
downloadaur-6b850f75313f5a625728ce34c98267261a62f839.tar.gz
Update to 89.0.2-1
- New upstream release - Update patches: - unity-menubar patch from Ubuntu - firefox-kde patches from openSUSE - Gentoo - Depend on GCC 11.2>= for fixes on c++: "perfect" implicitly deleted move
Diffstat (limited to '0024-Fix-building-with-PGO-when-using-GCC.patch')
-rw-r--r--0024-Fix-building-with-PGO-when-using-GCC.patch84
1 files changed, 0 insertions, 84 deletions
diff --git a/0024-Fix-building-with-PGO-when-using-GCC.patch b/0024-Fix-building-with-PGO-when-using-GCC.patch
deleted file mode 100644
index 8723704f4231..000000000000
--- a/0024-Fix-building-with-PGO-when-using-GCC.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 56bbe41b90385dbe33555a43ab85b4acc01d8a91 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 24/39] Fix building with PGO when using GCC
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- build/moz.configure/lto-pgo.configure | 5 +++--
- build/pgo/profileserver.py | 26 ++++++++++++++++++++++----
- 2 files changed, 25 insertions(+), 6 deletions(-)
-
-diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
-index e28bd14956..9cb78fc522 100644
---- a/build/moz.configure/lto-pgo.configure
-+++ b/build/moz.configure/lto-pgo.configure
-@@ -84,11 +84,12 @@
- @imports(_from="__builtin__", _import="min")
- def pgo_flags(compiler, profdata, target_is_windows):
- if compiler.type == "gcc":
-+ profile_use = "-fprofile-use"
- return namespace(
- gen_cflags=["-fprofile-generate"],
- gen_ldflags=["-fprofile-generate"],
-- use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
-- use_ldflags=["-fprofile-use"],
-+ use_cflags=[profile_use, "-fprofile-correction", "-Wcoverage-mismatch"],
-+ use_ldflags=[profile_use],
- )
-
- if compiler.type in ("clang-cl", "clang"):
-diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
-index 7f3de106ab..89289a7756 100755
---- a/build/pgo/profileserver.py
-+++ b/build/pgo/profileserver.py
-@@ -11,7 +11,7 @@ import glob
- import subprocess
-
- import mozcrash
--from mozbuild.base import MozbuildObject, BinaryNotFoundException
-+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
- from mozfile import TemporaryDirectory
- from mozhttpd import MozHttpd
- from mozprofile import FirefoxProfile, Preferences
-@@ -87,9 +87,22 @@ if __name__ == "__main__":
- locations = ServerLocations()
- locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
-
-- old_profraw_files = glob.glob("*.profraw")
-- for f in old_profraw_files:
-- os.remove(f)
-+ using_gcc = False
-+ try:
-+ if build.config_environment.substs.get("CC_TYPE") == "gcc":
-+ using_gcc = True
-+ except BuildEnvironmentNotFoundException:
-+ pass
-+
-+ if using_gcc:
-+ for dirpath, _, filenames in os.walk("."):
-+ for f in filenames:
-+ if f.endswith(".gcda"):
-+ os.remove(os.path.join(dirpath, f))
-+ else:
-+ old_profraw_files = glob.glob("*.profraw")
-+ for f in old_profraw_files:
-+ os.remove(f)
-
- with TemporaryDirectory() as profilePath:
- # TODO: refactor this into mozprofile
-@@ -212,6 +225,11 @@ if __name__ == "__main__":
- print("Firefox exited successfully, but produced a crashreport")
- sys.exit(1)
-
-+ if using_gcc:
-+ print("Copying profile data...")
-+ os.system("pwd");
-+ os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
-+
- llvm_profdata = env.get("LLVM_PROFDATA")
- if llvm_profdata:
- profraw_files = glob.glob("*.profraw")
---
-2.30.1
-