diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h --- a/libcxxabi/src/cxa_guard_impl.h +++ b/libcxxabi/src/cxa_guard_impl.h @@ -510,7 +510,7 @@ template _LIBCPP_SAFE_STATIC T GlobalStatic::instance = {}; -enum class Implementation { NoThreads, GlobalLock, Futex }; +enum class Implementation { NoThreads, GlobalMutex, Futex }; template struct SelectImplementation; @@ -521,7 +521,7 @@ }; template <> -struct SelectImplementation { +struct SelectImplementation { using type = InitByteGlobalMutex::instance, GlobalStatic::instance, PlatformThreadID>; }; @@ -539,7 +539,7 @@ #elif defined(_LIBCXXABI_USE_FUTEX) Implementation::Futex; #else - Implementation::GlobalLock; + Implementation::GlobalMutex; #endif static_assert(CurrentImplementation != Implementation::Futex || PlatformSupportsFutex(), diff --git a/libcxxabi/test/guard_test_basic.pass.cpp b/libcxxabi/test/guard_test_basic.pass.cpp --- a/libcxxabi/test/guard_test_basic.pass.cpp +++ b/libcxxabi/test/guard_test_basic.pass.cpp @@ -121,7 +121,7 @@ static_assert( std::is_same::value, ""); #else - static_assert(CurrentImplementation == Implementation::GlobalLock, ""); + static_assert(CurrentImplementation == Implementation::GlobalMutex, ""); static_assert( std::is_same< SelectedImplementation, diff --git a/libcxxabi/test/guard_threaded_test.pass.cpp b/libcxxabi/test/guard_threaded_test.pass.cpp --- a/libcxxabi/test/guard_threaded_test.pass.cpp +++ b/libcxxabi/test/guard_threaded_test.pass.cpp @@ -326,7 +326,7 @@ } void test_all_impls() { - using MutexImpl = SelectImplementation::type; + using MutexImpl = SelectImplementation::type; // Attempt to test the Futex based implementation if it's supported on the // target platform.