From 3698f8e8dadd3c34070f5deffb4da4226fa57f62 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 24 Aug 2021 01:01:39 +0000 Subject: [PATCH] Bug 1726474 - Enable wasm sandboxing on 64-bits Windows. r=firefox-build-system-reviewers,mhentges Differential Revision: https://phabricator.services.mozilla.com/D123042 --- taskcluster/ci/build/windows.yml | 19 +++++++++++++++++++ taskcluster/ci/instrumented-build/kind.yml | 1 + taskcluster/ci/searchfox/kind.yml | 1 + .../ci/static-analysis-autotest/kind.yml | 1 + toolkit/moz.configure | 1 + 5 files changed, 23 insertions(+) diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index 7b6136f93f97..26736d5f5e36 100644 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -169,6 +169,7 @@ win64/debug: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -223,6 +224,7 @@ win64-fuzzing/debug: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -266,6 +268,7 @@ win64-plain/debug: - win64-cbindgen - win64-winchecksec - win64-mozmake + - sysroot-wasm32-wasi optimization: skip-unless-expanded: null @@ -323,6 +326,7 @@ win64/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -364,6 +368,7 @@ win64-plain/opt: - win64-cbindgen - win64-winchecksec - win64-mozmake + - sysroot-wasm32-wasi optimization: skip-unless-expanded: null @@ -488,6 +493,7 @@ win64-shippable/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -590,6 +596,7 @@ win64-add-on-devel/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -641,6 +648,7 @@ win64-noopt/debug: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -822,6 +830,7 @@ win64-rusttests/opt: - win64-node - win64-winchecksec - win64-mozmake + - sysroot-wasm32-wasi optimization: test-inclusive: [rusttests] @@ -863,6 +872,7 @@ win64-rusttests/debug: - win64-node - win64-winchecksec - win64-mozmake + - sysroot-wasm32-wasi optimization: test-inclusive: [rusttests] @@ -912,6 +922,7 @@ win64-ccov/opt: - win64-node - win64-winchecksec - win64-mozmake + - sysroot-wasm32-wasi win64-asan/debug: description: "Win64 Debug ASAN" @@ -960,6 +971,7 @@ win64-asan/debug: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi - win64-llvm-symbolizer fetch: - nsis-3.01-win @@ -1015,6 +1027,7 @@ win64-asan/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi - win64-llvm-symbolizer fetch: - nsis-3.01-win @@ -1079,6 +1092,7 @@ win64-asan-reporter-shippable/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi - win64-llvm-symbolizer fetch: - nsis-3.01-win @@ -1259,6 +1273,7 @@ win64-devedition/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -1312,6 +1327,7 @@ win64-aarch64/debug: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -1373,6 +1389,7 @@ win64-aarch64/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -1578,6 +1595,7 @@ win64-aarch64-shippable-no-eme/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win @@ -1740,6 +1758,7 @@ win64-aarch64-devedition-no-eme/opt: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index a821f2910a63..0db145f77dfd 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -306,6 +306,7 @@ jobs: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index e73b850f6e5c..60d4114633db 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -148,6 +148,7 @@ jobs: - linux64-liblowercase - linux64-winchecksec - sysroot-x86_64-linux-gnu + - sysroot-wasm32-wasi fetch: - nsis-3.01-win - upx-3.95-win diff --git a/taskcluster/ci/static-analysis-autotest/kind.yml b/taskcluster/ci/static-analysis-autotest/kind.yml index d57c2030af4f..59ff1cabdd90 100644 --- a/taskcluster/ci/static-analysis-autotest/kind.yml +++ b/taskcluster/ci/static-analysis-autotest/kind.yml @@ -100,3 +100,4 @@ jobs: - win64-node - win64-dump_syms - win64-winchecksec + - sysroot-wasm32-wasi diff --git a/toolkit/moz.configure b/toolkit/moz.configure index fe170b9bd0f1..f4a9447bc32d 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -2073,6 +2073,7 @@ def default_wasm_sandboxing_libraries(libraries, target, automation): (target.kernel == "Linux" and target.os == "GNU" and target.cpu == "x86_64") or (target.os == "Android" and target.bitness == 64) or (target.kernel == "Darwin" and target.bitness == 64) + or (target.kernel == "WINNT" and target.bitness == 64) ): return libraries