Index: stable/6/sys/boot/ficl/Makefile
===================================================================
--- stable/6/sys/boot/ficl/Makefile	(revision 163688)
+++ stable/6/sys/boot/ficl/Makefile	(revision 163689)
@@ -1,64 +1,64 @@
 # $FreeBSD$
 #
 .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
 		prefix.c search.c stack.c tools.c vm.c words.c
 
 SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES=	softcore.c testmain testmain.o
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-mno-fp-regs -Os
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-mpreferred-stack-boundary=2
 CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
 .endif
 .if ${MACHINE_ARCH} == "powerpc"
 CFLAGS+=	-msoft-float
 .endif
 .if ${MACHINE} == "pc98"
 CFLAGS+=	-DPC98
 .endif
 .if HAVE_PNP
 CFLAGS+=	-DHAVE_PNP
 .endif
 .ifmake testmain
 CFLAGS+=	-DTESTMAIN -D_TESTMAIN
 SRCS+=		testmain.c
 PROG=		testmain
 .include <bsd.prog.mk>
 .else
 LIB=		ficl
 INTERNALLIB=
 .include <bsd.lib.mk>
 .endif
 
 # Standard softwords
 .PATH: ${.CURDIR}/softwords
 SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 		ifbrack.fr
 # Optional OO extension softwords
 #SOFTWORDS+=	oo.fr classes.fr
 
 .if ${MACHINE_ARCH} == "amd64"
-CFLAGS+=	-m32 -I.
+CFLAGS+=	-m32 -march=i386 -I.
 .endif
 
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} \
 		-I${.CURDIR}/../common
 
 softcore.c: ${SOFTWORDS} softcore.awk
 	(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \
 	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 .if ${MACHINE_ARCH} == "amd64"
 ${SRCS:M*.c:R:S/$/.o/g}: machine
 
 beforedepend ${OBJS}: machine
 
 machine:
 	ln -sf ${.CURDIR}/../../i386/include machine
 
 CLEANFILES+=	machine
 .endif
Index: stable/6/sys/boot/i386/Makefile.inc
===================================================================
--- stable/6/sys/boot/i386/Makefile.inc	(revision 163688)
+++ stable/6/sys/boot/i386/Makefile.inc	(revision 163689)
@@ -1,26 +1,26 @@
 # Common defines for all of /sys/boot/i386/
 #
 # $FreeBSD$
 
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x200000
 CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2
 LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_ARCH} == "amd64"
-CFLAGS+=	-m32
+CFLAGS+=	-m32 -march=i386
 LDFLAGS+=	-m elf_i386_fbsd
 AFLAGS+=	--32
 .endif
 
 # BTX components
 .if exists(${.OBJDIR}/../btx)
 BTXDIR=		${.OBJDIR}/../btx
 .else
 BTXDIR=		${.CURDIR}/../btx
 .endif
 BTXLDR=		${BTXDIR}/btxldr/btxldr
 BTXKERN=	${BTXDIR}/btx/btx
 BTXCRT=		${BTXDIR}/lib/crt0.o