Backed out changeset e89b6e3d3de8 (bug 1520163) for profile-guided optimization builds bustage CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Fri, 22 Feb 2019 23:27:42 +0200
changeset 518539 4978133d62260c9405d07d049e01bda746dee9af
parent 518538 901be6adcc2d3d3e24b1a2d70213cd12565e977e
child 518540 1033b5aecacc6e1ceae8a30639ff7b20cd322479
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1520163
milestone67.0a1
backs oute89b6e3d3de81c918b6fb6ed334a642d1f46bef2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e89b6e3d3de8 (bug 1520163) for profile-guided optimization builds bustage CLOSED TREE
build/mozconfig.nasm
taskcluster/ci/build/android.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/fetch/toolchains.yml
taskcluster/ci/static-analysis-autotest/kind.yml
taskcluster/ci/toolchain/nasm.yml
taskcluster/ci/valgrind/kind.yml
taskcluster/scripts/misc/build-nasm.sh
--- a/build/mozconfig.nasm
+++ b/build/mozconfig.nasm
@@ -2,11 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 case "$(uname -s)" in
 MINGW*)
     export NASM=$topsrcdir/nasm/nasm.exe
     ;;
 *)
-    export NASM=$topsrcdir/nasm/nasm
     ;;
 esac
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -49,17 +49,16 @@ android-api-16/debug:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-api-16-ccov/debug:
     description: "Android 4.0 api-16+ Debug Coverage"
     index:
         product: mobile
         job-name: android-api-16-ccov-debug
     treeherder:
@@ -108,17 +107,16 @@ android-api-16-ccov/debug:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-x86/opt:
     description: "Android 4.2 x86 Opt"
     index:
         product: mobile
         job-name: android-x86-opt
     attributes:
@@ -163,17 +161,16 @@ android-x86/opt:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-x86-fuzzing/debug:
     description: "Android x86 Fuzzing Debug"
     index:
         product: mobile
         job-name: android-x86-fuzzing-debug
     treeherder:
@@ -212,17 +209,16 @@ android-x86-fuzzing/debug:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-x86-nightly/opt:
     description: "Android 4.2 x86 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -271,17 +267,16 @@ android-x86-nightly/opt:
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 android-api-16/opt:
     description: "Android 4.0 api-16+ Opt"
     index:
         product: mobile
         job-name: android-api-16-opt
     attributes:
@@ -326,17 +321,16 @@ android-api-16/opt:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-api-16-without-google-play-services/opt:
     description: "Android 4.0 api-16+ (without Google Play Services) Opt"
     index:
         product: mobile
         job-name: android-api-16-without-google-play-services-opt
     treeherder:
@@ -378,17 +372,16 @@ android-api-16-without-google-play-servi
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-api-16-nightly/opt:
     description: "Android 4.0 api-16+ Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -491,17 +484,16 @@ android-aarch64/opt:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-aarch64/debug:
     description: "Android 5.0 AArch64 Debug"
     index:
         product: mobile
         job-name: android-aarch64-debug
     attributes:
@@ -546,17 +538,16 @@ android-aarch64/debug:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-aarch64-nightly/opt:
     description: "Android 5.0 AArch64 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -605,17 +596,16 @@ android-aarch64-nightly/opt:
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 android-x86_64/opt:
     description: "Android 5.0 x86-64 Opt"
     index:
         product: mobile
         job-name: android-x86_64-opt
     attributes:
@@ -660,17 +650,16 @@ android-x86_64/opt:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 android-x86_64-nightly/opt:
     description: "Android 5.0 x86-64 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -719,17 +708,16 @@ android-x86_64-nightly/opt:
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 android-x86_64/debug:
     description: "Android 5.0 x86-64 Debug"
     index:
         product: mobile
         job-name: android-x86_64-debug
     attributes:
@@ -774,10 +762,9 @@ android-x86_64/debug:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -24,17 +24,16 @@ linux64/opt:
     run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-plain/opt:
     description: "Linux64 Opt Plain"
     index:
         product: firefox
         job-name: linux64-plain-opt
     treeherder:
