Index: libcxxabi/trunk/test/CMakeLists.txt
===================================================================
--- libcxxabi/trunk/test/CMakeLists.txt
+++ libcxxabi/trunk/test/CMakeLists.txt
@@ -10,6 +10,7 @@
 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
Index: libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp
===================================================================
--- libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp
+++ libcxxabi/trunk/test/cxa_thread_atexit_test.pass.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: linux
+// REQUIRES: thread_atexit
 
 #include <assert.h>
 #include <cxxabi.h>
Index: libcxxabi/trunk/test/libcxxabi/test/config.py
===================================================================
--- libcxxabi/trunk/test/libcxxabi/test/config.py
+++ libcxxabi/trunk/test/libcxxabi/test/config.py
@@ -33,6 +33,11 @@
         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']
Index: libcxxabi/trunk/test/lit.site.cfg.in
===================================================================
--- libcxxabi/trunk/test/lit.site.cfg.in
+++ libcxxabi/trunk/test/lit.site.cfg.in
@@ -13,6 +13,7 @@
 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")