Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -740,6 +758,15 @@ env={'CC': 'clang', 'CXX': 'clang++'}), 'category': 'libcxx'}, + # x86_64 -fno-exceptions libcxx builder + {'name': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions', + 'slavenames': ['gribozavr4'], + 'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions', + 'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder( + env={'CC': 'clang', 'CXX': 'clang++'}, + cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'}), + 'category': 'libcxx'}, + {'name': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian', 'slavenames': ['gribozavr4'], 'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian', @@ -840,6 +867,21 @@ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'True', 'CMAKE_C_FLAGS': '-mcpu=cortex-a15', 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})}, + + # Cortex-A15 -fno-exceptions libcxx builder + {'name': 'libcxx-libcxxabi-arm-linux-noexceptions', + 'slavenames': ['linaro-chrome-01'], + 'builddir': 'libcxx-libcxxabi-arm-linux-noexceptions', + 'category': 'libcxx', + 'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder( + env={'CC': 'clang', 'CXX': 'clang++'}, + # 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.6.0/lib/linux -lclang_rt.builtins-arm"'}, + cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'True', + 'CMAKE_C_FLAGS': '-mcpu=cortex-a15', + 'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15', + 'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'})}, ] # Experimental and stopped builders