Index: src/amiga-library.m ================================================================== --- src/amiga-library.m +++ src/amiga-library.m @@ -66,12 +66,10 @@ #ifdef OF_AMIGAOS_M68K extern uintptr_t __CTOR_LIST__[]; extern const void *_EH_FRAME_BEGINS__; extern void *_EH_FRAME_OBJECTS__; -void __register_frame_info(const void *, void *); -void *__deregister_frame_info(const void *); #endif extern bool glue_of_init(void); extern void *glue_of_alloc(void); extern void *glue_of_alloc_zeroed(void); @@ -352,11 +350,11 @@ struct ObjFWBase *parent; #ifdef OF_AMIGAOS_M68K if (base->initialized) for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++) - __deregister_frame_info( + libc.__deregister_frame_info( (&_EH_FRAME_BEGINS__)[i]); #endif parent = base->parent; @@ -410,11 +408,11 @@ #ifdef OF_AMIGAOS_M68K if ((size_t)_EH_FRAME_BEGINS__ != (size_t)_EH_FRAME_OBJECTS__) return false; for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++) - __register_frame_info((&_EH_FRAME_BEGINS__)[i], + libc.__register_frame_info((&_EH_FRAME_BEGINS__)[i], (&_EH_FRAME_OBJECTS__)[i]); iter0 = &__CTOR_LIST__[1]; #elif defined(OF_MORPHOS) __asm__ ( @@ -590,10 +588,22 @@ *__deregister_frame_info(const void *begin) { return libc.__deregister_frame_info(begin); } #endif + +#ifdef OF_MORPHOS +void __register_frame(void *frame) +{ + libc.__register_frame(frame); +} + +void __deregister_frame(void *frame) +{ + libc.__deregister_frame(frame); +} +#endif int * of_get_errno(void) { return libc.get_errno();