We don't need to build a special ficl for userboot.

Prior to bringing efi into the system, amd64 systems were building
32-bit ficl only, while userboot required the 64-bit one. However,
with efi, we now build both. userboot can and should use the one we
build for the main tree (in fact, it has been for a while, though I
didn't check to see if that was an intentional change before, or an
accidental one in my cleanup). Eliminate the extra copy (and build
time) for userboot.

Sponsored by: Netflix

sys/boot/userboot/Makefile

@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		ficl test zfs userboot
+SUBDIR=		test zfs userboot
 
 .include <bsd.subdir.mk>
 

sys/boot/userboot/ficl/Makefile

@@ -1,59 +0,0 @@
-# $FreeBSD$
-#
-.include <bsd.init.mk>
-MK_SSP=		no
-
-.include "${BOOTSRC}/ficl.mk"
-
-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
-
-CWARNFLAGS.loader.c.c += -Wno-implicit-function-declaration
-
-.if HAVE_PNP
-CFLAGS+=	-DHAVE_PNP
-.endif
-.include <bsd.stand.mk>
-.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: ${BOOTSRC}/ficl/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_CPUARCH} == "amd64"
-#CFLAGS+=	-m32 -I.
-#.endif
-
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+=	-m32 -mcpu=powerpc -I.
-.endif
-
-softcore.c: ${SOFTWORDS} softcore.awk
-	(cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \
-	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
-
-#.if ${MACHINE_CPUARCH} == "amd64"
-#${SRCS:M*.c:R:S/$/.o/g}: machine
-#
-#beforedepend ${OBJS}: machine
-#
-#machine: .NOMETA
-#	ln -sf ${.CURDIR}/../../i386/include machine
-#
-#CLEANFILES+=	machine
-#.endif

sys/boot/userboot/ficl/Makefile.depend

@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libstand \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif