[zorg] r274747 - [libcxx] Add -fno-exceptions libcxx builders to zorg

[Asiri Rathnayake via llvm-commits]

Author: asiri
Date: Thu Jul  7 06:15:15 2016
New Revision: 274747

URL: http://llvm.org/viewvc/llvm-project?rev=274747&view=rev
Log:
[libcxx] Add -fno-exceptions libcxx builders to zorg

This was approved in D14293 a while ago, I've forgot to commit it.

Change-Id: I97b20f9b0deeb0b95b1a854968434fc0ead1755f

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=274747&r1=274746&r2=274747&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jul  7 06:15:15 2016
@@ -976,18 +976,32 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         # Cortex-A15 LibC++ and LibC++abi tests (require Clang+RT)
-        {'name': 'libcxx-libcxxabi-arm-linux',
+        {'name': 'libcxx-libcxxabi-libunwind-arm-linux',
          'slavenames': ['linaro-chrome-01'],
-         'builddir': 'libcxx-libcxxabi-arm-linux',
+         'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
          '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"'},
+            lit_extra_opts={'link_flags': '"-lc++abi -lpthread -lunwind -ldl -lc -lm -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})},
+
+        {'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
+         'slavenames': ['linaro-chrome-01'],
+         'builddir': 'libcxx-libcxxabi-libunwind-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 -lpthread -lunwind -ldl -lc -lm -L/opt/llvm/lib/clang/3.6.0/lib/linux -lclang_rt.builtins-arm"'},
+            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+                              'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
+                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})},
     ]
 
 # Experimental and stopped builders