diff options
| -rw-r--r-- | sys/boot/alpha/common/Makefile.common | 19 | ||||
| -rw-r--r-- | sys/boot/alpha/loader/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/ficl/Makefile | 3 |
3 files changed, 22 insertions, 1 deletions
diff --git a/sys/boot/alpha/common/Makefile.common b/sys/boot/alpha/common/Makefile.common index fb2fc911914e..645d605899f7 100644 --- a/sys/boot/alpha/common/Makefile.common +++ b/sys/boot/alpha/common/Makefile.common @@ -13,7 +13,7 @@ SRCS+= dev_net.c # Enable BootForth BOOT_FORTH= yes CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha -#CFLAGS+= -DBOOT_FORTH +CFLAGS+= -DBOOT_FORTH .if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .else @@ -39,6 +39,10 @@ CFLAGS+= -I${.CURDIR}/.. CRT= start.o STRIP= BINDIR?= /boot +.ifdef INSTALL_FORTH +MAN5= ../../forth/loader.conf.5 +MAN8= ../../i386/loader/loader.8 ../../forth/loader.4th.8 +.endif all: ${BASE} @@ -68,6 +72,19 @@ beforeinstall: ${.CURDIR}/${BASE}.help ${DESTDIR}/boot .endif .endif +.ifdef INSTALL_FORTH +.if !exists(${DESTDIR}/boot/loader.rc) + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +.endif + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults +.endif + start.o: ${.CURDIR}/../libalpha/start.S ${CC} -c ${CFLAGS} $< diff --git a/sys/boot/alpha/loader/Makefile b/sys/boot/alpha/loader/Makefile index 470562d64868..757ab9011ed0 100644 --- a/sys/boot/alpha/loader/Makefile +++ b/sys/boot/alpha/loader/Makefile @@ -5,6 +5,7 @@ PROG= ${BASE} NOMAN= NEWVERSWHAT= "SRM disk boot" alpha INSTALL_HELP= yes +INSTALL_FORTH= yes LOAD_ADDRESS= ${SECONDARY_LOAD_ADDRESS} # Only disk support diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index a99ee626ff47..f28b41c5b3d9 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -4,6 +4,9 @@ BASE_SRCS= dict.c ficl.c math64.c stack.c vm.c words.c SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o +.if ${MACHINE_ARCH} == "alpha" +CFLAGS+= -mno-fp-regs +.endif .ifmake testmain CFLAGS+= -DTESTMAIN -D_TESTMAIN SRCS+= testmain.c |