summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2019-11-11 09:30:17 -0800
committerKostya Kortchinsky <kostyak@google.com>2019-11-11 09:41:57 -0800
commit14df08f0580cea8f8bec5814e3b895b373001b56 (patch)
tree8cd10cd0dbf6fa4351e0199d6f9ff7c97e23faa6 /compiler-rt/lib
parent03da6e8c00de2320e6b9dacba8f7850faceae319 (diff)
downloadbcm5719-llvm-14df08f0580cea8f8bec5814e3b895b373001b56.tar.gz
bcm5719-llvm-14df08f0580cea8f8bec5814e3b895b373001b56.zip
[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
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/scudo/standalone/wrappers_c.inc10
1 files changed, 1 insertions, 9 deletions
diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c.inc b/compiler-rt/lib/scudo/standalone/wrappers_c.inc
index a9adbc83588..edf39f51448 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);
OpenPOWER on IntegriCloud