From 39519d75c2958969686eba78a7707d37af41960f Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Wed, 3 Jun 2026 13:39:17 -0700 Subject: [PATCH] PR #2067: Simplify the condition for ABSL_HAVE_PTHREAD_CPU_NUMBER_NP Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/2067 The conditions are always satisfied based on the macOS [lower bound](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md) that has long moved past the versions being considered here. Merge 49ed819784433e80f3329ebca1f0d40c47cf6fbb into e3555a127437b3a4720a5651ec085b54b5dee415 Merging this change closes #2067 PiperOrigin-RevId: 926238049 Change-Id: Ib90a33dd1d95eb3acea25a5c09bf367f2b64cfaa --- absl/debugging/failure_signal_handler.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index 4fd6bcc4..16609f17 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -71,7 +71,15 @@ // Checks whether pthread_cpu_number_np is available. #ifdef ABSL_HAVE_PTHREAD_CPU_NUMBER_NP #error ABSL_HAVE_PTHREAD_CPU_NUMBER_NP cannot be directly set -#elif defined(__APPLE__) +#elif defined(__APPLE__) && defined(__has_include) && \ + ((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 110000) || \ + (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 140200) || \ + (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 70100) || \ + (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \ + __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 140200)) #define ABSL_HAVE_PTHREAD_CPU_NUMBER_NP 1 #endif