From 3616e851f66e41b3c8b9f97d26e711069d56e752 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 21 Apr 2020 15:30:50 -0700 Subject: [PATCH] scudo: Change the macro used to check whether we're targeting the platform. Differential Revision: https://reviews.llvm.org/D78594 --- compiler-rt/lib/scudo/standalone/combined.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/scudo/standalone/combined.h b/compiler-rt/lib/scudo/standalone/combined.h index 51e0c5d1966c..b44753a4373a 100644 --- a/compiler-rt/lib/scudo/standalone/combined.h +++ b/compiler-rt/lib/scudo/standalone/combined.h @@ -32,10 +32,9 @@ extern "C" inline void EmptyCallback() {} -#if SCUDO_ANDROID && __ANDROID_API__ == 10000 +#ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE // This function is not part of the NDK so it does not appear in any public -// header files. We only declare/use it when targeting the platform (i.e. API -// level 10000). +// header files. We only declare/use it when targeting the platform. extern "C" size_t android_unsafe_frame_pointer_chase(scudo::uptr *buf, size_t num_entries); #endif @@ -232,7 +231,7 @@ public: } NOINLINE u32 collectStackTrace() { -#if SCUDO_ANDROID && __ANDROID_API__ == 10000 +#ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE // Discard collectStackTrace() frame and allocator function frame. constexpr uptr DiscardFrames = 2; uptr Stack[MaxTraceSize + DiscardFrames];