Index: head/sys/boot/Makefile.inc
===================================================================
--- head/sys/boot/Makefile.inc	(revision 324551)
+++ head/sys/boot/Makefile.inc	(revision 324552)
@@ -1,45 +1,43 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .if !defined(__BOOT_MAKEFILE_INC__)
 __BOOT_MAKEFILE_INC__=${MFILE}
 
 SASRC=${SRCTOP}/lib/libstand
 # Normal standalone library
 LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a
 # Standalone library compiled for 32-bit version of the processor
 LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
-# Standalone library compiled for userboot
-LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a
 
 CFLAGS+=-I${SASRC}
 
 SSP_CFLAGS=
 
 .if ${MACHINE_CPUARCH} == "arm"
 # Do not generate movt/movw, because the relocation fixup for them does not
 # translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
 # Also, the fpu is not available in a standalone environment.
 .if ${COMPILER_VERSION} < 30800
 CFLAGS.clang+=	-mllvm -arm-use-movt=0
 .else
 CFLAGS.clang+=	-mno-movt
 .endif
 CFLAGS.clang+=  -mfpu=none
 .endif
 
 # The boot loader build uses dd status=none, where possible, for reproducible
 # build output (since performance varies from run to run). Trouble is that
 # option was recently (10.3) added to FreeBSD and is non-standard. Only use it
 # when this test succeeds rather than require dd to be a bootstrap tool.
 DD_NOSTATUS!=(dd status=none count=0 2> /dev/null && echo status=none) || true
 DD=dd ${DD_NOSTATUS}
 
 .if ${MK_LOADER_FORCE_LE} != "no"
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-mlittle-endian
 .endif
 .endif
 
 .endif
Index: head/sys/boot/userboot/Makefile
===================================================================
--- head/sys/boot/userboot/Makefile	(revision 324551)
+++ head/sys/boot/userboot/Makefile	(revision 324552)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
-SUBDIR=		ficl libstand test zfs userboot
+SUBDIR=		ficl test zfs userboot
 
 .include <bsd.subdir.mk>
 
Index: head/sys/boot/userboot/libstand/Makefile.depend
===================================================================
--- head/sys/boot/userboot/libstand/Makefile.depend	(revision 324551)
+++ head/sys/boot/userboot/libstand/Makefile.depend	(nonexistent)
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/arpa \
-	include/xlocale \
-	lib/libbz2 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif

Property changes on: head/sys/boot/userboot/libstand/Makefile.depend
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sys/boot/userboot/libstand/Makefile
===================================================================
--- head/sys/boot/userboot/libstand/Makefile	(revision 324551)
+++ head/sys/boot/userboot/libstand/Makefile	(nonexistent)
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-.include "../Makefile.inc"
-
-.PATH:	${SASRC}
-
-.include "${SASRC}/Makefile"

Property changes on: head/sys/boot/userboot/libstand/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/sys/boot/userboot/userboot/Makefile
===================================================================
--- head/sys/boot/userboot/userboot/Makefile	(revision 324551)
+++ head/sys/boot/userboot/userboot/Makefile	(revision 324552)
@@ -1,64 +1,64 @@
 # $FreeBSD$
 
 MAN=
 
 .include <src.opts.mk>
 MK_SSP=		no
 
 SHLIB_NAME=	userboot.so
 MK_CTF=		no
 STRIP=
 LIBDIR=		/boot
 
 SRCS=		autoload.c
 SRCS+=		bcache.c
 SRCS+=		biossmap.c
 SRCS+=		bootinfo.c
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
 SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c
 SRCS+=		elf64_freebsd.c
 SRCS+=		host.c
 SRCS+=		main.c
 SRCS+=		userboot_cons.c
 SRCS+=		userboot_disk.c
 SRCS+=		vers.c
 
 CFLAGS+=	-Wall
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I${.CURDIR}/../../..
 CFLAGS+=	-ffreestanding -I.
 
 CWARNFLAGS.main.c += -Wno-implicit-function-declaration
 
 LDFLAGS+=	-nostdlib -Wl,-Bsymbolic
 
 NEWVERSWHAT=	"User boot" ${MACHINE_CPUARCH}
 
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=        -DBOOT_FORTH -I${.CURDIR}/../../ficl
 CFLAGS+=        -I${.CURDIR}/../../ficl/i386
 CFLAGS+=	-DBF_DICTSIZE=15000
 LIBFICL=	${.OBJDIR}/../ficl/libficl.a
 .endif
 
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
 LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 CFLAGS+=	-I.
-DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSAU} 
-LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSAU}
+DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA} 
+LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
 
 .include <bsd.lib.mk>