socsvn commit: r290053 - in soc2015/clord/head/sys/boot: arm/uboot efi/loader ficl pc98/loader powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/loader userboot/ficl userboot/userboot
clord at FreeBSD.org
clord at FreeBSD.org
Fri Aug 21 21:18:21 UTC 2015
Author: clord
Date: Fri Aug 21 21:18:15 2015
New Revision: 290053
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290053
Log:
Updates Makefiles to point to correct places and include the math library.
Modified:
soc2015/clord/head/sys/boot/arm/uboot/Makefile
soc2015/clord/head/sys/boot/efi/loader/Makefile
soc2015/clord/head/sys/boot/ficl/Makefile
soc2015/clord/head/sys/boot/pc98/loader/Makefile
soc2015/clord/head/sys/boot/powerpc/kboot/Makefile
soc2015/clord/head/sys/boot/powerpc/ofw/Makefile
soc2015/clord/head/sys/boot/powerpc/ps3/Makefile
soc2015/clord/head/sys/boot/powerpc/uboot/Makefile
soc2015/clord/head/sys/boot/sparc64/loader/Makefile
soc2015/clord/head/sys/boot/userboot/ficl/Makefile
soc2015/clord/head/sys/boot/userboot/userboot/Makefile
Modified: soc2015/clord/head/sys/boot/arm/uboot/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/arm/uboot/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/arm/uboot/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -115,7 +115,7 @@
NO_WERROR.clang=
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} -lstand
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} -lstand -lm
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
Modified: soc2015/clord/head/sys/boot/efi/loader/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/efi/loader/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/efi/loader/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -111,7 +111,7 @@
DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} \
${LDSCRIPT}
-LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} -lm
.endif # ${COMPILER_TYPE} != "gcc"
Modified: soc2015/clord/head/sys/boot/ficl/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/ficl/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/ficl/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -16,7 +16,7 @@
stack.c system.c tools.c unix.c utility.c vm.c word.c
SRCS= ${BASE_SRCS} sysdep.c softcore.c
-CLEANFILES= softcore.c main main.o extras.o
+CLEANFILES= softcore.c testmain main.o extras.o
CFLAGS+= -ffreestanding
LDADD+= -lm
.if ${MACHINE_CPUARCH} == "i386" || \
Modified: soc2015/clord/head/sys/boot/pc98/loader/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/pc98/loader/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/pc98/loader/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -96,6 +96,6 @@
OBJS= ${BTXCRT}
DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} -lm
.include <bsd.prog.mk>
Modified: soc2015/clord/head/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -100,7 +100,7 @@
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND} -lm
SC_DFLT_FONT=cp437
Modified: soc2015/clord/head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -100,7 +100,7 @@
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSTAND} -lm
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: soc2015/clord/head/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -97,7 +97,7 @@
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} -lm
SC_DFLT_FONT=cp437
Modified: soc2015/clord/head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -100,7 +100,7 @@
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND} -lm
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: soc2015/clord/head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/sparc64/loader/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/sparc64/loader/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -86,7 +86,7 @@
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand
+LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand -lm
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../loader/version \
Modified: soc2015/clord/head/sys/boot/userboot/ficl/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/userboot/ficl/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/userboot/ficl/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -5,12 +5,15 @@
.PATH: ${.CURDIR}/../../../contrib/ficl
.PATH: ${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH}
-BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
- prefix.c search.c stack.c tools.c vm.c words.c
+.PATH: ${FICLDIR}/ficlplatform
+BASE_SRCS= bit.c callback.c compatibility.c dictionary.c double.c fileaccess.c \
+ float.c hash.c loader.c lzuncompress.c prefix.c primitives.c search.c \
+ stack.c system.c tools.c unix.c utility.c vm.c word.c
SRCS= ${BASE_SRCS} sysdep.c softcore.c
-CLEANFILES= softcore.c testmain testmain.o
+CLEANFILES= softcore.c testmain main.o extras.o
CFLAGS+= -ffreestanding -fPIC
+LDADD+= -lm
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
#CFLAGS+= -march=i386
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
@@ -30,7 +33,7 @@
.endif
.ifmake testmain
CFLAGS+= -DTESTMAIN -D_TESTMAIN
-SRCS+= testmain.c
+SRCS+= main.c extras.c
PROG= testmain
.include <bsd.prog.mk>
.else
@@ -40,9 +43,9 @@
.endif
# Standard softwords
-.PATH: ${.CURDIR}/../../../contrib/ficl/softwords
-SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
- ifbrack.fr
+.PATH: ${.CURDIR}/../../../contrib/ficl/softcore
+SOFTWORDS= softcore.fr ifbrack.fr ficl.fr jhlocal.fr marker.fr \
+ freebsd.fr ficllocal.fr
# Optional OO extension softwords
#SOFTWORDS+= oo.fr classes.fr
@@ -59,7 +62,7 @@
CFLAGS+= -I${.CURDIR}/../../common
softcore.c: ${SOFTWORDS} softcore.awk
- (cd ${.CURDIR}/../../../contrib/ficl/softwords; cat ${SOFTWORDS} \
+ (cd ${.CURDIR}/../../../contrib/ficl/softcore; cat ${SOFTWORDS} \
| awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
#.if ${MACHINE_CPUARCH} == "amd64"
Modified: soc2015/clord/head/sys/boot/userboot/userboot/Makefile
==============================================================================
--- soc2015/clord/head/sys/boot/userboot/userboot/Makefile Fri Aug 21 20:45:25 2015 (r290052)
+++ soc2015/clord/head/sys/boot/userboot/userboot/Makefile Fri Aug 21 21:18:15 2015 (r290053)
@@ -62,6 +62,6 @@
CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I.
DPADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
-LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND}
+LDADD+= ${LIBFICL} ${LIBZFSBOOT} ${LIBSTAND} -lm
.include <bsd.lib.mk>
More information about the svn-soc-all
mailing list