1 files changed, 13 insertions, 6 deletions
diff --git a/src/tsd.c b/src/tsd.c
index cbc64e4..59253fe 100644
--- a/src/tsd.c
+++ b/src/tsd.c
@@ -15,16 +15,14 @@ void *
 malloc_tsd_malloc(size_t size)
 {
 
-	/* Avoid choose_arena() in order to dodge bootstrapping issues. */
-	return (arena_malloc(NULL, arenas[0], CACHELINE_CEILING(size), false,
-	    false));
+	return (a0malloc(CACHELINE_CEILING(size)));
 }
 
 void
 malloc_tsd_dalloc(void *wrapper)
 {
 
-	idalloct(NULL, wrapper, false);
+	a0free(wrapper);
 }
 
 void
@@ -106,15 +104,24 @@ MALLOC_TSD
 }
 
 bool
-malloc_tsd_boot(void)
+malloc_tsd_boot0(void)
 {
 
 	ncleanups = 0;
-	if (tsd_boot())
+	if (tsd_boot0())
 		return (true);
+	*tsd_arenas_cache_bypassp_get(tsd_fetch()) = true;
 	return (false);
 }
 
+void
+malloc_tsd_boot1(void)
+{
+
+	tsd_boot1();
+	*tsd_arenas_cache_bypassp_get(tsd_fetch()) = false;
+}
+
 #ifdef _WIN32
 static BOOL WINAPI
 _tls_callback(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)