@@ -149,11 +149,10 @@
 extern void glue_objc_hashtable_delete(void);
 extern void glue_objc_hashtable_free(void);
 extern void glue_objc_setTaggedPointerSecret(void);
 extern int glue_objc_registerTaggedPointerClass(void);
 extern bool glue_object_isTaggedPointer(void);
-extern Class glue_object_getTaggedPointerClass(void);
 extern uintptr_t glue_object_getTaggedPointerValue(void);
 extern id glue_objc_createTaggedPointer(void);
 
 #ifdef OF_MORPHOS
 const ULONG __abox__ = 1;
@@ -415,10 +414,13 @@
 #ifdef OF_AMIGAOS_M68K
 	OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6)
 #else
 	register struct ObjFWRTBase *r12 __asm__("r12");
 	struct ObjFWRTBase *base = r12;
+#endif
+#ifdef OF_MORPHOS
+	void *frame;
 #endif
 	uintptr_t *iter, *iter0;
 
 	if (version > 1)
 		return false;
@@ -438,14 +440,18 @@
 		    (&_EH_FRAME_OBJECTS__)[i]);
 
 	iter0 = &__CTOR_LIST__[1];
 #elif defined(OF_MORPHOS)
 	__asm__ (
-	    "lis	%0, ctors+4@ha\n\t"
-	    "la		%0, ctors+4@l(%0)\n\t"
-	    : "=r"(iter0)
+	    "lis	%0, __EH_FRAME_BEGIN__@ha\n\t"
+	    "la		%0, __EH_FRAME_BEGIN__@l(%0)\n\t"
+	    "lis	%1, __CTOR_LIST__@ha\n\t"
+	    "la		%1, __CTOR_LIST__@l(%1)\n\t"
+	    : "=r"(frame), "=r"(iter0)
 	);
+
+	libc.__register_frame(frame);
 #endif
 
 	for (iter = iter0; *iter != 0; iter++);
 
 	while (iter > iter0) {
@@ -588,10 +594,16 @@
 _Unwind_Resume(void *ex)
 {
 	libc._Unwind_Resume(ex);
 }
 #endif
+
+int *
+objc_get_errno(void)
+{
+	return libc.get_errno();
+}
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
 static CONST_APTR functionTable[] = {
 #ifdef OF_MORPHOS
@@ -691,11 +703,10 @@
 	(CONST_APTR)glue_objc_hashtable_delete,
 	(CONST_APTR)glue_objc_hashtable_free,
 	(CONST_APTR)glue_objc_setTaggedPointerSecret,
 	(CONST_APTR)glue_objc_registerTaggedPointerClass,
 	(CONST_APTR)glue_object_isTaggedPointer,
-	(CONST_APTR)glue_object_getTaggedPointerClass,
 	(CONST_APTR)glue_object_getTaggedPointerValue,
 	(CONST_APTR)glue_objc_createTaggedPointer,
 	(CONST_APTR)-1,
 #ifdef OF_MORPHOS
 	(CONST_APTR)FUNCARRAY_END
@@ -740,11 +751,16 @@
 #endif
 };
 
 #ifdef OF_MORPHOS
 __asm__ (
-    ".section .ctors, \"aw\", @progbits\n"
-    "ctors:\n"
-    "	.long -1\n"
+    ".section .eh_frame, \"aw\"\n"
+    ".globl __EH_FRAME_BEGIN__\n"
+    ".type __EH_FRAME_BEGIN__, @object\n"
+    "__EH_FRAME_BEGIN__:\n"
+    ".section .ctors, \"aw\"\n"
+    ".globl __CTOR_LIST__\n"
+    ".type __CTOR_LIST__, @object\n"
+    "__CTOR_LIST__:\n"
     ".section .text"
 );
 #endif