[zorg] r220701 - Specialise ARM libcxx buildbot to work around bugs

[Renato Golin]

Author: rengolin
Date: Mon Oct 27 13:23:56 2014
New Revision: 220701

URL: http://llvm.org/viewvc/llvm-project?rev=220701&view=rev
Log:
Specialise ARM libcxx buildbot to work around bugs

There are some inconsistencies in the way linker flags are passed to the lit tests,
as well as problems in the Clang driver when selecting compiler-rt paths and libraries,
as well as conflicts between compiler-rt+libcxxabi and libgcc_s/libgcc_eh.

While it could take months to fix them all, we need the bot running as soon as possible,
so working around all those problems at once seem only logical.

There's one missing failure that needs further investigation, as it doens't seem like a
build issue, but a real bug.

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=220701&r1=220700&r2=220701&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Oct 27 13:23:56 2014
@@ -738,14 +738,19 @@ def _get_libcxx_builders():
             lit_extra_opts={'std':'c++14'}),
         'category': 'libcxx'},
 
-        # Cortex-A15 LibC++ and LibC++abi tests
+        # Cortex-A15 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-arm-linux',
          'slavenames': ['linaro-chrome-01'],
          'builddir': 'libcxx-libcxxabi-arm-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'True'})},
+            # 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'})},
     ]