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
@@ -1041,7 +1041,7 @@
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02"],
+         'slavenames':["linaro-apm-02", "linaro-apm-05"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=8,
@@ -1059,24 +1059,6 @@
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
-        # AArch64 Clang+LLVM+RT check-all at 42-bits VMA
-        {'name': "clang-cmake-aarch64-42vma",
-         'slavenames':["linaro-apm-05"],
-         'builddir':"clang-cmake-aarch64-42vma",
-         'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
-                      clean=False,
-                      checkout_compiler_rt=True,
-                      checkout_lld=False,
-                      test=True,
-                      useTwoStage=False,
-                      runTestSuite=False,
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57 -DSANITIZER_AARCH64_VMA=42'",
-                                        "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57 -DSANITIZER_AARCH64_VMA=42'",
-                                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
-               )},
-
           # Juno
           {'name' : "clang-native-aarch64-full",
            'slavenames' :["juno-aarch64-01"],