From b94e4dcff1a0798ae6fc56dd1124b7376699b836 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 8 Jan 2025 16:26:30 +0100
Subject: [PATCH] Remove MOZ_OPTIMIZE settings and override LTO settings in
 mozconfig for Linux and Windows

---
 configs/common/mozconfig  | 4 ----
 configs/linux/mozconfig   | 4 ++++
 configs/windows/mozconfig | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index a5956b9dd..83f5f361a 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -70,10 +70,6 @@ if test "$ZEN_RELEASE"; then
   MOZILLA_OFFICIAL=1
   export MOZILLA_OFFICIAL=1
 
-  mk_add_options MOZ_OPTIMIZE=2
-  MOZ_OPTIMIZE=2
-  export MOZ_OPTIMIZE=2
-
   export OPT_LEVEL="3"
   ac_add_options OPT_LEVEL="3"
 
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index 024972c0c..11df2433d 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -25,6 +25,10 @@ elif test "$SURFER_COMPAT" = "aarch64"; then
 
     ac_add_options --enable-optimize="-O3"
 
+    # override LTO settings
+    export MOZ_LTO=cross,thin
+    ac_add_options --enable-lto=cross,thin
+
     export CFLAGS="$CFLAGS -O3"
     export CPPFLAGS="$CPPFLAGS -O3"
     export CXXFLAGS="$CXXFLAGS -O3"
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 136c530e7..cee2f9b26 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -42,6 +42,10 @@ elif test "$SURFER_COMPAT" = "aarch64"; then
 
   ac_add_options --enable-optimize="-O2 -mtune=cortex-a55 -march=armv8.2-a+simd"
 
+  # override LTO settings
+  export MOZ_LTO=cross,thin
+  ac_add_options --enable-lto=cross,thin
+
   export CFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
   export CPPFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"
   export CXXFLAGS="-O2 -march=armv8.2-a+simd -mtune=cortex-a55"