[PATCH] D78594: scudo: Change the macro used to check whether we're targeting the platform.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.
pcc added a reviewer: cferris.
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D78594

Files:
  compiler-rt/lib/scudo/standalone/combined.h


Index: compiler-rt/lib/scudo/standalone/combined.h
===================================================================
--- compiler-rt/lib/scudo/standalone/combined.h
+++ 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 @@
   }
 
   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];


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78594.259115.patch
Type: text/x-patch
Size: 1093 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200421/2acf5941/attachment.bin>