commit 93517d1a27db3414e6f3b0b3fc91144903837329
author Christopher Ferris <cferris@google.com> Tue Mar 03 18:52:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 03 18:52:00 2020 +0000
tree 8006dec7f4ff98a3db9146c1a402b10f27896018
parent 0d303b42b54142214545e04093d4c9f1658276e9
parent 2c447b05869a84754b6095f07138a7c87a89c605

Merge "Update the scudo wrapper for bionic changes."

libc/bionic/scudo_wrapper.cpp

diff --git a/libc/bionic/scudo_wrapper.cpp b/libc/bionic/scudo_wrapper.cpp
index de6969fd..1624327 100644
--- a/libc/bionic/scudo_wrapper.cpp
+++ b/libc/bionic/scudo_wrapper.cpp
@@ -40,10 +40,18 @@
   __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;
 }