Kernel is now in C++ :)

kernel/Makefile

@@ -62,6 +62,9 @@ $(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o:
 .c.o:
 	$(CC) -MD -c $< -o $@ -std=gnu11 $(CFLAGS) $(CPPFLAGS)
  
+.cpp.o:
+	$(CXX) -MD -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ 
 .S.o:
 	$(CC) -MD -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
  

kernel/arch/i386/crti.s

@@ -13,4 +13,4 @@ _init:
 _fini:
 	push %ebp
 	movl %esp, %ebp
-	/* gcc will nicely put the contents of crtbegin.o's .fini section here. */
+	/* gcc will nicely put the contents of crtbegin.o's .fini section here. */

kernel/arch/i386/crtn.s

@@ -7,4 +7,4 @@
 .section .fini
 	/* gcc will nicely put the contents of crtend.o's .fini section here. */
 	popl %ebp
-	ret
+	ret

kernel/arch/i386/tty.c

@@ -29,7 +29,7 @@ void terminal_clear(void)
 			terminal_putentryat(' ', terminal_color, x, y);
 }
 
-void terminal_initialize(void)
+void terminal_initialize()
 {
 	terminal_row = 0;
 	terminal_col = 0;

kernel/include/kernel/tty.h

@@ -2,7 +2,15 @@
 
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void terminal_initialize(void);
 void terminal_putchar(char c);
 void terminal_write(const char* data, size_t size);
-void terminal_writestring(const char* data);
+void terminal_writestring(const char* data);
+
+#ifdef __cplusplus
+}
+#endif

kernel/kernel/kernel.cpp

@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 
+extern "C"
 void kernel_main()
 {
 	terminal_initialize();