rmaprath updated this revision to Diff 89485.
rmaprath added a comment.
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...).
https://reviews.llvm.org/D30290
Files:
buildbot/osuosl/master/config/builders.py
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
'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'},
@@ -1194,6 +1195,7 @@
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'})},
@@ -1224,6 +1226,7 @@
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'})},
]
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1044,7 +1044,8 @@
'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'},
@@ -1194,6 +1195,7 @@
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'})},
@@ -1224,6 +1226,7 @@
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'})},
]
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