@@ -57,17 +56,16 @@ linux64-plain/opt:
         extra-config:
             disable_package_metrics: true
         mozconfig-variant: plain-opt
     run-on-projects: ['mozilla-central', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
-        - linux64-nasm
         - linux64-node
         - linux64-cbindgen
 
 linux64/pgo:
     description: "Linux64 PGO"
     # Disabled because bug 1516114 shows up much more often
     # use-pgo: true
     index:
@@ -98,17 +96,16 @@ linux64/pgo:
         # mozconfig-variant: profile-use
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-fuzzing/debug:
     description: "Linux64 Fuzzing Debug"
     index:
         product: firefox
         job-name: linux64-fuzzing-debug
     treeherder:
@@ -134,17 +131,16 @@ linux64-fuzzing/debug:
         need-xvfb: true
     toolchains:
         - linux64-clang
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
         - linux64-rust
         - linux64-rust-size
-        - linux64-nasm
         - linux64-node
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: firefox
         job-name: linux64-debug
     attributes:
@@ -169,17 +165,16 @@ linux64/debug:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-cbindgen
         - linux64-sccache
         - linux64-rust
         - linux64-rust-size
-        - linux64-nasm
         - linux64-node
 
 linux64-plain/debug:
     description: "Linux64 Debug Plain"
     index:
         product: firefox
         job-name: linux64-plain-debug
     treeherder:
@@ -202,17 +197,16 @@ linux64-plain/debug:
         mozconfig-variant: plain-debug
         script: mozharness/scripts/fx_desktop_build.py
         tooltool-downloads: public
     run-on-projects: [trunk]
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
-        - linux64-nasm
         - linux64-node
         - linux64-cbindgen
 
 linux64-devedition-nightly/opt:
     description: "Linux64 devedition Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
@@ -244,17 +238,16 @@ linux64-devedition-nightly/opt:
         mozconfig-variant: devedition
     run-on-projects: ['mozilla-beta']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 linux64-base-toolchains/opt:
     description: "Linux64 base toolchains Opt"
     index:
         product: firefox
         job-name: linux64-base-toolchains-opt
     treeherder:
@@ -278,17 +271,16 @@ linux64-base-toolchains/opt:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-4.0
         - linux64-gcc-6
         - linux64-rust-1.32
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm-2.13.02
         - linux64-node
 
 linux64-base-toolchains/debug:
     description: "Linux64 base toolchains Debug"
     index:
         product: firefox
         job-name: linux64-base-toolchains-debug
     treeherder:
@@ -314,17 +306,16 @@ linux64-base-toolchains/debug:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-4.0
         - linux64-gcc-6
         - linux64-rust-1.32
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm-2.13.02
         - linux64-node
 
 linux64-base-toolchains-clang/opt:
     description: "Linux64 base toolchains clang Opt"
     index:
         product: firefox
         job-name: linux64-base-toolchains-clang-opt
     treeherder:
@@ -345,17 +336,16 @@ linux64-base-toolchains-clang/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-4.0
         - linux64-rust-1.32
         - linux64-cbindgen
-        - linux64-nasm-2.13.02
         - linux64-node
 
 linux64-base-toolchains-clang/debug:
     description: "Linux64 base toolchains clang Debug"
     index:
         product: firefox
         job-name: linux64-base-toolchains-clang-debug
     treeherder:
@@ -378,17 +368,16 @@ linux64-base-toolchains-clang/debug:
         custom-build-variant-cfg: debug
         mozconfig-variant: debug
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-4.0
         - linux64-rust-1.32
         - linux64-cbindgen
-        - linux64-nasm-2.13.02
         - linux64-node
 
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: firefox
         job-name: linux-opt
     attributes:
@@ -412,17 +401,16 @@ linux/opt:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: firefox
         job-name: linux-debug
     attributes:
@@ -448,17 +436,16 @@ linux/debug:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux/pgo:
     description: "Linux32 PGO"
     index:
         product: firefox
         job-name: linux-pgo
     attributes:
@@ -483,17 +470,16 @@ linux/pgo:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux-rusttests/opt:
     description: "Linux32 Rust Tests Opt"
     index:
         product: firefox
         job-name: linux-rusttests-opt
     treeherder:
@@ -521,17 +507,16 @@ linux-rusttests/opt:
         need-xvfb: true
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux-rusttests/debug:
     description: "Linux32 Rust Tests Debug"
     index:
         product: firefox
         job-name: linux-rusttests-debug
     treeherder:
@@ -559,17 +544,16 @@ linux-rusttests/debug:
         need-xvfb: true
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux-devedition-nightly/opt:
     description: "Linux32 devedition Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -601,17 +585,16 @@ linux-devedition-nightly/opt:
         mozconfig-variant: devedition
     run-on-projects: ['mozilla-beta']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 linux-nightly/opt:
     description: "Linux32 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -639,17 +622,16 @@ linux-nightly/opt:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 linux64-asan/opt:
     description: "Linux64 Opt ASAN"
     index:
         product: firefox
         job-name: linux64-asan-opt
     treeherder:
@@ -674,17 +656,16 @@ linux64-asan/opt:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-asan-fuzzing/opt:
     description: "Linux64 Fuzzing Opt ASAN"
     index:
         product: firefox
         job-name: linux64-fuzzing-asan-opt
     treeherder:
@@ -709,17 +690,16 @@ linux64-asan-fuzzing/opt:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-asan-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt ASAN w/ Coverage"
     index:
         product: firefox
         job-name: linux64-ccov-fuzzing-asan-opt
     treeherder:
@@ -744,17 +724,16 @@ linux64-asan-fuzzing-ccov/opt:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt w/ Coverage"
     index:
         product: firefox
         job-name: linux64-ccov-fuzzing-opt
     treeherder:
@@ -780,17 +759,16 @@ linux64-fuzzing-ccov/opt:
         need-xvfb: true
     toolchains:
         - linux64-clang
         - linux64-gcc
         - linux64-cbindgen
         - linux64-rust-nightly
         - linux64-rust-size
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-asan-reporter-nightly/opt:
     description: "Linux64 Opt ASAN Reporter Nightly"
     attributes:
         nightly: true
     shipping-product:
         by-release-type:
@@ -823,17 +801,16 @@ linux64-asan-reporter-nightly/opt:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 linux64-asan/debug:
     description: "Linux64 Debug ASAN"
     index:
         product: firefox
         job-name: linux64-asan-debug
     treeherder:
@@ -858,17 +835,16 @@ linux64-asan/debug:
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-nightly/opt:
     description: "Linux64 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -895,17 +871,16 @@ linux64-nightly/opt:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 linux64-noopt/debug:
     description: "Linux64 No-optimize Debug"
     index:
         product: firefox
         job-name: linux64-noopt-debug
     treeherder:
@@ -931,17 +906,16 @@ linux64-noopt/debug:
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-rusttests/opt:
     description: "Linux64 Rust Tests Opt"
     index:
         product: firefox
         job-name: linux64-rusttests-opt
     treeherder:
@@ -968,17 +942,16 @@ linux64-rusttests/opt:
         need-xvfb: true
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-rusttests/debug:
     description: "Linux64 Rust Tests Debug"
     index:
         product: firefox
         job-name: linux64-rusttests-debug
     treeherder:
@@ -1005,17 +978,16 @@ linux64-rusttests/debug:
         need-xvfb: true
     run-on-projects: ['trunk', 'try']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-tup/opt:
     description: "Linux64 Tup"
     index:
         product: firefox
         job-name: linux64-tup-opt
     treeherder:
@@ -1042,17 +1014,16 @@ linux64-tup/opt:
     run-on-projects: []
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust-nightly
         - linux64-cbindgen
         - linux64-sccache
         - linux64-tup
-        - linux64-nasm
         - linux64-node
 
 linux64-ccov/debug:
     description: "Linux64-CCov Debug"
     index:
         product: firefox
         job-name: linux64-ccov-debug
     treeherder:
@@ -1082,17 +1053,16 @@ linux64-ccov/debug:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-7
         - linux64-rust-nightly
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
     fetches:
         toolchain:
             - linux64-grcov
 
 linux64-ccov/opt:
     description: "Linux64-CCov Opt"
     index:
@@ -1121,17 +1091,16 @@ linux64-ccov/opt:
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang-7
         - linux64-rust-nightly
         - linux64-gcc
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 linux64-add-on-devel/opt:
     description: "Linux64 add-on-devel"
     index:
         product: firefox
         job-name: linux64-add-on-devel
     treeherder:
@@ -1156,10 +1125,9 @@ linux64-add-on-devel/opt:
     run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
     toolchains:
         - linux64-binutils
         - linux64-clang
         - linux64-rust
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -30,17 +30,16 @@ macosx64/debug:
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: firefox
         job-name: macosx64-opt
     attributes:
@@ -68,17 +67,16 @@ macosx64/opt:
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 macosx64-asan-fuzzing/opt:
     description: "MacOS X x64 Cross-compile Fuzzing ASAN"
     index:
         product: firefox
         job-name: macosx64-fuzzing-asan-opt
     treeherder:
@@ -106,17 +104,16 @@ macosx64-asan-fuzzing/opt:
         - linux64-clang-macosx-cross
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 macosx64-devedition-nightly/opt:
     description: "MacOS X Dev Edition x64 Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -152,17 +149,16 @@ macosx64-devedition-nightly/opt:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
         product: firefox
         job-name: macosx64-noopt-debug
     treeherder:
@@ -192,17 +188,16 @@ macosx64-noopt/debug:
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         product: firefox
         job-name: macosx64-add-on-devel
     treeherder:
@@ -231,17 +226,16 @@ macosx64-add-on-devel/opt:
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
 
 macosx64-nightly/opt:
     description: "MacOS X x64 Cross-compile Nightly"
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
@@ -273,17 +267,16 @@ macosx64-nightly/opt:
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-macos
         - linux64-rust-size
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
 
 macosx64-ccov/debug:
     description: "MacOS X x64 Cross-compile Code Coverage"
     index:
         product: firefox
         job-name: macosx64-ccov-debug
     treeherder:
@@ -312,10 +305,9 @@ macosx64-ccov/debug:
         - linux64-clang-macosx-cross
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-rust-nightly-macos
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
-        - linux64-nasm
         - linux64-node
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1083,17 +1083,16 @@ win32-mingwclang/opt:
         mozconfig-variant: mingwclang
         need-xvfb: false
     toolchains:
         - mingw32-rust
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
         - linux64-clang-trunk-mingw-x86
         - linux64-mingw32-nsis
         - linux64-mingw-fxc2-x86
 
 win32-mingwclang/debug:
     description: "Win32 MinGW-Clang Debug"
     index:
@@ -1119,17 +1118,16 @@ win32-mingwclang/debug:
         mozconfig-variant: mingwclang-debug
         need-xvfb: false
     toolchains:
         - mingw32-rust
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
         - linux64-clang-trunk-mingw-x86
         - linux64-mingw32-nsis
         - linux64-mingw-fxc2-x86
 
 win64-mingwclang/opt:
     description: "Win64 MinGW-Clang Opt"
     index:
@@ -1155,17 +1153,16 @@ win64-mingwclang/opt:
         mozconfig-variant: mingwclang
         need-xvfb: false
     toolchains:
         - mingw32-rust
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
         - linux64-clang-trunk-mingw-x64
         - linux64-mingw32-nsis
         - linux64-mingw-fxc2-x86
 
 win64-mingwclang/debug:
     description: "Win64 MinGW-Clang Debug"
     index:
@@ -1191,13 +1188,12 @@ win64-mingwclang/debug:
         mozconfig-variant: mingwclang-debug
         need-xvfb: false
     toolchains:
         - mingw32-rust
         - linux64-upx
         - linux64-wine
         - linux64-sccache
         - linux64-cbindgen
-        - linux64-nasm
         - linux64-node
         - linux64-clang-trunk-mingw-x64
         - linux64-mingw32-nsis
         - linux64-mingw-fxc2-x86
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -172,28 +172,20 @@ mpfr-3.1.5:
     gpg-signature:
       sig-url: "{url}.asc"
       key-path: build/unix/build-gcc/07F3DBBECC1A39605078094D980C197698C3739D.key
 
 nasm-2.14.02:
   description: nasm 2.14.02 source code
   fetch:
     type: static-url
-    url: https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.xz
+    url: https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/nasm-2.14.02.tar.xz
     sha256: e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5
     size: 827620
 
-nasm-2.13.02:
-  description: nasm 2.13.02 source code
-  fetch:
-    type: static-url
-    url: https://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.xz
-    sha256: 8ac3235f49a6838ff7a8d7ef7c19a4430d0deecc0c2d3e3e237b5e9f53291757
-    size: 805744
-
 wix-3.1.1:
   description: wix 3.1.1 binary release
   # WIX doesn't use a wrapping toplevel DIR, so we should really repackage it when
   # Bug 1479533 and related code is ready.
   fetch:
     type: static-url
     url: https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip
     sha256: 37f0a533b0978a454efb5dc3bd3598becf9660aaf4287e55bf68ca6b527d051d
--- a/taskcluster/ci/static-analysis-autotest/kind.yml
+++ b/taskcluster/ci/static-analysis-autotest/kind.yml
@@ -54,17 +54,16 @@ jobs:
             keep-artifacts: false
         toolchains:
             - linux64-clang
             - linux64-clang-tidy
             - linux64-infer
             - linux64-rust
             - linux64-sccache
             - linux64-cbindgen
-            - linux64-nasm
             - linux64-node
 
     win64-st-autotest/debug:
         description: "Win64 Debug Static Analysis Autotest"
         index:
             job-name: win64-st-autotest-debug
         treeherder:
             platform: windows2012-64/debug
--- a/taskcluster/ci/toolchain/nasm.yml
+++ b/taskcluster/ci/toolchain/nasm.yml
@@ -1,49 +1,18 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-    worker:
-        max-run-time: 1800
-    run:
-        resources:
-            - 'taskcluster/scripts/misc/tooltool-download.sh'
-        toolchain-artifact: public/build/nasm.tar.bz2
-
 win64-nasm:
     description: "nasm win64 build"
     treeherder:
         symbol: TW64(nasm)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: mingw32-build}
