From owner-svn-src-head@freebsd.org  Mon Oct 30 23:14:50 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26364E26307;
 Mon, 30 Oct 2017 23:14:50 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA5DF76067;
 Mon, 30 Oct 2017 23:14:49 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UNEmYD025927;
 Mon, 30 Oct 2017 23:14:49 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UNEmL1025926;
 Mon, 30 Oct 2017 23:14:48 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710302314.v9UNEmL1025926@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 30 Oct 2017 23:14:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325173 - in head/sys/boot/userboot: . ficl
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys/boot/userboot: . ficl
X-SVN-Commit-Revision: 325173
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 23:14:50 -0000

Author: imp
Date: Mon Oct 30 23:14:48 2017
New Revision: 325173
URL: https://svnweb.freebsd.org/changeset/base/325173

Log:
  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

Deleted:
  head/sys/boot/userboot/ficl/Makefile
  head/sys/boot/userboot/ficl/Makefile.depend
Modified:
  head/sys/boot/userboot/Makefile

Modified: head/sys/boot/userboot/Makefile
==============================================================================
--- head/sys/boot/userboot/Makefile	Mon Oct 30 23:14:44 2017	(r325172)
+++ head/sys/boot/userboot/Makefile	Mon Oct 30 23:14:48 2017	(r325173)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		ficl test zfs userboot
+SUBDIR=		test zfs userboot
 
 .include <bsd.subdir.mk>