From e4b7133ec2a85b1ad7ad8009fc5d9dbe15dbd8f2 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheff@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:07:55 +0000
Subject: [PATCH] Remove LTO disabling for x86_64 in Linux release build and
 fix CXXFLAGS in mozconfig

---
 .github/workflows/linux-release-build.yml | 4 ----
 configs/linux/mozconfig                   | 2 +-
 configs/windows/mozconfig                 | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index fba343cf7..3485ddeca 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -128,10 +128,6 @@ jobs:
         continue-on-error: true
         run: |
           export SURFER_PLATFORM="linux"
-          if test "${{ matrix.arch }}" = "x86_64-v3"; then
-            # TODO: Fix this!
-            export ZEN_DISABLE_LTO=1
-          fi
           sh .github/workflows/src/release-build.sh
 
       - name: Build again if it failed
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index ae948bc38..698edb33f 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -47,7 +47,7 @@ elif test "$ZEN_RELEASE"; then
 
     export CFLAGS="$CFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
     export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
-    export CXXFLAGS="$CXXFLAGS -O3 -fno-slp-vectorize -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
+    export CXXFLAGS="$CXXFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
     export LDFLAGS="$LDFLAGS -Wl,-O3 -Wl,-mllvm,-fp-contract=fast -march=x86-64-v3"
     export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64-v3 -C target-feature=+sse4.1 -C target-feature=+avx2 -C codegen-units=1 -Clink-args=--icf=safe"
 fi
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 5a81ab212..b90923498 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -26,6 +26,9 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
 if test "$SURFER_COMPAT" = "x86_64"; then
+  # FIXME: For some reason, the clang plugin is not working on generic x86_64 builds
+  ac_add_options --disable-clang-plugin
+
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine