@@ -63,11 +63,12 @@
 			AC_SUBST(SFDC_TARGET, m68k-amigaos)
 			AC_SUBST(SFD_FILE, amigaos3.sfd)
 			AC_SUBST(SFDC_INLINE_H, inline.h)
 			dnl For 68000, GCC emits calls to helper functions that
 			dnl do not work properly in a library.
-			AC_SUBST(AMIGA_LIB_CFLAGS, "-mcpu=68020 -fbaserel")
+			AC_SUBST(AMIGA_LIB_CFLAGS,
+				"-mcpu=68020 -fbaserel -ffreestanding")
 			AC_SUBST(AMIGA_LIB_LDFLAGS,
 				"-mcpu=68020 -fbaserel -resident -nostartfiles")
 		])
 		;;
 	powerpc-*-amigaos*)
@@ -89,11 +90,11 @@
 			AS_IF([test x"$enable_amiga_lib" != x"no"], [
 				t='objfw_rt_${OBJFW_RT_LIB_MAJOR}_morphos'
 				t="$t.library"
 				AC_SUBST(OBJFW_RT_AMIGA_LIB, $t)
 				AC_SUBST(CVINCLUDE_INLINE_H, inline.h)
-				t="-mresident32 -fno-builtin"
+				t="-mresident32 -ffreestanding"
 				AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 				t="-mresident32 -nostartfiles -nodefaultlibs"
 				t="$t -lc"
 				AC_SUBST(AMIGA_LIB_LDFLAGS, $t)
 			])