From 14df08f0580cea8f8bec5814e3b895b373001b56 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Mon, 11 Nov 2019 09:30:17 -0800 Subject: [PATCH] [scudo][standalone] Match function name change to bionic name change. Summary: 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. Reviewers: cryptoad Reviewed By: cryptoad Subscribers: srhines, llvm-commits, #sanitizers Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D70031 --- compiler-rt/lib/scudo/standalone/wrappers_c.inc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c.inc b/compiler-rt/lib/scudo/standalone/wrappers_c.inc index a9adbc8..edf39f5 100644 --- a/compiler-rt/lib/scudo/standalone/wrappers_c.inc +++ b/compiler-rt/lib/scudo/standalone/wrappers_c.inc @@ -134,15 +134,7 @@ INTERFACE WEAK void *SCUDO_PREFIX(valloc)(size_t size) { 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); -- 2.7.4