Fix build on GCC, c++14 sized deallocation

fwsGonzo · Jan 27, 2018 · c0eba39 · c0eba39
1 parent e3b4e72
commit c0eba39
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/crt/cxxabi.cpp b/src/crt/cxxabi.cpp
@@ -2,6 +2,8 @@
 #include <cstddef>
 #include <cstring>
 #include <kprint.hpp>
+extern "C" void* malloc(size_t);
+extern "C" void free(void*);
 
 //#define DEBUG_HEAP
 #ifdef DEBUG_HEAP
@@ -33,6 +35,15 @@ void operator delete[](void* ptr)
   HPRINT("operator delete[]: %p\n", ptr);
   free(ptr);
 }
+// C++14 sized deallocation
+void operator delete(void* ptr, std::size_t)
+{
+  free(ptr);
+}
+void operator delete [](void* ptr, std::size_t)
+{
+  free(ptr);
+}
 
 extern "C" void __cxa_pure_virtual()
 {

diff --git a/src/crt/malloc.c b/src/crt/malloc.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 
 static inline size_t word_align(size_t size) {
-    return size + (sizeof(size_t) - 1) & ~(sizeof(size_t) - 1);
+    return size + ((sizeof(size_t) - 1) & ~(sizeof(size_t) - 1));
 }
 
 struct chunk {