Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -964,6 +964,17 @@
                                       '-DLLVM_USE_LINKER=gold',
                                       '-DCMAKE_C_COMPILER=clang',
                                       '-DCMAKE_CXX_COMPILER=clang++'])},
+        {'name': "lldb-aarch64-ubuntu",
+         'slavenames': ["linaro-thx1-lldb-aarch64"],
+         'builddir': "lldb-cmake-aarch64",
+         'category' : 'lldb',
+         'factory': LLDBBuilder.getLLDBCMakeBuildFactory(
+                    test=True,
+                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=True',
+                                      '-DLLVM_LIT_ARGS="-sv --threads=8"',
+                                      '-DLLVM_USE_LINKER=gold',
+                                      '-DCMAKE_C_COMPILER=clang',
+                                      '-DCMAKE_CXX_COMPILER=clang++'])},
         {'name': "lldb-x64-windows-ninja",
          'slavenames': ["win-py3-buildbot"],
          'builddir': "lldb-x64-windows-ninja",
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -43,6 +43,8 @@
         # sure we have plenty CPU cycle to satisfy timing assumptions.
         create_slave("linaro-armv8-01-arm-libcxx", properties={'jobs' : 1}, max_builds=1),
         create_slave("linaro-armv8-01-arm-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
+        # Packet.Net ThunderX1 for LLDB buildbot - Ubuntu Xenial 16.04 arm64 container
+        create_slave("linaro-thx1-lldb-aarch64", properties={'jobs': 16}, max_builds=1),
 
         # AArch64 Linaro slaves
         create_slave("linaro-armv8-01-aarch64-quick", properties={'jobs' : 64}, max_builds=1),
Index: zorg/trunk/buildbot/osuosl/master/config/status.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py
+++ zorg/trunk/buildbot/osuosl/master/config/status.py
@@ -275,6 +275,14 @@
             addLogs=False),
         InformativeMailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers = True,
+            extraRecipients = ["omair.javaid@linaro.org"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["lldb-aarch64-ubuntu"],
+            addLogs=False),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers= False,
             extraRecipients = ["vitalybuka@google.com", "eugenis@google.com"],
             subject="Build %(builder)s Failure",