Merge "Update the scudo wrapper for bionic changes." am: 93517d1a27 am: 205790270a

Change-Id: Ic7af313f1f90a6e213f45a750e02c51c40601efd
This commit is contained in:
Automerger Merge Worker 2020-03-03 19:32:30 +00:00
commit 60d00d39a2

View file

@ -40,10 +40,18 @@ __attribute__((constructor(1))) static void __scudo_preinit() {
__libc_globals.mutate(__libc_init_malloc);
}
extern "C" libc_shared_globals* __loader_shared_globals();
__LIBC_HIDDEN__ libc_shared_globals* __libc_shared_globals() {
return __loader_shared_globals();
}
#if defined(__i386__)
__LIBC_HIDDEN__ void* __libc_sysinfo = reinterpret_cast<void*>(__libc_int0x80);
#endif
extern "C" void scudo_malloc_disable_memory_tagging() {}
int scudo_mallopt(int /*param*/, int /*value*/) {
return 0;
}