diff --git a/browser/config/mozconfigs/linux64/debug-lto b/browser/config/mozconfigs/linux64/debug-lto deleted file mode 100644 --- a/browser/config/mozconfigs/linux64/debug-lto +++ /dev/null @@ -1,17 +0,0 @@ -ac_add_options --enable-debug -ac_add_options --enable-optimize="-O1" - -. $topsrcdir/build/mozconfig.stylo - -. $topsrcdir/build/unix/mozconfig.lto - -# Enable Telemetry -export MOZ_TELEMETRY_REPORTING=1 - -# Package js shell. -export MOZ_PACKAGE_JSSHELL=1 - -# Need this to prevent name conflicts with the normal nightly build packages -export MOZ_PKG_SPECIAL=lto - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly-lto b/browser/config/mozconfigs/linux64/nightly-lto deleted file mode 100644 --- a/browser/config/mozconfigs/linux64/nightly-lto +++ /dev/null @@ -1,14 +0,0 @@ -ac_add_options --disable-debug -ac_add_options --enable-optimize="-O2" - -. $topsrcdir/build/mozconfig.stylo - -. $topsrcdir/build/unix/mozconfig.lto - -# Package js shell. -export MOZ_PACKAGE_JSSHELL=1 - -# Need this to prevent name conflicts with the normal nightly build packages -export MOZ_PKG_SPECIAL=lto - -. "$topsrcdir/build/mozconfig.common.override" diff --git a/build/unix/mozconfig.lto b/build/unix/mozconfig.lto deleted file mode 100644 --- a/build/unix/mozconfig.lto +++ /dev/null @@ -1,10 +0,0 @@ -MOZ_AUTOMATION_L10N_CHECK=0 - -. "$topsrcdir/build/unix/mozconfig.linux" - -# Use Clang as specified in manifest -export AR="$topsrcdir/clang/bin/llvm-ar" -export NM="$topsrcdir/clang/bin/llvm-nm" -export RANLIB="$topsrcdir/clang/bin/llvm-ranlib" - -ac_add_options --enable-lto diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -784,78 +784,10 @@ - linux64-rust-size - linux64-cbindgen - linux64-sccache - linux64-node -linux64-lto/opt: - description: "Linux64 Opt LTO" - index: - product: firefox - job-name: linux64-lto-opt - treeherder: - platform: linux64/lto - symbol: Bo - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-linux - worker: - env: - PERFHERDER_EXTRA_OPTIONS: "opt lto" - max-run-time: 7200 - run: - using: mozharness - actions: [get-secrets build check-test update] - config: - - builds/releng_base_firefox.py - - builds/releng_base_linux_64_builds.py - script: "mozharness/scripts/fx_desktop_build.py" - secrets: true - custom-build-variant-cfg: lto-tc - tooltool-downloads: public - need-xvfb: true - toolchains: - - linux64-binutils - - linux64-clang - - linux64-rust - - linux64-rust-size - - linux64-cbindgen - - linux64-sccache - - linux64-node - -linux64-lto/debug: - description: "Linux64 Debug LTO" - index: - product: firefox - job-name: linux64-lto-debug - treeherder: - platform: linux64/lto - symbol: Bd - tier: 2 - worker-type: aws-provisioner-v1/gecko-{level}-b-linux - worker: - env: - PERFHERDER_EXTRA_OPTIONS: "debug lto" - max-run-time: 7200 - run: - using: mozharness - actions: [get-secrets build check-test update] - config: - - builds/releng_base_firefox.py - - builds/releng_base_linux_64_builds.py - script: "mozharness/scripts/fx_desktop_build.py" - secrets: true - custom-build-variant-cfg: lto-tc-and-debug - tooltool-downloads: public - need-xvfb: true - toolchains: - - linux64-binutils - - linux64-clang - - linux64-rust - - linux64-rust-size - - linux64-cbindgen - - linux64-sccache - - linux64-node - linux64-nightly/opt: description: "Linux64 Nightly" attributes: nightly: true enable-full-crashsymbols: true diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc.py deleted file mode 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc.py +++ /dev/null @@ -1,10 +0,0 @@ -config = { - 'default_actions': [ - 'clobber', - 'build', - 'check-test', - # 'update', - ], - 'stage_platform': 'linux64-lto', - 'mozconfig_variant': 'nightly-lto', -} diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc_and_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc_and_debug.py deleted file mode 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_lto_tc_and_debug.py +++ /dev/null @@ -1,11 +0,0 @@ -config = { - 'default_actions': [ - 'clobber', - 'build', - 'check-test', - # 'update', - ], - 'stage_platform': 'linux64-lto-debug', - 'debug_build': True, - 'mozconfig_variant': 'debug-lto', -} diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -414,12 +414,10 @@ 'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py', 'debug': 'builds/releng_sub_%s_configs/%s_debug.py', 'fuzzing-debug': 'builds/releng_sub_%s_configs/%s_fuzzing_debug.py', 'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py', 'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py', - 'lto-tc': 'builds/releng_sub_%s_configs/%s_lto_tc.py', - 'lto-tc-and-debug': 'builds/releng_sub_%s_configs/%s_lto_tc_and_debug.py', 'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py', 'code-coverage-debug': 'builds/releng_sub_%s_configs/%s_code_coverage_debug.py', 'code-coverage-opt': 'builds/releng_sub_%s_configs/%s_code_coverage_opt.py', 'source': 'builds/releng_sub_%s_configs/%s_source.py', 'noopt-debug': 'builds/releng_sub_%s_configs/%s_noopt_debug.py',