From 6bf0a5cb5034a7e684dcc3500e841785237ce2dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 19:32:43 +0200 Subject: Adding upstream version 1:115.7.0. Signed-off-by: Daniel Baumann --- browser/config/mozconfigs/macosx64-aarch64/beta | 5 ++++ .../config/mozconfigs/macosx64-aarch64/common-opt | 30 ++++++++++++++++++++++ .../mozconfigs/macosx64-aarch64/cross-noopt-debug | 11 ++++++++ .../mozconfigs/macosx64-aarch64/debug-fuzzing | 5 ++++ .../config/mozconfigs/macosx64-aarch64/devedition | 19 ++++++++++++++ browser/config/mozconfigs/macosx64-aarch64/nightly | 12 +++++++++ .../macosx64-aarch64/nightly-fuzzing-asan | 5 ++++ browser/config/mozconfigs/macosx64-aarch64/release | 5 ++++ 8 files changed, 92 insertions(+) create mode 100644 browser/config/mozconfigs/macosx64-aarch64/beta create mode 100644 browser/config/mozconfigs/macosx64-aarch64/common-opt create mode 100644 browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug create mode 100644 browser/config/mozconfigs/macosx64-aarch64/debug-fuzzing create mode 100644 browser/config/mozconfigs/macosx64-aarch64/devedition create mode 100644 browser/config/mozconfigs/macosx64-aarch64/nightly create mode 100644 browser/config/mozconfigs/macosx64-aarch64/nightly-fuzzing-asan create mode 100644 browser/config/mozconfigs/macosx64-aarch64/release (limited to 'browser/config/mozconfigs/macosx64-aarch64') diff --git a/browser/config/mozconfigs/macosx64-aarch64/beta b/browser/config/mozconfigs/macosx64-aarch64/beta new file mode 100644 index 0000000000..c5c7d9558a --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/beta @@ -0,0 +1,5 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt" + +ac_add_options --enable-official-branding + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64-aarch64/common-opt b/browser/config/mozconfigs/macosx64-aarch64/common-opt new file mode 100644 index 0000000000..dece8d3f14 --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/common-opt @@ -0,0 +1,30 @@ +# This file is sourced by the nightly, beta, and release mozconfigs. + +. $topsrcdir/build/macosx/mozconfig.common + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} + +if test `uname -s` != Linux; then +APIKEYDIR="${APIKEYDIR:-${WORKSPACE}}" +else +APIKEYDIR="${APIKEYDIR:-/builds}" +fi + +ac_add_options --with-google-location-service-api-keyfile=${APIKEYDIR}/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=${APIKEYDIR}/sb-gapi.data +ac_add_options --with-mozilla-api-keyfile=${APIKEYDIR}/mozilla-desktop-geoloc-api.key + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 + +ac_add_options --target=aarch64-apple-darwin + +# As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target, +# but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables +# a bunch of # performance-enabling CPU features. +# TODO: We'll want to switch to aarch64-apple-macos eventually. +export CFLAGS="$CFLAGS -mcpu=apple-m1" +export CXXFLAGS="$CXXFLAGS -mcpu=apple-m1" diff --git a/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug b/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug new file mode 100644 index 0000000000..5a95a8e6c3 --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/cross-noopt-debug @@ -0,0 +1,11 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 + +# Developers often build with these options for a better debugging experience. +. "$topsrcdir/browser/config/mozconfigs/macosx64/debug" + +ac_add_options --target=aarch64-apple-darwin + +# We add this last to guard against inadvertent changes in the debug config. +# It may conflict with settings from mozconfig.override, but that seems +# unlikely. +ac_add_options --disable-optimize diff --git a/browser/config/mozconfigs/macosx64-aarch64/debug-fuzzing b/browser/config/mozconfigs/macosx64-aarch64/debug-fuzzing new file mode 100644 index 0000000000..89768e54fe --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/debug-fuzzing @@ -0,0 +1,5 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64/debug-fuzzing" + +ac_add_options --target=aarch64-apple-darwin + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64-aarch64/devedition b/browser/config/mozconfigs/macosx64-aarch64/devedition new file mode 100644 index 0000000000..f9e0159864 --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/devedition @@ -0,0 +1,19 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt" + +# Add-on signing is not required for DevEdition +MOZ_REQUIRE_SIGNING= + +ac_add_options --enable-instruments + +# Cross-compiled builds fail when dtrace is enabled +if test `uname -s` != Linux; then + ac_add_options --enable-dtrace +fi + +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then +ac_add_options --with-macbundlename-prefix=Firefox +fi + +ac_add_options --with-branding=browser/branding/aurora + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64-aarch64/nightly b/browser/config/mozconfigs/macosx64-aarch64/nightly new file mode 100644 index 0000000000..742b1bc7b6 --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/nightly @@ -0,0 +1,12 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt" + +ac_add_options --enable-instruments + +# Cross-compiled builds fail when dtrace is enabled +if test `uname -s` != Linux; then + ac_add_options --enable-dtrace +fi + +ac_add_options --with-branding=browser/branding/nightly + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64-aarch64/nightly-fuzzing-asan b/browser/config/mozconfigs/macosx64-aarch64/nightly-fuzzing-asan new file mode 100644 index 0000000000..a0b0d1695c --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/nightly-fuzzing-asan @@ -0,0 +1,5 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan" + +ac_add_options --target=aarch64-apple-darwin + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64-aarch64/release b/browser/config/mozconfigs/macosx64-aarch64/release new file mode 100644 index 0000000000..c5c7d9558a --- /dev/null +++ b/browser/config/mozconfigs/macosx64-aarch64/release @@ -0,0 +1,5 @@ +. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt" + +ac_add_options --enable-official-branding + +. "$topsrcdir/build/mozconfig.common.override" -- cgit v1.2.3