head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.2.2.2.2.2
	RELENG_9_1:1.2.2.2.0.2
	RELENG_9_1_BP:1.2.2.2
	RELENG_8_3_0_RELEASE:1.1.12.1.8.1
	RELENG_8_3:1.1.12.1.0.8
	RELENG_8_3_BP:1.1.12.1
	RELENG_9_0_0_RELEASE:1.2.2.1.2.1
	RELENG_9_0:1.2.2.1.0.2
	RELENG_9_0_BP:1.2.2.1
	RELENG_9:1.2.0.2
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.16.1
	RELENG_8_2_0_RELEASE:1.1.12.1.6.1
	RELENG_7_4:1.1.0.16
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.1.12.1.0.6
	RELENG_8_2_BP:1.1.12.1
	RELENG_8_1_0_RELEASE:1.1.12.1.4.1
	RELENG_8_1:1.1.12.1.0.4
	RELENG_8_1_BP:1.1.12.1
	RELENG_7_3_0_RELEASE:1.1.14.1
	RELENG_7_3:1.1.0.14
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.1.12.1.2.1
	RELENG_8_0:1.1.12.1.0.2
	RELENG_8_0_BP:1.1.12.1
	RELENG_8:1.1.0.12
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.10.1
	RELENG_7_2:1.1.0.10
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.8.1
	RELENG_6_4_0_RELEASE:1.1.2.1.6.1
	RELENG_7_1:1.1.0.8
	RELENG_7_1_BP:1.1
	RELENG_6_4:1.1.2.1.0.6
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.1.0.6
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.2.1.0.4
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.1.0.4
	RELENG_7_BP:1.1
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.2
	RELENG_6_2_BP:1.1.2.1
	RELENG_6:1.1.0.2;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.51.19;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2012.11.07.19.51.53;	author dim;	state Exp;
branches;
next	1.3;

1.3
date	2012.05.11.09.46.17;	author avg;	state Exp;
branches;
next	1.2;

1.2
date	2010.06.03.17.42.32;	author ed;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2006.05.14.07.26.02;	author nyan;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.8.1
	1.1.10.1
	1.1.12.1
	1.1.14.1
	1.1.16.1;
next	;

1.5.2.1
date	2012.11.17.01.51.19;	author svnexp;	state dead;
branches;
next	1.5.2.2;

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

1.2.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2012.06.29.10.12.18;	author avg;	state Exp;
branches
	1.2.2.2.2.1;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.11.36.48;	author svnexp;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2012.11.17.23.09.38;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

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

1.2.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.2.2.2;

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

1.1.2.1
date	2006.06.16.13.40.50;	author nyan;	state Exp;
branches
	1.1.2.1.6.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.42.41;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1
date	2012.11.17.08.04.55;	author svnexp;	state Exp;
branches;
next	;

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

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

1.1.12.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.12.1.2.1
	1.1.12.1.4.1
	1.1.12.1.6.1
	1.1.12.1.8.1;
next	1.1.12.2;

1.1.12.2
date	2012.06.29.10.12.27;	author avg;	state Exp;
branches;
next	1.1.12.3;

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

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

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

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

1.1.12.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.12.1.8.2;

1.1.12.1.8.2
date	2012.11.17.08.25.08;	author svnexp;	state Exp;
branches;
next	;

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

1.1.16.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.16.2;

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


desc
@@


1.5
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/pc98/cdboot/Makefile 242706 2012-11-07 19:51:53Z dim $

PROG=	cdboot
STRIP=
BINMODE=${NOBINMODE}
NO_MAN=
SRCS=	${PROG}.S

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

ORG=	0x0000

LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary

.include <bsd.prog.mk>

# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S=	${CLANG_NO_IAS}
CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
@


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


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 15
# $FreeBSD: releng/8.4/sys/boot/pc98/cdboot/Makefile 237764 2012-06-29 10:12:27Z avg $

PROG=	cdboot
STRIP=
BINMODE=${NOBINMODE}
NO_MAN=
SRCS=	${PROG}.S

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

ORG=	0x0000

LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary

.include <bsd.prog.mk>
@


1.4
log
@SVN rev 242706 on 2012-11-07 19:51:53Z by dim

