Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -18,6 +18,7 @@
 from zorg.buildbot.builders import AnnotatedBuilder
 from zorg.buildbot.builders import LLDPerformanceTestsuite
 from zorg.buildbot.builders import FuchsiaBuilder
+from zorg.buildbot.builders import XToolchainBuilder

 # Plain LLVM builders.
 def _get_llvm_builders():
@@ -154,6 +155,34 @@
                         "-DLLVM_ENABLE_ASSERTIONS=OFF",
                         "-DLLVM_OPTIMIZED_TABLEGEN=OFF",
                         "-DLLVM_LIT_ARGS='-v --threads=32'"])},
+
+        {'name' : "llvm-clang-win-x-armv7l",
+         'slavenames' : ["as-builder-1"],
+         'builddir' : "llvm-clang-win-x-armv7l",
+         'mergeRequests': False,
+         'factory': XToolchainBuilder.getCmakeWithMSVCBuildFactory(
+                      vs="autodetect",
+                      clean=True,
+                      extra_configure_args=[
+                        "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
+                        "-DLLVM_LIT_ARGS=-v -vv --threads=32",
+                      ],
+                      cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
+
+        {'name' : "llvm-clang-win-x-aarch64",
+         'slavenames' : ["as-builder-2"],
+         'builddir' : "llvm-clang-win-x-aarch64",
+         'mergeRequests': False,
+         'factory': XToolchainBuilder.getCmakeWithMSVCBuildFactory(
+                      vs="autodetect",
+                      clean=True,
+                      extra_configure_args=[
+                        "-DLLVM_TARGETS_TO_BUILD=AArch64",
+                        "-DCMAKE_C_COMPILER_TARGET=aarch64-linux-gnu",
+                        "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
+                        "-DLLVM_LIT_ARGS=-v -vv --threads=32",
+                      ],
+                      cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
     ]

 # Clang builders.
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -181,6 +181,12 @@
         # Debian x86_64 Buster Xeon(R) Gold 6154 CPU @ 3.00GHz, 192GB RAM
         create_slave("lldb-x86_64-debian", properties={'jobs': 72}, max_builds=1),

+        # Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
+        create_slave("as-builder-1", max_builds=1),
+
+        # Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
+        create_slave("as-builder-2", max_builds=1),
+
         # Windows dellfx2-sled3
         create_slave("as-builder-3", max_builds=1),