+        max-run-time: 1800
     run:
         script: build-nasm.sh
-        arguments: ['win64']
+        resources:
+            - 'taskcluster/scripts/misc/tooltool-download.sh'
+        toolchain-artifact: public/build/nasm.tar.bz2
     toolchains:
         - linux64-clang-trunk-mingw-x64
     fetches:
         fetch:
             - nasm-2.14.02
-
-linux64-nasm:
-    description: "nasm linux64 build"
-    treeherder:
-        symbol: TL(nasm)
-    run:
-        script: build-nasm.sh
-        arguments: ['linux64']
-    fetches:
-        fetch:
-            - nasm-2.14.02
-
-linux64-nasm-2.13.02:
-    description: "nasm linux64 minimum supported version build"
-    treeherder:
-        symbol: TL(nasm-2.13.02)
-    run:
-        script: build-nasm.sh
-        arguments: ['linux64']
-    fetches:
-        fetch:
-            - nasm-2.13.02
--- a/taskcluster/ci/valgrind/kind.yml
+++ b/taskcluster/ci/valgrind/kind.yml
@@ -43,10 +43,9 @@ jobs:
             tooltool-downloads: public
             need-xvfb: true
         toolchains:
             - linux64-binutils
             - linux64-clang
             - linux64-rust
             - linux64-cbindgen
             - linux64-sccache