Put in a band-aid to get the pc98 bootstraps building, now clang is the
default compiler.  This has two parts:
- Make sys/boot/pc98/boot2 always build with gcc for now, until we can
  figure out a way to shrink it enough when building with clang.
- Since sys/boot/p98/cdboot uses .code16 directives, which are not yet
  supported by clang's integrated assembler, use -no-integrated-as,
  similar to sys/boot/i386/cdboot.

Reviewed by:	nyan
MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.3
log
@SVN rev 235264 on 2012-05-11 09:46:17Z by avg

MFi386: improve argument passing via btxldr

use related definitions in i386 bootargs.h

Reviewed by:	nyan, jhb
MFC after:	1 month
@
text
@d16 4
@


1.2
log
@SVN rev 208789 on 2010-06-03 17:42:32Z by ed

Use -Wl,-N instead of the undocumented -N option for GCC.

GCC forwards the -N flag directly to ld. This flag is not documented and
not supported by (for example) Clang. Just use -Wl,-N.

Submitted by:	Pawel Worach
@
text
@d7 3
a9 1
SRCS=	${PROG}.s
@


1.2.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.2.2.2
log
@SVN rev 237763 on 2012-06-29 10:12:18Z by avg

MFC r235264: MFi386: improve argument passing via btxldr
@
text
@d7 1
a7 3
SRCS=	${PROG}.S

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


1.2.2.3
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/pc98/cdboot/Makefile 237763 2012-06-29 10:12:18Z avg $
@


1.2.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 243190
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243190 | dim | 2012-11-17 22:40:18 +0000 (Sat, 17 Nov 2012) | 17 lines
## SVN ##
## SVN ## MFC r242706:
## SVN ##
## SVN ##   Put in a band-aid to get the pc98 bootstraps building, now clang is the
## SVN ##   default compiler.  This has two parts:
## SVN ##   - Make sys/boot/pc98/boot2 always build with gcc for now, until we can
## SVN ##     figure out a way to shrink it enough when building with clang.
## SVN ##   - Since sys/boot/p98/cdboot uses .code16 directives, which are not yet
## SVN ##     supported by clang's integrated assembler, use -no-integrated-as,
## SVN ##     similar to sys/boot/i386/cdboot.
## SVN ##
## SVN ##   Reviewed by:	nyan
## SVN ##
## SVN ## MFC r242874:
## SVN ##
## SVN ##   Work around pc98 tinderbox failures in sys/boot/pc98, by making sure a
## SVN ##   cross gcc gets built during the cross-tools stage.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/pc98/cdboot/Makefile 243190 2012-11-17 22:40:18Z dim $
a15 4

# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S=	${CLANG_NO_IAS}
CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
@


1.2.2.2.2.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.2.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/pc98/cdboot/Makefile 237763 2012-06-29 10:12:18Z avg $
@


1.2.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.2.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/pc98/cdboot/Makefile 208789 2010-06-03 17:42:32Z ed $
@


1.1
log
@Add a bootable CD support.
@
text
@d11 1
a11 1
LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
@


1.1.4.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/pc98/cdboot/Makefile 158559 2006-05-14 07:26:02Z nyan $
@


1.1.16.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.16.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/pc98/cdboot/Makefile 158559 2006-05-14 07:26:02Z nyan $
@


1.1.14.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.12.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.1.12.2
log
@SVN rev 237764 on 2012-06-29 10:12:27Z by avg

MFC r235264: MFi386: improve argument passing via btxldr
@
text
@d7 1
a7 3
SRCS=	${PROG}.S

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


1.1.12.3
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/pc98/cdboot/Makefile 237764 2012-06-29 10:12:27Z avg $
@


1.1.12.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.1.12.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/pc98/cdboot/Makefile 158559 2006-05-14 07:26:02Z nyan $
@


1.1.12.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.1.12.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.1.12.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.1.10.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.8.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
@@


1.1.2.1
log
@Add the cdboot for pc98 to the right place, and remove wrong files.

Pointy hat to:	nyan
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/pc98/cdboot/Makefile 159663 2006-06-16 13:40:50Z nyan $
@


1.1.2.1.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


