Merge remote-tracking branch 'origin/master' into llvm11

The changes to install_files.h needed to put into src/libcxx.zig

1 files changed, 24 insertions, 0 deletions

diff --git a/src/stage1/mem.cpp b/src/stage1/mem.cpp
new file mode 100644
index 0000000000..48dbd791de
--- /dev/null
+++ b/src/stage1/mem.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 Andrew Kelley
+ *
+ * This file is part of zig, which is MIT licensed.
+ * See http://opensource.org/licenses/MIT
+ */
+
+#include "config.h"
+#include "mem.hpp"
+#include "heap.hpp"
+
+namespace mem {
+
+void init() {
+    heap::bootstrap_allocator_state.init("heap::bootstrap_allocator");
+    heap::c_allocator_state.init("heap::c_allocator");
+}
+
+void deinit() {
+    heap::c_allocator_state.deinit();
+    heap::bootstrap_allocator_state.deinit();
+}
+
+} // namespace mem