From owner-svn-soc-all@freebsd.org Fri Aug 21 21:18:21 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27B419C00EE for ; Fri, 21 Aug 2015 21:18:21 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16BF012E1 for ; Fri, 21 Aug 2015 21:18:21 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LLIKZA098602 for ; Fri, 21 Aug 2015 21:18:20 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7LLIGqa098533 for svn-soc-all@FreeBSD.org; Fri, 21 Aug 2015 21:18:16 GMT (envelope-from clord@FreeBSD.org) Date: Fri, 21 Aug 2015 21:18:16 GMT Message-Id: <201508212118.t7LLIGqa098533@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 21:18:21 -0000 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 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 .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