From 18baa341fcb38b295c61f2e321221e2e60bea1d9 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Mon, 2 Sep 2024 14:02:18 +0200 Subject: [PATCH] chore: Update RUSTFLAGS in mozconfig files --- configs/linux/mozconfig | 4 ++-- configs/macos/mozconfig | 4 ++-- configs/windows/mozconfig | 4 ++-- src/browser/base/content/zen-styles/zen-compact-mode.css | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig index d5911f601..d2fe65764 100644 --- a/configs/linux/mozconfig +++ b/configs/linux/mozconfig @@ -37,7 +37,7 @@ if test "$ZEN_RELEASE"; then export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64" export CXXFLAGS="$CXXFLAGS -O3 -flto=thin -ffp-contract=fast -march=x86-64" export LDFLAGS="$LDFLAGS -Wl,-O3 -Wl,-mllvm,-fp-contract=fast -march=x86-64" - export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64 -C codegen-units=1" + export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64 -C codegen-units=1 -Clink-args=--icf=safe" else ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O3 -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul" @@ -46,7 +46,7 @@ if test "$ZEN_RELEASE"; then export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul" export CXXFLAGS="$CXXFLAGS -O3 -flto=thin -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -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" + 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 export VERBOSE=1 export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index 41029737e..80309f153 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -20,7 +20,7 @@ if test "$SURFER_COMPAT" = "true"; then export CPPFLAGS="-O3 -march=nehalem" export CXXFLAGS="-O3 -march=nehalem" export LDFLAGS="-Wl,-O3 -march=nehalem" - export RUSTFLAGS="-Ctarget-cpu=nehalem -C codegen-units=1" + export RUSTFLAGS="-Clink-args=--icf=safe -Ctarget-cpu=nehalem -C codegen-units=1" else ac_add_options --target=aarch64-apple-darwin @@ -30,7 +30,7 @@ else export CPPFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1" export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1" export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1" - export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1" + export RUSTFLAGS="-Clink-args=--icf=safe -C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1" fi export VERBOSE=1 export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index fc6e6a16a..929c4d98f 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -38,7 +38,7 @@ if test "$SURFER_COMPAT" = "true"; then export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w" export CXXFLAGS="-flto=thin -mtune=haswell -march=x86-64 -O2 -Qvec -w" export LDFLAGS="-Wl,-O2" - export RUSTFLAGS="-C codegen-units=1 -Ctarget-cpu=x86-64" + export RUSTFLAGS="-Clink-args=--icf=safe -C codegen-units=1 -Ctarget-cpu=x86-64" else ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -ftree-vectorize -Xclang -w" ac_add_options --enable-wasm-avx @@ -47,7 +47,7 @@ else export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3" export CXXFLAGS="-O2 -flto=thin -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3" export LDFLAGS="-Wl,-O3 -march=x86-64-v3" - export RUSTFLAGS="-C target-feature=+avx -C codegen-units=1 -Ctarget-cpu=x86-64-v3" + export RUSTFLAGS="-Clink-args=--icf=safe -C target-feature=+avx -C codegen-units=1 -Ctarget-cpu=x86-64-v3" fi export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine" export VERBOSE=1 diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css index d66acd22f..82eb4d21d 100644 --- a/src/browser/base/content/zen-styles/zen-compact-mode.css +++ b/src/browser/base/content/zen-styles/zen-compact-mode.css @@ -95,6 +95,7 @@ #navigator-toolbox:hover, #navigator-toolbox:focus-within, #navigator-toolbox[zen-user-show], + #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox, #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) { transform: none !important;