From b23fc2c5bf92ae3bcd2ac4c784ead0ffba159f5a Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 6 Dec 2024 15:30:02 -0500 Subject: [PATCH] [libc++abi] Fix broken check for _LIBCPP_HAS_THREAD_API_PTHREAD (#118999) We were still using the old `defined(_LIBCPP_HAS_THREAD_API_PTHREAD)` check, which is always true. --- libcxxabi/src/cxa_guard_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h index 7b05bf32f3ed..191a589176b1 100644 --- a/libcxxabi/src/cxa_guard_impl.h +++ b/libcxxabi/src/cxa_guard_impl.h @@ -156,12 +156,12 @@ private: // PlatformGetThreadID //===----------------------------------------------------------------------===// -#if defined(__APPLE__) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD) +#if defined(__APPLE__) && _LIBCPP_HAS_THREAD_API_PTHREAD uint32_t PlatformThreadID() { static_assert(sizeof(mach_port_t) == sizeof(uint32_t), ""); return static_cast(pthread_mach_thread_np(std::__libcpp_thread_get_current_id())); } -#elif defined(SYS_gettid) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD) +#elif defined(SYS_gettid) && _LIBCPP_HAS_THREAD_API_PTHREAD uint32_t PlatformThreadID() { static_assert(sizeof(pid_t) == sizeof(uint32_t), ""); return static_cast(syscall(SYS_gettid));