slightly less broken exception support

04501470 · Nickolai Zeldovich · e96497d9 · 04501470 · 04501470 · 04501470
--- a/kernel/Makefrag
+++ b/kernel/Makefrag
@@ -51,7 +51,6 @@ OBJS = \
 	wqlib.o \
 	script.o \
        zalloc.o \
-	incbin.o \
 	gccsup/eh_personality.o \
 	gccsup/eh_catch.o \
 	gccsup/eh_throw.o \
@@ -66,6 +65,7 @@ OBJS = \
 	gccsup/fundamental_type_info.o \
 	gccsup/pointer_type_info.o \
 	gccsup/pbase_type_info.o \
+	incbin.o

 OBJS := $(addprefix $(O)/kernel/, $(OBJS))


--- a/kernel/cpprt.cc
+++ b/kernel/cpprt.cc
@@ -96,6 +96,18 @@ abort(void)
  panic("abort");
 }

+static void
+cxx_terminate(void)
+{
+  panic("cxx terminate");
+}
+
+static void
+cxx_unexpected(void)
+{
+  panic("cxx unexpected");
+}
+
 void *__dso_handle;

 namespace std {
@@ -126,8 +138,8 @@ namespace std {
 };

 namespace __cxxabiv1 {
-  void (*__terminate_handler)() = abort;
-  void (*__unexpected_handler)() = abort;
+  void (*__terminate_handler)() = cxx_terminate;
+  void (*__unexpected_handler)() = cxx_unexpected;
 };

 extern "C" void* malloc(size_t);

--- a/kernel/kernel.ld
+++ b/kernel/kernel.ld
@@ -19,6 +19,8 @@ SECTIONS
 	}
 	PROVIDE(eprof = .);
 	. = ALIGN(0x1000);
+        .got : { *(.got) *(.igot) }
+        .got.plt : { *(.got.plt)  *(.igot.plt) }
 	.data : {
 		*(.data .data.* .gnu.linkonce.d.*)
 	}