-            - linux64-nasm
             - linux64-node
--- a/taskcluster/scripts/misc/build-nasm.sh
+++ b/taskcluster/scripts/misc/build-nasm.sh
@@ -1,32 +1,25 @@
-
 #!/bin/bash
 set -x -e -v
 
-WORKSPACE=$HOME/workspace
-UPLOAD_DIR=$HOME/artifacts
-COMPRESS_EXT=bz2
+case "$(uname -s)" in
+    Linux)
+        WORKSPACE=$HOME/workspace
+        UPLOAD_DIR=$HOME/artifacts
+        COMPRESS_EXT=bz2
+        ;;
+esac
 
 cd $WORKSPACE/build/src
 
 . taskcluster/scripts/misc/tooltool-download.sh
+export PATH="$WORKSPACE/build/src/clang/bin:$PATH"
 
-cd $WORKSPACE/build/nasm-*
-case "$1" in
-    win64)
-        export PATH="$WORKSPACE/build/src/clang/bin:$PATH"
-        ./configure CC=x86_64-w64-mingw32-clang AR=llvm-ar RANLIB=llvm-ranlib --host=x86_64-w64-mingw32
-        EXE=.exe
-        ;;
-    *)
-        ./configure
-        EXE=
-        ;;
-esac
+cd $WORKSPACE/build/nasm-2.14.02
+./configure CC=x86_64-w64-mingw32-clang AR=llvm-ar RANLIB=llvm-ranlib --host=x86_64-w64-mingw32
 make -j$(nproc)
 
-mv nasm$EXE nasm-tmp
 mkdir nasm
-mv nasm-tmp nasm/nasm$EXE
+mv nasm.exe nasm/
 tar -acf nasm.tar.$COMPRESS_EXT nasm
 mkdir -p "$UPLOAD_DIR"
 cp nasm.tar.$COMPRESS_EXT "$UPLOAD_DIR"