Merge commit 'acaa4c8bfd12' from llvm.org/main into next

Author: git apple-llvm automerger

libcxxabi/src/cxa_exception_storage.cpp

@@ -24,7 +24,7 @@ extern "C" {
 } // extern "C"
 } // namespace __cxxabiv1
 
-#elif defined(HAS_THREAD_LOCAL)
+#elif __has_feature(cxx_thread_local)
 
 namespace __cxxabiv1 {
 namespace {