Index: stand/Makefile.booters
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/Makefile.booters,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.booters
--- stand/Makefile.booters	11 Dec 2005 12:19:44 -0000	1.4
+++ stand/Makefile.booters	9 Oct 2011 11:57:26 -0000
@@ -6,6 +6,8 @@ S?=	${.CURDIR}/../../../..
 
 CFLAGS+= -ffreestanding
 
+CPPFLAGS+=	-D__daddr_t=int32_t
+
 machine-links:
 	-rm -f machine && \
 	ln -s $S/arch/${MACHINE}/include machine
Index: stand/boot_ufs/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ufs/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- stand/boot_ufs/Makefile	25 Oct 2008 22:27:38 -0000	1.23
+++ stand/boot_ufs/Makefile	9 Oct 2011 11:57:26 -0000
@@ -37,12 +37,13 @@ vers.c:	${VERSIONFILE}
 	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.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]*}
 .if ${OBJECT_FMT} == "ELF"
Index: stand/boot_ustar/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ustar/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- stand/boot_ustar/Makefile	25 Oct 2008 22:27:38 -0000	1.15
+++ stand/boot_ustar/Makefile	9 Oct 2011 11:57:26 -0000
@@ -34,6 +34,7 @@ vers.c:	${VERSIONFILE}
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
 CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS}
+CFLAGS+=   -m68020-60
 AFLAGS=	   ${CFLAGS:M-[ID]*}
 AFLAGS+=   -Wa,-mc68000
 .if ${OBJECT_FMT} == "ELF"
Index: stand/libsa/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/libsa/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- stand/libsa/Makefile	11 Nov 2007 13:23:07 -0000	1.22
+++ stand/libsa/Makefile	9 Oct 2011 11:57:26 -0000
@@ -19,7 +19,7 @@ SRCS+=		cd9660.c lfsv1.c lfsv2.c nfs.c u
 #SRCS+=		arp.c ether.c in_cksum.c net.c netif.c rpc.c udp.c
 #SRCS+=		bootp.c
 
-SRCS+=		ashldi3.c ashrdi3.c divdi3.c moddi3.c qdivrem.c
+SRCS+=		ashldi3.c ashrdi3.c divdi3.c moddi3.c muldi3.c qdivrem.c
 SRCS+=		strcat.c strchr.c strcmp.c strcpy.c strerror.c strlen.c
 SRCS+=		strncmp.c strrchr.c
 
@@ -33,6 +33,8 @@ NOPROFILE=	# defined
 NOPIC=		# defined
 NOLINT=		# defined
 
+CFLAGS+=	-m68020-60
+
 CPPFLAGS+=	-I${.OBJDIR} -I${LIBSADIR} -I$S -I${LIBZDIR} -D_STANDALONE
 CPPFLAGS+=	-I${.CURDIR}/../libiocs -I${.CURDIR}/../common
 CPPFLAGS+=	-DHEAP_VARIABLE -D__INTERNAL_LIBSA_CREAD