diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1244,6 +1244,24 @@
                         '-DLLVM_ENABLE_ZLIB=FALSE',
                         '-DLLVM_LIT_ARGS=-vj 8'])},
 
+    {'name' : "lldb-aarch64-windows",
+    'tags'  : ["lldb"],
+    'workernames' : ["linaro-lldb-aarch64-windows"],
+    'builddir': "lldb-aarch64-windows",
+    'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
+                    clean=True,
+                    test=True,
+                    extra_cmake_args=[
+                        '-DCLANG_DEFAULT_LINKER=lld',
+                        '-DLLDB_ENABLE_PYTHON=FALSE',
+                        '-DLLVM_NATIVE_ARCH=AArch64',
+                        '-DLLVM_HOST_TRIPLE=aarch64-windows-msvc',
+                        '-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-windows-msvc',
+                        '-DLLVM_FORCE_USE_OLD_TOOLCHAIN=True',
+                        '-DLLVM_ENABLE_ASSERTIONS=OFF',
+                        '-DLLVM_ENABLE_ZLIB=FALSE',
+                        '-DLLVM_LIT_ARGS=-vj 4'])},
+
 # LLD builders.
 
     {'name' : "lld-x86_64-win",
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -53,9 +53,10 @@
         create_worker("linaro-flang-aarch64-rel-assert", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-flang-aarch64-latest-gcc", properties={'jobs' : 32}, max_builds=1),
 
-        # AArch64
+        # AArch64 Windows Microsoft Surface X Pro 
         create_worker("linaro-armv8-windows-msvc-01", properties={'jobs' : 8}, max_builds=1),
         create_worker("linaro-armv8-windows-msvc-02", properties={'jobs' : 8}, max_builds=1),
+        create_worker("linaro-lldb-aarch64-windows", properties={'jobs' : 8}, max_builds=1),
 
         # Windows Server 2016 Intel Xeon(R) Quad 2.30 GHz, 56GB of RAM
         create_worker("win-py3-buildbot", properties={'jobs' : 64}, max_builds=1),