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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to