Index: src/OFApplication.m ================================================================== --- src/OFApplication.m +++ src/OFApplication.m @@ -51,11 +51,11 @@ # include extern int _CRT_glob; extern void __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); #elif defined(OF_AMIGAOS) -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include # include #elif !defined(OF_IOS) Index: src/OFFile.m ================================================================== --- src/OFFile.m +++ src/OFFile.m @@ -56,11 +56,11 @@ # include # include #endif #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include #endif Index: src/OFFileManager.m ================================================================== --- src/OFFileManager.m +++ src/OFFileManager.m @@ -56,11 +56,11 @@ # include # include #endif #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include # include # include Index: src/OFLocalization.m ================================================================== --- src/OFLocalization.m +++ src/OFLocalization.m @@ -33,11 +33,11 @@ # ifdef OF_AMIGAOS4 # define __NOLIBBASE__ # define __NOGLOBALIFACE__ # define __USE_INLINE__ # endif -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include # include # include Index: src/OFStdIOStream.h ================================================================== --- src/OFStdIOStream.h +++ src/OFStdIOStream.h @@ -17,15 +17,15 @@ #import "OFStream.h" #import "OFKernelEventObserver.h" #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # undef INTUITION_CLASSES_H # endif #endif OF_ASSUME_NONNULL_BEGIN Index: src/OFStdIOStream.m ================================================================== --- src/OFStdIOStream.m +++ src/OFStdIOStream.m @@ -40,11 +40,11 @@ #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include #endif Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -67,11 +67,11 @@ */ #ifdef __MINGW32__ # define strtod __strtod #endif -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K /* libnix has strtod, but not strtof */ # define strtof strtod #endif static struct { @@ -2504,11 +2504,11 @@ - (float)floatValue { void *pool = objc_autoreleasePoolPush(); -#if defined(OF_AMIGAOS3) || defined(OF_MORPHOS) +#if defined(OF_AMIGAOS_M68K) || defined(OF_MORPHOS) OFString *stripped = [self stringByDeletingEnclosingWhitespaces]; if ([stripped caseInsensitiveCompare: @"INF"] == OF_ORDERED_SAME || [stripped caseInsensitiveCompare: @"INFINITY"] == OF_ORDERED_SAME) return INFINITY; @@ -2554,11 +2554,11 @@ - (double)doubleValue { void *pool = objc_autoreleasePoolPush(); -#if defined(OF_AMIGAOS3) || defined(OF_MORPHOS) +#if defined(OF_AMIGAOS_M68K) || defined(OF_MORPHOS) OFString *stripped = [self stringByDeletingEnclosingWhitespaces]; if ([stripped caseInsensitiveCompare: @"INF"] == OF_ORDERED_SAME || [stripped caseInsensitiveCompare: @"INFINITY"] == OF_ORDERED_SAME) return INFINITY; Index: src/OFSystemInfo.m ================================================================== --- src/OFSystemInfo.m +++ src/OFSystemInfo.m @@ -111,11 +111,11 @@ operatingSystemName = @"macOS"; #elif defined(OF_WINDOWS) operatingSystemName = @"Windows"; #elif defined(OF_ANDROID) operatingSystemName = @"Android"; -#elif defined(OF_AMIGAOS3) +#elif defined(OF_AMIGAOS_M68K) operatingSystemName = @"AmigaOS"; #elif defined(OF_MORPHOS) operatingSystemName = @"MorphOS"; #elif defined(OF_AMIGAOS4) operatingSystemName = @"AmigaOS 4"; @@ -215,11 +215,11 @@ /* TODO */ #elif defined(OF_MORPHOS) /* TODO */ #elif defined(OF_AMIGAOS4) /* TODO */ -#elif defined(OF_AMIGAOS3) +#elif defined(OF_AMIGAOS_M68K) /* TODO */ #elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \ defined(OF_PSP) || defined(OF_MSDOS) /* Intentionally nothing */ #elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) Index: src/OFThread.m ================================================================== --- src/OFThread.m +++ src/OFThread.m @@ -31,11 +31,11 @@ #include "unistd_wrapper.h" #include "platform.h" #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include #endif Index: src/OFURLHandler_file.m ================================================================== --- src/OFURLHandler_file.m +++ src/OFURLHandler_file.m @@ -65,11 +65,11 @@ # include # include #endif #ifdef OF_AMIGAOS -# ifdef OF_AMIGAOS3 +# ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H # endif # include # include #endif Index: src/platform.h ================================================================== --- src/platform.h +++ src/platform.h @@ -125,11 +125,11 @@ # endif #elif defined(__amigaos4__) # define OF_AMIGAOS4 # define OF_AMIGAOS #elif defined(__amigaos__) -# define OF_AMIGAOS3 +# define OF_AMIGAOS_M68K # define OF_AMIGAOS #elif defined(__sun__) # define OF_SOLARIS #elif defined(__QNX__) # define OF_QNX Index: src/runtime/amiga-library.m ================================================================== --- src/runtime/amiga-library.m +++ src/runtime/amiga-library.m @@ -18,11 +18,11 @@ #include "config.h" #import "ObjFW_RT.h" #import "private.h" -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H #endif #include #include @@ -31,18 +31,18 @@ #define CONCAT_VERSION2(major, minor) #major "." #minor #define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor) #define VERSION_STRING CONCAT_VERSION(OBJFW_RT_LIB_MAJOR, OBJFW_RT_LIB_MINOR) -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) # define DATA_OFFSET 0x7FFE #elif defined(OF_MORPHOS) # define DATA_OFFSET 0x8000 #endif -#ifdef OF_AMIGAOS3 -# define OBJC_M68K_REG(reg) __asm__ (#reg) +#ifdef OF_AMIGAOS_M68K +# define OBJC_M68K_REG(reg) __asm__(#reg) #else # define OBJC_M68K_REG(reg) #endif /* This always needs to be the first thing in the file. */ @@ -58,11 +58,11 @@ struct ObjFWRTBase *parent; char *data_seg; bool initialized; }; -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K extern uintptr_t __CTOR_LIST__[]; extern const void *_EH_FRAME_BEGINS__; extern void *_EH_FRAME_OBJECTS__; #endif @@ -139,11 +139,11 @@ struct ExecBase *SysBase; struct objc_libc libc; FILE *stdout; FILE *stderr; -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) __asm__ ( ".text\n" ".globl ___restore_a4\n" ".align 1\n" "___restore_a4:\n" @@ -167,11 +167,11 @@ static OF_INLINE char * get_data_seg(void) { char *data_seg; -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) __asm__ ( "move.l #___a4_init, %0" : "=r"(data_seg) ); #elif defined(OF_MORPHOS) @@ -188,11 +188,11 @@ static OF_INLINE size_t get_data_size(void) { size_t data_size; -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) __asm__ ( "move.l #___data_size, %0" : "=r"(data_size) ); #elif defined(OF_MORPHOS) @@ -213,11 +213,11 @@ static OF_INLINE size_t * get_datadata_relocs(void) { size_t *datadata_relocs; -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) __asm__ ( "move.l #___datadata_relocs, %0" : "=r"(datadata_relocs) ); #elif defined(OF_MORPHOS) @@ -234,11 +234,11 @@ static struct Library * lib_init(struct ObjFWRTBase *base OBJC_M68K_REG(d0), void *seg_list OBJC_M68K_REG(a0), struct ExecBase *sys_base OBJC_M68K_REG(a6)) { -#if defined(OF_AMIGAOS3) +#if defined(OF_AMIGAOS_M68K) __asm__ __volatile__ ( "move.l a6, _SysBase" :: "a"(sys_base) ); #elif defined(OF_MORPHOS) @@ -349,11 +349,11 @@ OBJC_M68K_ARG(struct ObjFWRTBase *, base, a6) if (base->parent != NULL) { struct ObjFWRTBase *parent; -#ifdef OF_AMIGAOS3 +#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]); #endif @@ -396,11 +396,11 @@ memcpy(&libc, libc_, sizeof(libc)); stdout = stdout_; stderr = stderr_; -#ifdef OF_AMIGAOS3 +#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], @@ -605,15 +605,12 @@ struct Resident resident = { .rt_MatchWord = RTC_MATCHWORD, .rt_MatchTag = &resident, .rt_EndSkip = &resident + 1, .rt_Flags = RTF_AUTOINIT -#ifndef OF_AMIGAOS3 - | RTF_PPC -#endif #ifdef OF_MORPHOS - | RTF_EXTENDED + | RTF_PPC | RTF_EXTENDED #endif , .rt_Version = OBJFW_RT_LIB_MAJOR, .rt_Type = NT_LIBRARY, .rt_Pri = 0, Index: src/runtime/linklib/linklib.m ================================================================== --- src/runtime/linklib/linklib.m +++ src/runtime/linklib/linklib.m @@ -19,11 +19,11 @@ #import "ObjFW_RT.h" #import "private.h" #import "macros.h" -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K # define INTUITION_CLASSES_H #endif #include #import "inline.h" @@ -180,11 +180,11 @@ } void objc_exception_throw(id object) { -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K /* * This does not use the glue code to hack around a compiler bug. * * When using the generated inline stubs, the compiler does not emit * any frame information, making the unwind fail. As unwind always @@ -244,11 +244,11 @@ } void objc_enumerationMutation(id object) { -#ifdef OF_AMIGAOS3 +#ifdef OF_AMIGAOS_M68K /* * This does not use the glue code to hack around a compiler bug. * * When using the generated inline stubs, the compiler does not emit * any frame information, making the unwind fail. As a result Index: tests/OFStringTests.m ================================================================== --- tests/OFStringTests.m +++ tests/OFStringTests.m @@ -881,16 +881,16 @@ [C(@"\r\n\tINF\t\n") floatValue] == INFINITY && [C(@"\r -INFINITY\n") floatValue] == -INFINITY && isnan([C(@" NAN\t\t") floatValue])) #if !defined(OF_ANDROID) && !defined(OF_SOLARIS) && !defined(OF_DJGPP) && \ - !defined(OF_AMIGAOS3) + !defined(OF_AMIGAOS_M68K) # define INPUT @"\t-0x1.FFFFFFFFFFFFFP-1020 " # define EXPECTED -0x1.FFFFFFFFFFFFFP-1020 #else /* Android, Solaris, DJGPP and AmigaOS3 do not accept 0x for strtod() */ -# if (!defined(OF_SOLARIS) || !defined(OF_X86)) && !defined(OF_AMIGAOS3) +# if (!defined(OF_SOLARIS) || !defined(OF_X86)) && !defined(OF_AMIGAOS_M68K) # define INPUT @"\t-0.123456789 " # define EXPECTED -0.123456789 # else /* * Solaris' strtod() has weird rounding on x86, but not on x86_64/