Beta Shell v2.0

File Manager

~ /usr/local/rvm/src/rvm/patches/ree/1.8.7/2010.02

Name	Size	Perms	Modified	Actions
[ .. / .. ]
tcmalloc.patch	1.05 KB	-rw-rw-r--	2021-01-15 18:41:29	Edit Del

Editing: tcmalloc.patch (1.05 KB)

diff --git a/distro/google-perftools-1.4/src/tcmalloc.cc b/distro/google-perftools-1.4/src/tcmalloc.cc
index 8d94d20..0769425 100644
--- a/distro/google-perftools-1.4/src/tcmalloc.cc
+++ b/distro/google-perftools-1.4/src/tcmalloc.cc
@@ -137,6 +137,13 @@
 # define WIN32_DO_PATCHING 1
 #endif
 
+// GLibc 2.14+ requires the hook functions be declared volatile, based on the value of the
+// define __MALLOC_HOOK_VOLATILE. For compatibility with older/non-GLibc implementations,
+// provide an empty definition.
+#if !defined(__MALLOC_HOOK_VOLATILE)
+#define __MALLOC_HOOK_VOLATILE
+#endif
+
 using STL_NAMESPACE::max;
 using STL_NAMESPACE::numeric_limits;
 using STL_NAMESPACE::vector;
@@ -1669,5 +1676,5 @@ static void *MemalignOverride(size_t align, size_t size, const void *caller)
   MallocHook::InvokeNewHook(result, size);
   return result;
 }
-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
+void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
 #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION