Index: head/sys/boot/Makefile.inc
===================================================================
--- head/sys/boot/Makefile.inc	(revision 324650)
+++ head/sys/boot/Makefile.inc	(revision 324651)
@@ -1,43 +1,39 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
+.include "defs.mk"
+
 .if !defined(__BOOT_MAKEFILE_INC__)
 __BOOT_MAKEFILE_INC__=${MFILE}
-
-SASRC=${SRCTOP}/sys/boot/libsa
-# Normal Standalone library
-LIBSA=${OBJTOP}/sys/boot/libsa/libsa.a
-# Standalone library compiled for 32-bit version of the processor
-LIBSA32=${OBJTOP}/sys/boot/libsa32/libsa32.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/defs.mk
===================================================================
--- head/sys/boot/defs.mk	(nonexistent)
+++ head/sys/boot/defs.mk	(revision 324651)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.if !defined(__BOOT_DEFS_MK__)
+__BOOT_DEFS_MK__=${MFILE}
+
+BOOTDIR=	${SRCTOP}/sys/boot
+FICLDIR=	${SRCTOP}/sys/boot/ficl
+LDR_MI=		${BOOTDIR}/common
+SASRC=		${SRCTOP}/sys/boot/libsa
+SYSDIR=		${SRCTOP}/sys
+
+# Normal Standalone library
+LIBSA=		${OBJTOP}/sys/boot/libsa/libsa.a
+# Standalone library compiled for 32-bit version of the processor
+LIBSA32=	${OBJTOP}/sys/boot/libsa32/libsa32.a
+
+.endif # __BOOT_DEFS_MK__

Property changes on: head/sys/boot/defs.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/boot/ficl.mk
===================================================================
--- head/sys/boot/ficl.mk	(revision 324650)
+++ head/sys/boot/ficl.mk	(revision 324651)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 # Common flags to build FICL related files
 
-FICLDIR?=	${SRCTOP}/sys/boot/ficl
+.include "defs.mk"
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 FICL_CPUARCH=	i386
 .elif ${MACHINE_ARCH:Mmips64*} != ""
 FICL_CPUARCH=	mips64
 .else
 FICL_CPUARCH=	${MACHINE_CPUARCH}
 .endif
 
 .PATH: ${FICLDIR} ${FICLDIR}/${FICL_CPUARCH}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 .if defined(FICL32)
 CFLAGS+=	-m32 -I.
 .else
 CFLAGS+=	-fPIC
 .endif
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc -I.
 .endif
 
-CFLAGS+=	-I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} -I${SRCTOP}/sys/boot/common
+CFLAGS+=	-I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} -I${LDR_MI}
 
 .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
 .if !exists(machine)
 ${SRCS:M*.c:R:S/$/.o/g}: machine
 
 beforedepend ${OBJS}: machine
 .endif
 
 machine: .NOMETA
 	ln -sf ${.CURDIR}/../../i386/include machine
 
 CLEANFILES+=	machine
 .endif
Index: head/sys/boot/loader.mk
===================================================================
--- head/sys/boot/loader.mk	(revision 324650)
+++ head/sys/boot/loader.mk	(revision 324651)
@@ -1,88 +1,87 @@
 # $FreeBSD$
 
-BOOTDIR=${SRCTOP}/sys/boot
-LDR_MI=${BOOTDIR}/common
+.include "defs.mk"
 
 .PATH: ${LDR_MI} ${BOOTDIR}/libsa
 
 CFLAGS+=-I${LDR_MI}
 
 SRCS+=	boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
 SRCS+=	module.c
 
 .if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 .elif ${MACHINE_CPUARCH} == "aarch64"
 SRCS+=	load_elf64.c reloc_elf64.c
 .elif ${MACHINE_CPUARCH} == "arm"
 SRCS+=	load_elf32.c reloc_elf32.c
 .elif ${MACHINE_CPUARCH} == "powerpc"
 SRCS+=	load_elf32.c reloc_elf32.c
 SRCS+=	load_elf64.c reloc_elf64.c
 .elif ${MACHINE_CPUARCH} == "sparc64"
 SRCS+=	load_elf64.c reloc_elf64.c
 .elif ${MACHINE_ARCH:Mmips64*} != ""
 SRCS+= load_elf64.c reloc_elf64.c
 .elif ${MACHINE} == "mips"
 SRCS+=	load_elf32.c reloc_elf32.c
 .endif
 
 .if defined(LOADER_NET_SUPPORT)
 SRCS+=	dev_net.c
 .endif
 
 .if !defined(LOADER_NO_DISK_SUPPORT)
 SRCS+=	disk.c part.c
 CFLAGS+= -DLOADER_DISK_SUPPORT
 .if !defined(LOADER_NO_GPT_SUPPORT)
 CFLAGS+= -DLOADER_GPT_SUPPORT
 .endif
 .if !defined(LOADER_NO_MBR_SUPPORT)
 CFLAGS+= -DLOADER_MBR_SUPPORT
 .endif
 .endif
 .if !defined(LOADER_NO_GELI_SUPPORT)
 CFLAGS+= -DLOADER_GELI_SUPPORT
 .endif
 
 .if defined(HAVE_BCACHE)
 SRCS+=  bcache.c
 .endif
 
 .if defined(MD_IMAGE_SIZE)
 CFLAGS+= -DMD_IMAGE_SIZE=${MD_IMAGE_SIZE}
 SRCS+=	md.c
 .endif
 
 # Machine-independant ISA PnP
 .if defined(HAVE_ISABUS)
 SRCS+=	isapnp.c
 .endif
 .if defined(HAVE_PNP)
 SRCS+=	pnp.c
 .endif
 
 # Forth interpreter
 .if defined(BOOT_FORTH)
 SRCS+=	interp_forth.c
 .include "${BOOTDIR}/ficl.mk"
 .endif
 
 .if defined(BOOT_PROMPT_123)
 CFLAGS+=	-DBOOT_PROMPT_123
 .endif
 
 .if defined(LOADER_INSTALL_SUPPORT)
 SRCS+=	install.c
 .endif
 
 CLEANFILES+=	vers.c
 VERSION_FILE?=	${.CURDIR}/version
 .if ${MK_REPRODUCIBLE_BUILD} != no
 REPRO_FLAG=	-r
 .endif
 vers.c: ${LDR_MI}/newvers.sh ${VERSION_FILE}
 	sh ${LDR_MI}/newvers.sh ${REPRO_FLAG} ${VERSION_FILE} \
 	    ${NEWVERSWHAT}