diff options
| author | Christopher Ferris <cferris@google.com> | 2014-10-08 22:48:20 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-10-09 11:47:01 -0700 |
| commit | f183f95946c699924d8ce6c0ee723bf7f4fdfe85 (patch) | |
| tree | a19b67ae4bfb1ff566f09ba14e414399a4eaee3e /libc/bionic/ndk_cruft.cpp | |
| parent | 8a7f8387b3b95de2ee0c42e34a226a1fcc066896 (diff) | |
| download | bionic-f183f95946c699924d8ce6c0ee723bf7f4fdfe85.zip bionic-f183f95946c699924d8ce6c0ee723bf7f4fdfe85.tar.gz bionic-f183f95946c699924d8ce6c0ee723bf7f4fdfe85.tar.bz2 | |
Re-add dlmalloc for 32 bit.
It turns out that appportable has a version that calls dlmalloc directly.
Re-add the dlmalloc symbol for 32 bit only as a compatibility shim that
calls malloc.
Bug: 17881362
(cherry pick commit from c9734d24d92f4737f5ab3808c77d816a1b084582)
Change-Id: Iee9a777f66a1edb407d7563a60792b767ac4f83a
Diffstat (limited to 'libc/bionic/ndk_cruft.cpp')
| -rw-r--r-- | libc/bionic/ndk_cruft.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp index 2cd2e33..18a4a14 100644 --- a/libc/bionic/ndk_cruft.cpp +++ b/libc/bionic/ndk_cruft.cpp @@ -325,4 +325,10 @@ extern "C" pid_t __pthread_gettid(pthread_t t) { return pthread_gettid_np(t); } +// Older versions of appportable used dlmalloc directly instead of malloc, +// so export this compatibility shim that simply calls malloc. +extern "C" void* dlmalloc(size_t size) { + return malloc(size); +} + #endif |