[libcxx] Add use-libunwind x86_64 builders to buildbot

[rmaprath]

Summary

Currently, only the ARM libcxx builder seems to test libunwind (-DLIBCXXABI_USE_LLVM_UNWINDER=ON cmake option).

This patch adds two x86_64 builders to do the same. Some minor cleanups too.

[gribozavr]

LGTM.

[rmaprath]

Thanks!

Committed as r271179.

Will be effective from the next buildmaster restart from @gkistanova.

/ Asiri

buildbot/osuosl/master/config/builders.py

                          c_compiler="clang",
                          cxx_compiler="clang++",
                          ompt=True,
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
         ]
 
 def _get_libcxx_builders():
     return [
+        # gribozavr's builders on gribozavr4 
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              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-libunwind-x86_64-linux-debian',
+         'slavenames': ['gribozavr4'],
+         'builddir': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+             env={'CC': 'clang', 'CXX': 'clang++'},
+             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
+         'category': 'libcxx'},
+
         {'name': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
              cmake_extra_opts={'LIBCXX_ENABLE_THREADS': 'OFF',
                                'LIBCXX_ENABLE_MONOTONIC_CLOCK': 'OFF',
                                'LIBCXXABI_ENABLE_THREADS': 'OFF'}),

          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LLVM_USE_SANITIZER': 'MemoryWithOrigins'},
             lit_extra_opts={'std':'c++1z'}),
         'category': 'libcxx'},
 
+        {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
+         'slavenames': ['ericwf-buildslave2'],
+         'builddir' : 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
+         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
+            env={'PATH': '/usr/local/bin:/usr/bin:/bin',
+                 'CC': 'clang', 'CXX': 'clang++'},
+            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
+        'category': 'libcxx'},
+
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
          'slavenames': ['ericwf-buildslave2'],
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LLVM_USE_SANITIZER': 'Thread'},
             lit_extra_opts={'std':'c++1z'}),

          'slavenames': ['linaro-chrome-01'],
          'builddir': 'libcxx-libcxxabi-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"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'True',
+            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15'})},
     ]
 
 # Experimental and stopped builders
 def _get_on_demand_builders():
     return [
         ]