head	1.3;
access;
symbols
	RELENG_9_1_0_RELEASE:1.1.2.1.4.2
	RELENG_9_1:1.1.2.1.0.4
	RELENG_9_1_BP:1.1.2.1
	RELENG_9_0_0_RELEASE:1.1.2.1.2.1
	RELENG_9_0:1.1.2.1.0.2
	RELENG_9_0_BP:1.1.2.1
	RELENG_9:1.1.0.2
	RELENG_9_BP:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.51.20;	author svnexp;	state Exp;
branches;
next	1.2;

1.2
date	2012.10.20.16.57.23;	author avg;	state Exp;
branches;
next	1.1;

1.1
date	2011.06.30.16.08.56;	author dfr;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.1.2.1.2.1
	1.1.2.1.4.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.11.36.48;	author svnexp;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2012.11.18.12.46.23;	author svnexp;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2013.12.30.21.01.46;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.1.2.1.2.2;

1.1.2.1.2.2
date	2012.11.17.08.36.47;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.1.2.1.4.2;

1.1.2.1.4.2
date	2012.11.17.08.47.37;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/userboot/ficl/Makefile 241785 2012-10-20 16:57:23Z avg $
#
.include <bsd.own.mk>
MK_SSP=		no

.PATH: ${.CURDIR}/../../ficl
.PATH: ${.CURDIR}/../../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

SRCS=		${BASE_SRCS} sysdep.c softcore.c
CLEANFILES=	softcore.c testmain testmain.o
CFLAGS+=	-ffreestanding -fPIC
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
#CFLAGS+=	-march=i386
CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
.endif
.if ${MACHINE_CPUARCH} == "i386"
CFLAGS+=	-mpreferred-stack-boundary=2
CFLAGS+=	-mno-sse3
.endif
.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
CFLAGS+=	-msoft-float
.endif
.if ${MACHINE} == "pc98"
CFLAGS+=	-Os -DPC98
.endif
.if HAVE_PNP
CFLAGS+=	-DHAVE_PNP
.endif
.ifmake testmain
CFLAGS+=	-DTESTMAIN -D_TESTMAIN
SRCS+=		testmain.c
PROG=		testmain
.include <bsd.prog.mk>
.else
LIB=		ficl
INTERNALLIB=
.include <bsd.lib.mk>
.endif

# Standard softwords
.PATH: ${.CURDIR}/../../ficl/softwords
SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
		ifbrack.fr
# Optional OO extension softwords
#SOFTWORDS+=	oo.fr classes.fr

#.if ${MACHINE_CPUARCH} == "amd64"
#CFLAGS+=	-m32 -I.
#.endif

.if ${MACHINE_ARCH} == "powerpc64"
CFLAGS+=	-m32 -mcpu=powerpc -I.
.endif

CFLAGS+=	-I${.CURDIR}/../../ficl
CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
CFLAGS+=	-I${.CURDIR}/../../common

softcore.c: ${SOFTWORDS} softcore.awk
	(cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}

#.if ${MACHINE_CPUARCH} == "amd64"
#${SRCS:M*.c:R:S/$/.o/g}: machine
#
#beforedepend ${OBJS}: machine
#
#machine:
#	ln -sf ${.CURDIR}/../../i386/include machine
#
#CLEANFILES+=	machine
#.endif
@


1.2
log
@SVN rev 241785 on 2012-10-20 16:57:23Z by avg

boot: use -march=i386 for both i386 and amd64 builds

.. so that consistent compilation algorithms are used for both
architectures as in practice the binaries are expected to be
interchangeable (for time being).
Previously i386 used default setting which were equivalent to
-march=i486 -mtune=generic.
The only difference is using smaller but slower "leave" instructions.

Discussed with:	jhb, dim
MFC after:	29 days
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1
log
@SVN rev 223695 on 2011-06-30 16:08:56Z by dfr

Add a version of the FreeBSD bootloader which can run in userland, packaged
as a shared library. This is intended to be used by BHyVe to load FreeBSD
kernels into new virtual machines.
@
text
@d15 1
d50 1
a50 1
#CFLAGS+=	-m32 -march=i386 -I.
@


1.1.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/userboot/ficl/Makefile 223695 2011-06-30 16:08:56Z dfr $
@


1.1.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 243219
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243219 | avg | 2012-11-18 12:28:29 +0000 (Sun, 18 Nov 2012) | 2 lines
## SVN ##
## SVN ## MFC r241785: boot: use -march=i386 for both i386 and amd64 builds
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/userboot/ficl/Makefile 243219 2012-11-18 12:28:29Z avg $
a14 1
#CFLAGS+=	-march=i386
d49 1
a49 1
#CFLAGS+=	-m32 -I.
@


1.1.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260096
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/userboot/ficl/Makefile 260096 2013-12-30 20:15:46Z dim $
d19 1
a19 1
CFLAGS.gcc+=	-mpreferred-stack-boundary=2
@


1.1.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/userboot/ficl/Makefile 223695 2011-06-30 16:08:56Z dfr $
@


1.1.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/userboot/ficl/Makefile 223695 2011-06-30 16:08:56Z dfr $
@


