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
@@ -348,7 +348,7 @@
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-apm-01", "linaro-armv8-01-aarch64-quick"],
+         'slavenames':["linaro-thx1-01-aarch64-quick", "linaro-armv8-01-aarch64-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -367,7 +367,7 @@
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04", "linaro-armv8-01-aarch64-lld"],
+         'slavenames':["linaro-thx1-01-aarch64-lld", "linaro-armv8-01-aarch64-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -387,7 +387,7 @@
 
         ## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default).
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-apm-06", "linaro-armv8-01-aarch64-global-isel"],
+         'slavenames':["linaro-thx1-01-aarch64-global-isel", "linaro-armv8-01-aarch64-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -1211,7 +1211,7 @@
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-armv8-01-aarch64-full"],
+         'slavenames':["linaro-thx1-01-aarch64-full", "linaro-armv8-01-aarch64-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
@@ -1532,7 +1532,7 @@
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx'],
+         'slavenames': ['linaro-thx1-01-aarch64-libcxx', 'linaro-armv8-01-aarch64-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1541,7 +1541,7 @@
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx-noeh'],
+         'slavenames': ['linaro-thx1-01-aarch64-libcxx-noeh', 'linaro-armv8-01-aarch64-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
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
@@ -45,20 +45,20 @@
         create_slave("linaro-armv8-01-arm-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
 
         # AArch64 Linaro slaves
-        create_slave("linaro-apm-01", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-apm-02", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-apm-03", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-apm-04", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-apm-05", properties={'jobs' : 8}, max_builds=1),
-        create_slave("linaro-apm-06", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-armv8-01-aarch64-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-quick", properties={'jobs' : 96}, max_builds=1),
         create_slave("linaro-armv8-01-aarch64-full", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-full", properties={'jobs' : 96}, max_builds=1),
         create_slave("linaro-armv8-01-aarch64-global-isel", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-global-isel", properties={'jobs' : 96}, max_builds=1),
         create_slave("linaro-armv8-01-aarch64-lld", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-lld", properties={'jobs' : 96}, max_builds=1),
         # Libcxx testsuite has tests with timing assumptions.  Run single-threaded to make
         # sure we have plenty CPU cycle to satisfy timing assumptions.
         create_slave("linaro-armv8-01-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),
         create_slave("linaro-armv8-01-aarch64-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
+        create_slave("linaro-thx1-01-aarch64-libcxx-noeh", properties={'jobs' : 1}, max_builds=1),
 
         # ARMv7 build cache slave
         create_slave("packet-linux-armv7-slave-1", properties={'jobs' : 64}, max_builds=1),