From owner-svn-src-head@freebsd.org  Tue Sep  1 13:51:08 2015
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 82CF29C65BA;
 Tue,  1 Sep 2015 13:51:08 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 73B7D1FCA;
 Tue,  1 Sep 2015 13:51:08 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t81Dp86I017778;
 Tue, 1 Sep 2015 13:51:08 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t81Dp8h5017776;
 Tue, 1 Sep 2015 13:51:08 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201509011351.t81Dp8h5017776@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 1 Sep 2015 13:51:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287365 - in head/sys/boot/efi/loader: . arch/arm64
X-SVN-Group: head
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.20
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: Tue, 01 Sep 2015 13:51:08 -0000

Author: andrew
Date: Tue Sep  1 13:51:07 2015
New Revision: 287365
URL: https://svnweb.freebsd.org/changeset/base/287365

Log:
  Install the forth bits on arm64. For now limit it to just arm64 as on x86
  these should have been installed as part of the regular loader.

Modified:
  head/sys/boot/efi/loader/Makefile
  head/sys/boot/efi/loader/arch/arm64/Makefile.inc

Modified: head/sys/boot/efi/loader/Makefile
==============================================================================
--- head/sys/boot/efi/loader/Makefile	Tue Sep  1 13:47:12 2015	(r287364)
+++ head/sys/boot/efi/loader/Makefile	Tue Sep  1 13:51:07 2015	(r287365)
@@ -73,13 +73,13 @@ CFLAGS+=	-DEFI_STAGING_SIZE=${EFI_STAGIN
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
 
-FILES=	loader.efi
+FILES+=	loader.efi
 FILESMODE_loader.efi=	${BINMODE}
 
 LDSCRIPT=	${.CURDIR}/arch/${MACHINE}/ldscript.${MACHINE}
 LDFLAGS+=	-Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
 
-CLEANFILES=	vers.c loader.efi
+CLEANFILES+=	vers.c loader.efi
 
 NEWVERSWHAT=	"EFI loader" ${MACHINE}
 

Modified: head/sys/boot/efi/loader/arch/arm64/Makefile.inc
==============================================================================
--- head/sys/boot/efi/loader/arch/arm64/Makefile.inc	Tue Sep  1 13:47:12 2015	(r287364)
+++ head/sys/boot/efi/loader/arch/arm64/Makefile.inc	Tue Sep  1 13:51:07 2015	(r287365)
@@ -9,3 +9,16 @@ CFLAGS+=-I${.CURDIR}/../../arm64/libarm6
 SRCS+=	cache.c
 
 CFLAGS+=	-msoft-float -mgeneral-regs-only
+
+CLEANFILES+=	loader.help
+
+loader.help: help.common
+	cat ${.ALLSRC} | \
+	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
+
+.if !defined(LOADER_ONLY)
+.PATH: ${.CURDIR}/../../forth
+.include	"${.CURDIR}/../../forth/Makefile.inc"
+
+FILES+=	loader.rc
+.endif