commit 3a62a3b0533c2410413e8b96c655bd307caf767e
author Mitch Phillips <mitchp@google.com> Fri Nov 15 19:05:59 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 15 19:05:59 2019 -0800
tree 3d28e5e4f23ea118ad1488c9ca66778f01e1423a
parent 3ada6528969954ca1a469ad32596616d03332664
parent b6f26e3b724053925208a7d3f4b465d531c83317

Merge "Call __libc_init_malloc from scudo."
am: b6f26e3b72

Change-Id: I2e04309433d8644d37f76ab085cb2a02639bd9a6

libc/bionic/scudo_wrapper.cpp

diff --git a/libc/bionic/scudo_wrapper.cpp b/libc/bionic/scudo_wrapper.cpp
index debd8d9..de6969fd 100644
--- a/libc/bionic/scudo_wrapper.cpp
+++ b/libc/bionic/scudo_wrapper.cpp
@@ -35,6 +35,11 @@
 
 __LIBC_HIDDEN__ WriteProtected<libc_globals> __libc_globals;
 
+// Call the libc malloc initialisers.
+__attribute__((constructor(1))) static void __scudo_preinit() {
+  __libc_globals.mutate(__libc_init_malloc);
+}
+
 #if defined(__i386__)
 __LIBC_HIDDEN__ void* __libc_sysinfo = reinterpret_cast<void*>(__libc_int0x80);
 #endif