diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-10-30 03:12:28 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-10-30 03:12:28 +0000 |
| commit | 0b9bfebf8ba2c3e1f7a0a9c6b97edcd199a83e9b (patch) | |
| tree | c3da2c4819c3def10893d2943d790be99211433b /sys/boot/sparc64 | |
| parent | fa68dcb10415b023e9dc559432e9e40a13dce07e (diff) | |
| download | src-0b9bfebf8ba2c3e1f7a0a9c6b97edcd199a83e9b.tar.gz src-0b9bfebf8ba2c3e1f7a0a9c6b97edcd199a83e9b.zip | |
Use defs.mk defins in most MD code
Use defines from defs.mk in most MD code (the biggest exception is
x86, which will be its own commit due to its size). Prefer including
bsd.init.mk over the variations (../Makefile.inc and src.opts.mk being
the two biggest ones).
Sponsored by: Netflix
Notes
Notes:
svn path=/head/; revision=325114
Diffstat (limited to 'sys/boot/sparc64')
| -rw-r--r-- | sys/boot/sparc64/boot1/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/sparc64/loader/Makefile | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile index 8804ed6dd63b..bafa99d40bb5 100644 --- a/sys/boot/sparc64/boot1/Makefile +++ b/sys/boot/sparc64/boot1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "../Makefile.inc" +.include <bsd.init.mk> PROG= boot1.elf INTERNALPROG= @@ -13,7 +13,7 @@ BOOTBLOCKBASE= 0x4000 CFLAGS.clang+=-mcmodel=small CFLAGS.gcc+=-mcmodel=medlow -CFLAGS+=-Os -I${.CURDIR}/../../common +CFLAGS+=-Os -I${LDRSRC} -nostdlib LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N # Construct boot1. sunlabel expects it to contain zeroed-out space for the diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile index 683f7b3c9602..006147a7dc3a 100644 --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <src.opts.mk> +.include <bsd.init.mk> MK_SSP= no MAN= @@ -25,18 +25,20 @@ LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= no LOADER_DEBUG?= no +CFLAGS+=-nostdlib + .if ${LOADER_DEBUG} == "yes" CFLAGS+= -DLOADER_DEBUG .endif .if ${LOADER_ZFS_SUPPORT} == "yes" CFLAGS+= -DLOADER_ZFS_SUPPORT -CFLAGS+= -I${.CURDIR}/../../zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs -LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a +CFLAGS+= -I${BOOTSRC}/zfs +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. CLEANFILES+= loader.help @@ -44,8 +46,8 @@ CLEANFILES+= loader.help LDFLAGS= -static # Open Firmware standalone support library -LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a -CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ +LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a +CFLAGS+= -I${BOOTSRC}/ofw/libofw/ # Need sys/ for crypto/intake.h CFLAGS+= -I${SRCTOP}/sys @@ -57,8 +59,8 @@ loader.help: help.common help.sparc64 cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc |