Index: head/sys/boot/sparc64/boot1/Makefile
===================================================================
--- head/sys/boot/sparc64/boot1/Makefile	(revision 325171)
+++ head/sys/boot/sparc64/boot1/Makefile	(revision 325172)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 PROG=	boot1.elf
 INTERNALPROG=
 MAN=
 FILES?=	boot1
 SRCS=	_start.s boot1.c
 CLEANFILES=${FILES} boot1.aout
 
 BOOTBLOCKBASE= 0x4000
 
 CFLAGS.clang+=-mcmodel=small
 CFLAGS.gcc+=-mcmodel=medlow
-CFLAGS+=-Os -I${LDRSRC} -nostdlib
-LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
+CFLAGS+=-Os -I${LDRSRC}
+LDFLAGS+=-Ttext ${BOOTBLOCKBASE} -Wl,-N
 
 # Construct boot1. sunlabel expects it to contain zeroed-out space for the
 # label, and to be of the correct size.
 ${FILES}: boot1.aout
 	@set -- `ls -l ${.ALLSRC}`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	${DD} if=/dev/zero of=${.TARGET} bs=512 count=16
 	${DD} if=${.ALLSRC} of=${.TARGET} bs=512 oseek=1 conv=notrunc
 
 boot1.aout: boot1.elf
 	elf2aout -o ${.TARGET} ${.ALLSRC}
 
 boot1.o: ${SASRC}/ufsread.c
 
 .include <bsd.prog.mk>
Index: head/sys/boot/sparc64/loader/Makefile
===================================================================
--- head/sys/boot/sparc64/loader/Makefile	(revision 325171)
+++ head/sys/boot/sparc64/loader/Makefile	(revision 325172)
@@ -1,67 +1,65 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 MK_SSP=		no
 MAN=
 
 PROG?=		loader
 NEWVERSWHAT?=	"bootstrap loader" sparc64
 VERSION_FILE=	${.CURDIR}/../loader/version
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
 SRCS=		locore.S main.c metadata.c vers.c
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	yes
 LOADER_EXT2FS_SUPPORT?=	no
 LOADER_MSDOS_SUPPORT?=	no
 LOADER_ZFS_SUPPORT?=	no
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	yes
 LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	no
 LOADER_DEBUG?=		no
 
-CFLAGS+=-nostdlib
-
 .if ${LOADER_DEBUG} == "yes"
 CFLAGS+=	-DLOADER_DEBUG
 .endif
 .if ${LOADER_ZFS_SUPPORT} == "yes"
 CFLAGS+=	-DLOADER_ZFS_SUPPORT
 CFLAGS+=	-I${BOOTSRC}/zfs
 CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
 LIBZFSBOOT=	${BOOTOBJ}/zfs/libzfsboot.a
 .endif
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"
 CFLAGS+=	-I.
 
 CLEANFILES+=	loader.help
 
-LDFLAGS=	-static
+LDFLAGS+=	-static
 
 # Open Firmware standalone support library
 LIBOFW=		${BOOTOBJ}/ofw/libofw/libofw.a
 CFLAGS+=	-I${BOOTSRC}/ofw/libofw/
 
 # Need sys/ for crypto/intake.h
 CFLAGS+=	-I${SRCTOP}/sys
 
 DPADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSA}
 LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSA}
 
 loader.help: help.common help.sparc64
 	cat ${.ALLSRC} | \
 	    awk -f ${LDRSRC}/merge_help.awk > ${.TARGET}
 
 .PATH: ${BOOTSRC}/forth
 .include	"${BOOTSRC}/forth/Makefile.inc"
 
 FILES+= loader.rc menu.rc
 
 .include <bsd.prog.mk>