From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- browser/config/mozconfigs/linux32/debug-fuzzing | 1 + browser/config/mozconfigs/linux32/nightly-fuzzing-asan | 1 + browser/config/mozconfigs/linux64/debug-asan | 2 ++ browser/config/mozconfigs/linux64/debug-fuzzing | 1 + browser/config/mozconfigs/linux64/debug-fuzzing-noopt | 1 + browser/config/mozconfigs/linux64/fuzzing-ccov | 1 + browser/config/mozconfigs/linux64/nightly-fuzzing-asan | 1 + browser/config/mozconfigs/linux64/nightly-fuzzing-asan-afl | 9 +++++++++ browser/config/mozconfigs/linux64/nightly-fuzzing-asan-noopt | 1 + browser/config/mozconfigs/linux64/nightly-fuzzing-asan-nyx | 1 + browser/config/mozconfigs/linux64/tsan-fuzzing | 1 + browser/config/mozconfigs/macosx64/debug-fuzzing | 1 + browser/config/mozconfigs/macosx64/nightly-fuzzing-asan | 1 + browser/config/mozconfigs/win32/debug-fuzzing | 1 + browser/config/mozconfigs/win64/debug-fuzzing | 1 + browser/config/mozconfigs/win64/fuzzing-ccov | 1 + browser/config/mozconfigs/win64/nightly-fuzzing-asan | 1 + browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- 19 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 browser/config/mozconfigs/linux64/nightly-fuzzing-asan-afl (limited to 'browser/config') diff --git a/browser/config/mozconfigs/linux32/debug-fuzzing b/browser/config/mozconfigs/linux32/debug-fuzzing index 1c1fcaccc8..bbd546d55d 100644 --- a/browser/config/mozconfigs/linux32/debug-fuzzing +++ b/browser/config/mozconfigs/linux32/debug-fuzzing @@ -7,6 +7,7 @@ export LLVM_SYMBOLIZER="$MOZ_FETCHES_DIR/llvm-symbolizer/bin/llvm-symbolizer" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux32/nightly-fuzzing-asan b/browser/config/mozconfigs/linux32/nightly-fuzzing-asan index 87eb7c6d81..1aca942d36 100644 --- a/browser/config/mozconfigs/linux32/nightly-fuzzing-asan +++ b/browser/config/mozconfigs/linux32/nightly-fuzzing-asan @@ -12,6 +12,7 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/debug-asan b/browser/config/mozconfigs/linux64/debug-asan index f4f08643b1..af44144d6b 100644 --- a/browser/config/mozconfigs/linux64/debug-asan +++ b/browser/config/mozconfigs/linux64/debug-asan @@ -8,6 +8,8 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan +ac_add_options --enable-gczeal + # Build with fuzzing support, so this build can also be used # to analyze fuzzing bugs with rr. ac_add_options --enable-fuzzing diff --git a/browser/config/mozconfigs/linux64/debug-fuzzing b/browser/config/mozconfigs/linux64/debug-fuzzing index c1b737cbb2..bd1c3d3e40 100644 --- a/browser/config/mozconfigs/linux64/debug-fuzzing +++ b/browser/config/mozconfigs/linux64/debug-fuzzing @@ -7,6 +7,7 @@ export LLVM_SYMBOLIZER="$MOZ_FETCHES_DIR/llvm-symbolizer/bin/llvm-symbolizer" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/debug-fuzzing-noopt b/browser/config/mozconfigs/linux64/debug-fuzzing-noopt index a3c94adfe1..7daf791cfd 100644 --- a/browser/config/mozconfigs/linux64/debug-fuzzing-noopt +++ b/browser/config/mozconfigs/linux64/debug-fuzzing-noopt @@ -7,6 +7,7 @@ export LLVM_SYMBOLIZER="$MOZ_FETCHES_DIR/llvm-symbolizer/bin/llvm-symbolizer" # Package js shell. export MOZ_PACKAGE_JSSHELL=1 +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/fuzzing-ccov b/browser/config/mozconfigs/linux64/fuzzing-ccov index bd6d45d01f..c30ef141ad 100644 --- a/browser/config/mozconfigs/linux64/fuzzing-ccov +++ b/browser/config/mozconfigs/linux64/fuzzing-ccov @@ -9,6 +9,7 @@ ac_add_options --disable-jemalloc ac_add_options --enable-debug-symbols=-g1 ac_add_options --enable-fuzzing +ac_add_options --enable-gczeal # Also, for consistency we disable the crash reporter and solely rely # on libFuzzer to provide stacks both in the browser fuzzing case as diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan index 114ced3ad6..d1b13e1ff7 100644 --- a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan @@ -14,6 +14,7 @@ ac_add_options --enable-valgrind # globally in mozconfig.asan because it requires an unstable -Z flag. export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address" +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-afl b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-afl new file mode 100644 index 0000000000..2487523229 --- /dev/null +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-afl @@ -0,0 +1,9 @@ +. "$topsrcdir/browser/config/mozconfigs/linux64/nightly-fuzzing-asan" + +export CC="$MOZ_FETCHES_DIR/afl-instrumentation/bin/afl-clang-fast" +export CXX="$MOZ_FETCHES_DIR/afl-instrumentation/bin/afl-clang-fast++" + +export HOST_CC="$MOZ_FETCHES_DIR/clang/bin/clang" +export HOST_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-noopt b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-noopt index 4743405afc..6359bad8e3 100644 --- a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-noopt +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-noopt @@ -14,6 +14,7 @@ ac_add_options --enable-valgrind # globally in mozconfig.asan because it requires an unstable -Z flag. export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address" +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-nyx b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-nyx index e970ce2576..01e90c305d 100644 --- a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-nyx +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan-nyx @@ -20,6 +20,7 @@ ac_add_options --enable-valgrind # globally in mozconfig.asan because it requires an unstable -Z flag. export RUSTFLAGS="$RUSTFLAGS -Zsanitizer=address" +ac_add_options --enable-gczeal ac_add_options --enable-snapshot-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/linux64/tsan-fuzzing b/browser/config/mozconfigs/linux64/tsan-fuzzing index c7da44cd2c..b14e0ded32 100644 --- a/browser/config/mozconfigs/linux64/tsan-fuzzing +++ b/browser/config/mozconfigs/linux64/tsan-fuzzing @@ -1,4 +1,5 @@ . "$topsrcdir/browser/config/mozconfigs/linux64/tsan" +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT diff --git a/browser/config/mozconfigs/macosx64/debug-fuzzing b/browser/config/mozconfigs/macosx64/debug-fuzzing index 7a852d4350..9a5b2402f5 100644 --- a/browser/config/mozconfigs/macosx64/debug-fuzzing +++ b/browser/config/mozconfigs/macosx64/debug-fuzzing @@ -1,5 +1,6 @@ . "$topsrcdir/browser/config/mozconfigs/macosx64/debug" +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Need this to prevent name conflicts with the normal nightly build packages diff --git a/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan b/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan index 2b6ea4f61f..2ab08af6a2 100644 --- a/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan +++ b/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan @@ -1,5 +1,6 @@ . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly-asan" +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Piggybacking UBSan for now since only a small subset of checks are enabled. diff --git a/browser/config/mozconfigs/win32/debug-fuzzing b/browser/config/mozconfigs/win32/debug-fuzzing index 874661253a..012d608436 100644 --- a/browser/config/mozconfigs/win32/debug-fuzzing +++ b/browser/config/mozconfigs/win32/debug-fuzzing @@ -3,6 +3,7 @@ # Disable telemetry. All network activity is undesirable in fuzzing. ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Need this to prevent name conflicts with the normal nightly build packages diff --git a/browser/config/mozconfigs/win64/debug-fuzzing b/browser/config/mozconfigs/win64/debug-fuzzing index a4d6931fe0..a523513354 100644 --- a/browser/config/mozconfigs/win64/debug-fuzzing +++ b/browser/config/mozconfigs/win64/debug-fuzzing @@ -3,6 +3,7 @@ # Disable telemetry. All network activity is undesirable in fuzzing. ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Need this to prevent name conflicts with the normal nightly build packages diff --git a/browser/config/mozconfigs/win64/fuzzing-ccov b/browser/config/mozconfigs/win64/fuzzing-ccov index d91f487dde..9cd1d69bd2 100644 --- a/browser/config/mozconfigs/win64/fuzzing-ccov +++ b/browser/config/mozconfigs/win64/fuzzing-ccov @@ -3,6 +3,7 @@ # Disable telemetry. All network activity is undesirable in fuzzing. ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Need this to prevent name conflicts with the normal nightly build packages diff --git a/browser/config/mozconfigs/win64/nightly-fuzzing-asan b/browser/config/mozconfigs/win64/nightly-fuzzing-asan index e0d9d0f178..d057d2783e 100644 --- a/browser/config/mozconfigs/win64/nightly-fuzzing-asan +++ b/browser/config/mozconfigs/win64/nightly-fuzzing-asan @@ -5,6 +5,7 @@ ac_add_options MOZ_TELEMETRY_REPORTING= ac_add_options --disable-crashreporter +ac_add_options --enable-gczeal ac_add_options --enable-fuzzing # Need this to prevent name conflicts with the normal nightly build packages diff --git a/browser/config/version.txt b/browser/config/version.txt index 9931f67c71..4aea959bf8 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -126.0.1 +127.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 9931f67c71..4aea959bf8 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -126.0.1 +127.0 -- cgit v1.2.3