From 742c194cda7fdd8be55f581ee61109254698d6f2 Mon Sep 17 00:00:00 2001
From: Joey Riches <josephriches@gmail.com>
Date: Sat, 11 Nov 2023 13:49:48 +0000
Subject: [PATCH] firefox: Reenable cross-lang PGO,ThinLTO

**Summary**
- Toolchain issues seem to have been resolved.
---
 packages/f/firefox/abi_used_symbols |  7 +++----
 packages/f/firefox/package.yml      |  5 +++--
 packages/f/firefox/pspec_x86_64.xml | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/f/firefox/abi_used_symbols b/packages/f/firefox/abi_used_symbols
index 4dda1e2d723..c550177b3cd 100644
--- a/packages/f/firefox/abi_used_symbols
+++ b/packages/f/firefox/abi_used_symbols
@@ -878,6 +878,9 @@ libgcc_s.so.1:_Unwind_GetTextRelBase
 libgcc_s.so.1:_Unwind_Resume
 libgcc_s.so.1:_Unwind_SetGR
 libgcc_s.so.1:_Unwind_SetIP
+libgcc_s.so.1:__floattidf
+libgcc_s.so.1:__powisf2
+libgcc_s.so.1:__umodti3
 libgdk-3.so.0:gdk_atom_intern
 libgdk-3.so.0:gdk_atom_name
 libgdk-3.so.0:gdk_beep
@@ -2058,7 +2061,6 @@ libm.so.6:nexttoward
 libm.so.6:pow
 libm.so.6:powf
 libm.so.6:rint
-libm.so.6:rintf
 libm.so.6:round
 libm.so.6:roundf
 libm.so.6:scalbn
@@ -2069,7 +2071,6 @@ libm.so.6:sinf
 libm.so.6:sinh
 libm.so.6:sinhf
 libm.so.6:sqrt
-libm.so.6:sqrtf
 libm.so.6:tan
 libm.so.6:tanf
 libm.so.6:tanh
@@ -2214,7 +2215,6 @@ libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9push_backEc
 libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2ERKS4_mm
 libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev
 libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_
-libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_replaceEmmPKwm
 libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE9_M_createERmm
 libstdc++.so.6:_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEE7_M_syncEPcmm
 libstdc++.so.6:_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEE3strERKNS_12basic_stringIcS2_S3_EE
@@ -2257,7 +2257,6 @@ libstdc++.so.6:_ZSt28__throw_bad_array_new_lengthv
 libstdc++.so.6:_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_
 libstdc++.so.6:_ZSt2wsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_
 libstdc++.so.6:_ZSt4cerr
-libstdc++.so.6:_ZSt4cout
 libstdc++.so.6:_ZSt4endlIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_
 libstdc++.so.6:_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RNSt7__cxx1112basic_stringIS4_S5_T1_EES4_
 libstdc++.so.6:_ZSt7nothrow
diff --git a/packages/f/firefox/package.yml b/packages/f/firefox/package.yml
index 9f94248aa4b..2cf9faaf080 100644
--- a/packages/f/firefox/package.yml
+++ b/packages/f/firefox/package.yml
@@ -1,6 +1,6 @@
 name       : firefox
 version    : 119.0.1
-release    : 295
+release    : 296
 source     :
     - https://ftp.mozilla.org/pub/firefox/releases/119.0.1/source/firefox-119.0.1.source.tar.xz : 48cc43cab060e97467e9a17617f511a177e7b91b7e77e408425351a2cbb07f70
     - https://sources.getsol.us/mozilla/firefox/firefox-119.0.1-langpacks.tar.zst : 473e093bc90d3ebf9c6d0bc72f82d63167578f9bb542e121630ca35c65be60a8
@@ -88,7 +88,8 @@ build      : |
 
         # Profile use build and enable lto
         sed -i '/--enable-profile-generate=cross/d' .mozconfig
-        echo "ac_add_options --enable-profile-use" >> .mozconfig
+        echo "ac_add_options --enable-lto=cross" >> .mozconfig
+        echo "ac_add_options --enable-profile-use=cross" >> .mozconfig
         echo "ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata" >> .mozconfig
         echo "ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog" >> .mozconfig
         ./mach build
diff --git a/packages/f/firefox/pspec_x86_64.xml b/packages/f/firefox/pspec_x86_64.xml
index 51103490c97..3ca585654c9 100644
--- a/packages/f/firefox/pspec_x86_64.xml
+++ b/packages/f/firefox/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>firefox</Name>
         <Homepage>https://www.mozilla.org/firefox/</Homepage>
         <Packager>
-            <Name>Troy Harvey</Name>
-            <Email>harveydevel@gmail.com</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <License>MPL-2.0</License>
@@ -189,12 +189,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="295">
-            <Date>2023-11-10</Date>
+        <Update release="296">
+            <Date>2023-11-11</Date>
             <Version>119.0.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Troy Harvey</Name>
-            <Email>harveydevel@gmail.com</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file