Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
              lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
@@ -1183,17 +1184,17 @@
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
-        {'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
+        {'name': 'libcxx-libcxxabi-arm-linux-noexceptions',
          'slavenames': ['linaro-tk1-01'],
-         'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
+         'builddir': 'libcxx-libcxxabi-arm-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
-                              'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
+            cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1212,18 +1213,18 @@
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
-        {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
+        {'name': 'libcxx-libcxxabi-aarch64-linux-noexceptions',
          'slavenames': ['linaro-apm-03'],
-         'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
+         'builddir': 'libcxx-libcxxabi-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
             env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
-            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
-                              'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+            lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
+            cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
     ]