head	1.9;
access;
symbols
	RELENG_8_4:1.9.0.2
	RELENG_9_1_0_RELEASE:1.7.2.1.4.2
	RELENG_9_1:1.7.2.1.0.4
	RELENG_9_1_BP:1.7.2.1
	RELENG_8_3_0_RELEASE:1.3.2.1.8.1
	RELENG_8_3:1.3.2.1.0.8
	RELENG_8_3_BP:1.3.2.1
	RELENG_9_0_0_RELEASE:1.7.2.1.2.1
	RELENG_9_0:1.7.2.1.0.2
	RELENG_9_0_BP:1.7.2.1
	RELENG_9:1.7.0.2
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.1.12.1
	RELENG_8_2_0_RELEASE:1.3.2.1.6.1
	RELENG_7_4:1.1.0.12
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.3.2.1.0.6
	RELENG_8_2_BP:1.3.2.1
	RELENG_8_1_0_RELEASE:1.3.2.1.4.1
	RELENG_8_1:1.3.2.1.0.4
	RELENG_8_1_BP:1.3.2.1
	RELENG_7_3_0_RELEASE:1.1.10.1
	RELENG_7_3:1.1.0.10
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.3.2.1.2.1
	RELENG_8_0:1.3.2.1.0.2
	RELENG_8_0_BP:1.3.2.1
	RELENG_8:1.3.0.2
	RELENG_8_BP:1.3
	RELENG_7_2_0_RELEASE:1.1.8.1
	RELENG_7_2:1.1.0.8
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.6.1
	RELENG_7_1:1.1.0.6
	RELENG_7_1_BP:1.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_7_0:1.1.0.4
	RELENG_7_0_BP:1.1
	RELENG_7:1.1.0.2
	RELENG_7_BP:1.1;
locks; strict;
comment	@# @;


1.9
date	2012.11.17.01.51.18;	author svnexp;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2012.11.07.02.14.03;	author dteske;	state Exp;
branches;
next	1.7;

1.7
date	2011.06.07.00.39.15;	author marcel;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2011.05.30.04.23.33;	author julian;	state Exp;
branches;
next	1.5;

1.5
date	2011.05.28.08.50.38;	author julian;	state Exp;
branches;
next	1.4;

1.4
date	2010.08.23.01.50.34;	author imp;	state Exp;
branches;
next	1.3;

1.3
date	2009.02.21.15.04.31;	author ru;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2008.06.25.21.33.28;	author ru;	state Exp;
branches;
next	1.1;

1.1
date	2006.11.05.22.03.03;	author marcel;	state Exp;
branches
	1.1.2.1
	1.1.6.1
	1.1.8.1
	1.1.10.1
	1.1.12.1;
next	;

1.9.2.1
date	2012.11.17.01.51.18;	author svnexp;	state dead;
branches;
next	1.9.2.2;

1.9.2.2
date	2013.03.28.13.04.02;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.11.36.48;	author svnexp;	state Exp;
branches;
next	1.7.2.3;

1.7.2.3
date	2013.08.09.15.01.43;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.2.1.2.2;

1.7.2.1.2.2
date	2012.11.17.08.36.46;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.2.1.4.2;

1.7.2.1.4.2
date	2012.11.17.08.47.36;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1
	1.3.2.1.6.1
	1.3.2.1.8.1;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.10.36.27;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.2.1.8.2;

1.3.2.1.8.2
date	2012.11.17.08.25.07;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2012.11.17.08.04.54;	author svnexp;	state Exp;
branches;
next	;

1.1.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.12.2;

1.1.12.2
date	2012.11.17.08.17.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/ia64/common/Makefile 242688 2012-11-07 02:14:03Z dteske $

.include <bsd.own.mk>
MK_SSP=		no

LIB=		ia64
INTERNALLIB=

SRCS=		autoload.c bootinfo.c copy.c devicename.c exec.c icache.c

CFLAGS+=	-I${.CURDIR}/../../efi/include
CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
CFLAGS+=	-I${.CURDIR}/../../..
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand

.if ${MK_FORTH} != "no"
BOOT_FORTH=	yes
CFLAGS+=	-DBOOT_FORTH
CFLAGS+=	-I${.CURDIR}/../../ficl
CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
.endif

.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"

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

FILES+=		loader.help
CLEANFILES+=	loader.help
loader.help: help.common
	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
	    > ${.TARGET}

.PATH: ${.CURDIR}/../../forth
FILES+=		loader.4th support.4th loader.conf
FILES+=		screen.4th frames.4th
FILES+=		beastie.4th brand.4th check-password.4th color.4th delay.4th
FILES+=		menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+=		loader.rc
.endif
.if !exists(${DESTDIR}/boot/menu.rc)
FILES+=		menu.rc
.endif
FILESDIR_loader.conf= /boot/defaults

.include <bsd.lib.mk>
@


1.9.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:04:02 +0000
@
text
@d1 47
@


1.9.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 41
# $FreeBSD: releng/8.4/sys/boot/ia64/common/Makefile 188895 2009-02-21 15:04:31Z ru $

.include <bsd.own.mk>
MK_SSP=		no

LIB=		ia64
INTERNALLIB=

SRCS=		autoload.c bootinfo.c copy.c devicename.c exec.c

