Index: src/amiga-library.m ================================================================== --- src/amiga-library.m +++ src/amiga-library.m @@ -45,11 +45,11 @@ # define OF_M68K_REG(reg) #endif /* This always needs to be the first thing in the file. */ int -_start() +_start(void) { return -1; } struct ObjFWBase { @@ -299,13 +299,13 @@ if (base->parent != NULL) { struct ObjFWBase *parent; #ifdef OF_AMIGAOS_M68K if (base->initialized) - for (size_t i = 1; i <= (size_t)_EH_FRAME_BEGINS__; i++) - libC.__deregister_frame_info( - (&_EH_FRAME_BEGINS__)[i]); + for (void *const *frame = _EH_FRAME_BEGINS__; + *frame != NULL;) + libC.__deregister_frame_info(*frame++); #endif parent = base->parent; FreeMem(base->dataSeg - DATA_OFFSET, getDataSize()); @@ -351,16 +351,13 @@ memcpy(&libC, libC_, sizeof(libC)); __sF = sF; #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++) - libC.__register_frame_info((&_EH_FRAME_BEGINS__)[i], - (&_EH_FRAME_OBJECTS__)[i]); + for (void *const *frame = _EH_FRAME_BEGINS__, + **object = _EH_FRAME_OBJECTS__; *frame != NULL;) + libC.__register_frame_info(*frame++, *object++); iter0 = &__CTOR_LIST__[1]; #elif defined(OF_MORPHOS) __asm__ ( "lis %0, __EH_FRAME_BEGIN__@ha\n\t"