5 files changed, 45 insertions, 0 deletions
diff --git a/build/win64-aarch64/mozconfig.vs-latest b/build/win64-aarch64/mozconfig.vs-latest
new file mode 100644
index 0000000000..2d7e28ae08
--- /dev/null
+++ b/build/win64-aarch64/mozconfig.vs-latest
@@ -0,0 +1,3 @@
+. $topsrcdir/build/win64-aarch64/mozconfig.vs2019
+. "$topsrcdir/build/mozconfig.clang-cl"
+. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64-aarch64/mozconfig.vs2019 b/build/win64-aarch64/mozconfig.vs2019
new file mode 100644
index 0000000000..ac2e7eefe3
--- /dev/null
+++ b/build/win64-aarch64/mozconfig.vs2019
@@ -0,0 +1,8 @@
+if [ -z "${VSPATH}" ]; then
+    VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
+fi
+
+if [ -d "${VSPATH}" ]; then
+    export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/arm64/Microsoft.VC142.CRT"
+    export WINSYSROOT="${VSPATH}"
+fi
diff --git a/build/win64/mozconfig.asan b/build/win64/mozconfig.asan
new file mode 100644
index 0000000000..8aa1810b78
--- /dev/null
+++ b/build/win64/mozconfig.asan
@@ -0,0 +1,23 @@
+. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
+
+if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
+    CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/windows && pwd)"
+
+    export LDFLAGS="clang_rt.asan_dynamic-x86_64.lib clang_rt.asan_dynamic_runtime_thunk-x86_64.lib"
+
+    export MOZ_COPY_PDBS=1
+    export LLVM_SYMBOLIZER="$MOZ_FETCHES_DIR/llvm-symbolizer/bin/llvm-symbolizer.exe"
+    export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/clang_rt.asan_dynamic-x86_64.dll"
+fi
+
+# Enable ASan specific code and build workarounds
+ac_add_options --enable-address-sanitizer
+
+# Mandatory options required for ASan builds
+ac_add_options --enable-debug-symbols
+ac_add_options --disable-jemalloc
+ac_add_options --disable-crashreporter
+ac_add_options --disable-profiling
+
+. "$topsrcdir/build/mozconfig.clang-cl"
+. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest
new file mode 100644
index 0000000000..4caed70ae7
--- /dev/null
+++ b/build/win64/mozconfig.vs-latest
@@ -0,0 +1,3 @@
+. $topsrcdir/build/win64/mozconfig.vs2019
+. "$topsrcdir/build/mozconfig.clang-cl"
+. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64/mozconfig.vs2019 b/build/win64/mozconfig.vs2019
new file mode 100644
index 0000000000..e0d5da8203
--- /dev/null
+++ b/build/win64/mozconfig.vs2019
@@ -0,0 +1,8 @@
+if [ -z "${VSPATH}" ]; then
+    VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
+fi
+
+if [ -d "${VSPATH}" ]; then
+    export WIN32_REDIST_DIR=${VSPATH}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT
+    export WINSYSROOT="${VSPATH}"
+fi