CFLAGS+=	-I${.CURDIR}/../../efi/include
CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
CFLAGS+=	-I${.CURDIR}/../../..
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand

.if ${MK_FORTH} != "no"
BOOT_FORTH=	yes
CFLAGS+=	-DBOOT_FORTH
CFLAGS+=	-I${.CURDIR}/../../ficl
CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_ARCH}
.endif

.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"

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

FILES+=		loader.help
CLEANFILES+=	loader.help
loader.help: help.common
	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
	    > ${.TARGET}

.PATH: ${.CURDIR}/../../forth
FILES+=		loader.4th support.4th loader.conf
.if !exists(${DESTDIR}/boot/loader.rc)
FILES+=		loader.rc
.endif
FILESDIR_loader.conf= /boot/defaults

.include <bsd.lib.mk>
@


1.8
log
@SVN rev 242688 on 2012-11-07 02:14:03Z by dteske

Hook in new files menusets.4th and manual.

Approved by:	adrian (co-mentor) (implicit)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7
log
@SVN rev 222798 on 2011-06-07 00:39:15Z by marcel

Add ia64_sync_icache() and use it to make the I-cache coherent
after loading the kernel's text segment. The kernel will do the
same for loaded modules, so don't worry about that.
@
text
@d38 1
a38 1
FILES+=		menu.4th menu-commands.4th shortcuts.4th version.4th
@


1.7.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.7.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/ia64/common/Makefile 222798 2011-06-07 00:39:15Z marcel $
@


1.7.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/254146
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/ia64/common/Makefile 254146 2013-08-09 14:17:47Z dteske $
d38 1
a38 1
FILES+=		menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
@


1.7.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.7.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/ia64/common/Makefile 222798 2011-06-07 00:39:15Z marcel $
@


1.7.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.7.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/ia64/common/Makefile 222798 2011-06-07 00:39:15Z marcel $
@


1.6
log
@SVN rev 222472 on 2011-05-30 04:23:33Z by julian

Include forgotten framework changes to get some of the new menu files installed correctly  on non x86/amd systems.
pointy-hut to  devin
@
text
@d9 1
a9 1
SRCS=		autoload.c bootinfo.c copy.c devicename.c exec.c
@


1.5
log
@SVN rev 222417 on 2011-05-28 08:50:38Z by julian

New boot loader menus from Devin Teske.
Discussed on hackers and recommended for inclusion into 9.0 at the devsummit.
All support email to devin   dteske at vicor dot ignoreme dot com .

Submitted by:	dteske at vicor dot ignoreme dot com
Reviewed by:	me and many others
@
text
@d36 1
@


1.4
log
@SVN rev 211680 on 2010-08-23 01:50:34Z by imp

MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH (which simplifies some powerpc/powerpc64 ifs)
@
text
@d36 2
d41 3
@


1.3
log
@SVN rev 188895 on 2009-02-21 15:04:31Z by ru

Fix build when WITH_SSP is set explicitly.

Submitted by:	Jeremie Le Hen
@
text
@d12 1
a12 1
CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
d20 1
a20 1
CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_ARCH}
@


1.3.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.3.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/boot/ia64/common/Makefile 188895 2009-02-21 15:04:31Z ru $
@


1.3.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/ia64/common/Makefile 188895 2009-02-21 15:04:31Z ru $
@


1.3.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2
log
@SVN rev 180012 on 2008-06-25 21:33:28Z by ru

Enable GCC stack protection (aka Propolice) for userland:
- It is opt-out for now so as to give it maximum testing, but it may be
  turned opt-in for stable branches depending on the consensus.  You
  can turn it off with WITHOUT_SSP.
- WITHOUT_SSP was previously used to disable the build of GNU libssp.
  It is harmless to steal the knob as SSP symbols have been provided
  by libc for a long time, GNU libssp should not have been much used.
- SSP is disabled in a few corners such as system bootstrap programs
  (sys/boot), process bootstrap code (rtld, csu) and SSP symbols themselves.
- It should be safe to use -fstack-protector-all to build world, however
  libc will be automatically downgraded to -fstack-protector because it
  breaks rtld otherwise.
- This option is unavailable on ia64.

Enable GCC stack protection (aka Propolice) for kernel:
- It is opt-out for now so as to give it maximum testing.
- Do not compile your kernel with -fstack-protector-all, it won't work.

Submitted by:	Jeremie Le Hen <jeremie@@le-hen.org>
@
text
@a2 2
WITHOUT_SSP=

d4 1
@


1.1
log
@Major rework of the ia64 loaders. The two primary objectives are:
1. Make libefi portable by removing ia64 specific code and build
   it on i386 and amd64 by default to prevent regressions. These
   changes include fixes and improvements over previous code to
   establish or improve APIs where none existed or when the amount
   of kluging was unacceptably high.
2. Increase the amount of sharing between the efi and ski loaders
   to improve maintainability of the loaders and simplify making
   changes to the loader-kernel handshaking in the future.

The version of the efi and ski loaders are now both changed to 1.2
as user visible improvements and changes have been made.
@
text
@d3 2
@


1.1.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/ia64/common/Makefile 164010 2006-11-05 22:03:04Z marcel $
@


1.1.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/ia64/common/Makefile 164010 2006-11-05 22:03:04Z marcel $
@


1.1.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


