[libcxxabi] Disable cxa_thread_atexit_test if unavailable

The feature check is already in place when building the library but wasn't
honored for the tests.

Differential Revision: http://reviews.llvm.org/D18205

llvm-svn: 263699
This commit is contained in:
Jonas Hahnfeld 2016-03-17 10:00:24 +00:00
parent 493028e8e2
commit 626557be6b
4 changed files with 8 additions and 0 deletions

View File

@ -10,6 +10,7 @@ pythonize_bool(LLVM_BUILD_32_BITS)
pythonize_bool(LIBCXXABI_ENABLE_SHARED)
pythonize_bool(LIBCXXABI_ENABLE_THREADS)
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)
pythonize_bool(LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
set(LIBCXXABI_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
"TargetInfo to use when setting up test environment.")
set(LIBCXXABI_EXECUTOR "None" CACHE STRING

View File

@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// REQUIRES: linux
// REQUIRES: thread_atexit
#include <assert.h>
#include <cxxabi.h>

View File

@ -33,6 +33,11 @@ class Configuration(LibcxxConfiguration):
self.libcxxabi_obj_root = self.get_lit_conf('libcxxabi_obj_root')
super(Configuration, self).configure_obj_root()
def configure_features(self):
super(Configuration, self).configure_features()
if self.get_lit_bool('thread_atexit', True):
self.config.available_features.add('thread_atexit')
def configure_compile_flags(self):
self.cxx.compile_flags += ['-DLIBCXXABI_NO_TIMER']
self.cxx.compile_flags += ['-funwind-tables']

View File

@ -13,6 +13,7 @@ config.use_sanitizer = "@LLVM_USE_SANITIZER@"
config.enable_32bit = "@LLVM_BUILD_32_BITS@"
config.target_info = "@LIBCXXABI_TARGET_INFO@"
config.executor = "@LIBCXXABI_EXECUTOR@"
config.thread_atexit = "@LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL@"
# Let the main config do the real work.
lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg")