[PATCH] D70031: [scudo][standalone] Match function name change to bionic name change.

[Christopher Ferris via Phabricator via llvm-commits]

cferris created this revision.
cferris added a reviewer: cryptoad.
cferris added projects: Sanitizers, LLVM.
Herald added a subscriber: srhines.

Bionic was modified to have all function names consistent. Modify the code and get rid of the special case for bionic since it's no longer needed.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D70031

Files:
  compiler-rt/lib/scudo/standalone/wrappers_c.inc


Index: compiler-rt/lib/scudo/standalone/wrappers_c.inc
===================================================================
--- compiler-rt/lib/scudo/standalone/wrappers_c.inc
+++ compiler-rt/lib/scudo/standalone/wrappers_c.inc
@@ -134,15 +134,7 @@
       size, scudo::Chunk::Origin::Memalign, scudo::getPageSizeCached()));
 }
 
-// Bionic wants a function named PREFIX_iterate and not PREFIX_malloc_iterate
-// which is somewhat inconsistent with the rest, workaround that.
-#if SCUDO_ANDROID && _BIONIC
-#define SCUDO_ITERATE iterate
-#else
-#define SCUDO_ITERATE malloc_iterate
-#endif
-
-INTERFACE WEAK int SCUDO_PREFIX(SCUDO_ITERATE)(
+INTERFACE WEAK int SCUDO_PREFIX(malloc_iterate)(
     uintptr_t base, size_t size,
     void (*callback)(uintptr_t base, size_t size, void *arg), void *arg) {
   SCUDO_ALLOCATOR.iterateOverChunks(base, size, callback, arg);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70031.228521.patch
Type: text/x-patch
Size: 864 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191108/89d012f4/attachment.bin>