From b39a7000a007e66f63c65b2490628ea34026e5e6 Mon Sep 17 00:00:00 2001 From: Tom Rybka Date: Thu, 19 May 2022 18:21:45 -0700 Subject: Don't default to the unscaled cycle clock on any Apple targets. Previously was disabled on iPhone, but still enabled for macOS. The unscaled cycle clock does not work correctly when run on a VM. PiperOrigin-RevId: 449876559 Change-Id: I679ade90b43462e8d2794b1a2b32569d59029ed9 --- absl/base/internal/unscaledcycleclock.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'absl/base') diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h index a4351406..2cbeae31 100644 --- a/absl/base/internal/unscaledcycleclock.h +++ b/absl/base/internal/unscaledcycleclock.h @@ -59,8 +59,7 @@ // CycleClock that runs at atleast 1 MHz. We've found some Android // ARM64 devices where this is not the case, so we disable it by // default on Android ARM64. -#if defined(__native_client__) || \ - (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \ +#if defined(__native_client__) || (defined(__APPLE__)) || \ (defined(__ANDROID__) && defined(__aarch64__)) #define ABSL_USE_UNSCALED_CYCLECLOCK_DEFAULT 0 #else -- cgit v1.2.3