[PATCH 1/6] [zorg] Remove obsolete workarounds for Arm/AArch64 libcxx bots

[maxim-kuvyrkov]

Summary

These bots now run on Ubuntu Xenial machines, which have clang3.8.
No need to override link_flags anymore.

[maxim-kuvyrkov]

Rebase after https://reviews.llvm.org/D40607 update

[maxim-kuvyrkov]

Ping?

Any yay/nay?

[maxim-kuvyrkov]

@gkistanova , would you please merge this before your next planned update to buildmaster? Thanks!

[maxim-kuvyrkov]

Rebase on trunk

buildbot/osuosl/master/config/builders.py

return [
         'category': 'libcxx'},
 
         # Cortex-A15 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-arm-linux',
          'slavenames': ['linaro-tk1-01'],
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # 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={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -marm',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
          'slavenames': ['linaro-tk1-01'],
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # 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={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               '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'})},
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # 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={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # 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={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
                               'CMAKE_C_COMPILER': 'clang',
                               'CMAKE_CXX_COMPILER': 'clang++',
                               'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57',