Index: stand/Makefile.booters
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/Makefile.booters,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.booters
--- stand/Makefile.booters	11 Apr 2011 15:20:30 -0000	1.6
+++ stand/Makefile.booters	9 Oct 2011 12:00:07 -0000
@@ -7,6 +7,8 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wst
 CFLAGS+= -Wno-pointer-sign
 CFLAGS+= -Werror
 
+CPPFLAGS+=	-D__daddr_t=int32_t
+
 .include <bsd.klinks.mk>
 
 # XXX SHOULD NOT NEED TO DEFINE THESE!
Index: stand/boot_ufs/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ufs/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- stand/boot_ufs/Makefile	22 Jan 2011 19:19:24 -0000	1.25
+++ stand/boot_ufs/Makefile	9 Oct 2011 12:00:07 -0000
@@ -38,12 +38,13 @@ vers.c:	${VERSIONFILE}
 	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
 
 CFLAGS=	-Os -fomit-frame-pointer
+CFLAGS+= -m68020-60
 CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
 CPPFLAGS+= -DSCSI_ADHOC_BOOTPART
 #CPPFLAGS+= -DBOOT_DEBUG
-CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS1 -DUSE_UFS2 -D__daddr_t=int32_t
+CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS1 -DUSE_UFS2
 CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
 AFLAGS=	   ${CFLAGS:M-[ID]*}
 LINKFLAGS=   -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
Index: stand/boot_ustar/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ustar/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- stand/boot_ustar/Makefile	22 Jan 2011 19:19:24 -0000	1.18
+++ stand/boot_ustar/Makefile	9 Oct 2011 12:00:07 -0000
@@ -35,6 +35,7 @@ vers.c:	${VERSIONFILE}
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
 CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
+CFLAGS+=   -m68020-60
 AFLAGS=	   ${CFLAGS:M-[ID]*}
 AFLAGS+=   -Wa,-mc68000
 LINKFLAGS=   -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
Index: stand/libsa/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/libsa/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- stand/libsa/Makefile	12 Apr 2011 14:07:35 -0000	1.26
+++ stand/libsa/Makefile	9 Oct 2011 12:00:07 -0000
@@ -2,6 +2,8 @@
 
 S=		${.CURDIR}/../../../..
 
+CFLAGS+=	-m68020-60
+
 CPPFLAGS+=	-nostdinc -I${.OBJDIR} -I. -I${S}
 CPPFLAGS+=	-I${.CURDIR}/../libiocs -I${.CURDIR}/../common
 CPPFLAGS+=	-D_STANDALONE