generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c9734d24: Re-add dlmalloc for 32 bit.

Browse Source 
* commit 'c9734d24d92f4737f5ab3808c77d816a1b084582':
  Re-add dlmalloc for 32 bit.
This commit is contained in:
Christopher Ferris 2014-10-09 22:02:00 +00:00 committed by Android Git Automerger
commit 7f4618cbc8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/dlmalloc.h
View File

@ -34,11 +34,14 @@
#define malloc_getpagesize getpagesize()
/* dlmalloc_usable_size was exposed in the NDK, so change the name
* of the function on 32 bit architectures.
*/
#if !defined(__LP64__)
/* dlmalloc_usable_size and dlmalloc were exposed in the NDK and some
* apps actually used them. Rename these functions out of the way
* for 32 bit architectures so that ndk_cruft.cpp can expose
* compatibility shims with these names.
*/
#define dlmalloc_usable_size dlmalloc_usable_size_real
#define dlmalloc dlmalloc_real
#endif
/* Export two symbols used by the VM. */

6
libc/bionic/ndk_cruft.cpp
View File

@ -320,4 +320,10 @@ extern "C" size_t dlmalloc_usable_size(void* ptr) {
return malloc_usable_size(ptr);
}
// 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