Index: head/sys/boot/i386/Makefile.inc
===================================================================
--- head/sys/boot/i386/Makefile.inc	(revision 307953)
+++ head/sys/boot/i386/Makefile.inc	(revision 307954)
@@ -1,36 +1,38 @@
 # Common defines for all of /sys/boot/i386/
 #
 # $FreeBSD$
 
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x200000
 CFLAGS+=	-march=i386 -ffreestanding
 CFLAGS.gcc+=	-mpreferred-stack-boundary=2
 CFLAGS+=	${CFLAGS_NO_SIMD} -msoft-float
 LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-m32
 ACFLAGS+=	-m32
 # LD_FLAGS is passed directly to ${LD}, not via ${CC}:
 LD_FLAGS+=	-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
 
 # compact binary with no padding between text, data, bss
 LDSCRIPT=	${SRCTOP}/sys/boot/i386/boot.ldscript
-LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
-LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+# LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
+# LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
+LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
+LD_FLAGS_BIN=-static -N --gc-sections
 
 .include "../Makefile.inc"