[libcxx][zorg] Fix no-exceptions builder configurations

[rmaprath]

Summary

The no-exceptions builders are missing the -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF flag (without this, only the libc++ libraries will be built without exceptions support, libc++abi will still be built with exceptions support - this is not a meaningful configuration).

Also we should not need to link in libunwind for these configurations. No-exceptions libraries by definition should not require an unwinder.

[rengolin]

buildbot/osuosl/master/config/builders.py

1196 ↗

(On Diff #89479)

Why remove the unwinder?

[rmaprath]

buildbot/osuosl/master/config/builders.py

1196 ↗

(On Diff #89479)

The unwinder should not be required for the no-exceptions library testing, as these libraries do not throw/catch any exceptions.

/ Asiri

[rengolin]

buildbot/osuosl/master/config/builders.py

1196 ↗

(On Diff #89479)

But the requirement is not only to test it, but to make them work. We had trouble making the bot pass without the unwinder, due to dependencies.

Regardless, this is a *different* change and should be made later, with proper research. For now, just add the new flag, please.

[rmaprath]

Updated to address comments from @rengolin.

In theory, it should not be necessary to link-in or enable the unwinder for these tests. However, it is best to leave this for a separate patch (after some local testing), just to make sure that none of those other libraries attempt to reference symbols from the unwinder (they should not, but who knows...).

[rmaprath]

buildbot/osuosl/master/config/builders.py

1196 ↗

(On Diff #89479)

If you have a time (heh!), please do try out without the unwinder and see if it still works fine. I'll be quite interested if it doesn't.

Downstream we have even more stricter tests to make sure there are no exception tables in the final binaries, but this require special linker options. It would be good to make sure that we can at least do without the unwinder upstream :)

[rengolin]

LGTM, thanks!

I'll add a local task to look into that, but with Connect coming, I'm not sure how long that will take. :)

[rmaprath]

Thanks!

Committed as r295963.

@gkistanova: Could you please let me know when the next restart is due? I would like to keep an eye on the builders.

Cheers,

/ Asiri

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

return [
              check_libcxx_abilist=True),
          'category': 'libcxx'},
 
         {'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'},
+             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
              lit_extra_args=['--shuffle']),
          '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++'},
return [
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
             # 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={'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'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
return [
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
             env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
             # 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={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
     ]
 
 # Experimental and stopped builders
 def _get_on_demand_builders():
     return [
         ]