Attachment #315343 for bug #409815

Lines 3-8 Link Here

(-)a/sys/boot/i386/Makefile.inc (+5 lines)
3	# $FreeBSD: release/9.0.0/sys/boot/i386/Makefile.inc 224131 2011-07-17 13:50:21Z dim $	3	# $FreeBSD: release/9.0.0/sys/boot/i386/Makefile.inc 224131 2011-07-17 13:50:21Z dim $
4		4
5	BINDIR?= /boot	5	BINDIR?= /boot
		6	CC_AS_LD?= no
6		7
7	LOADER_ADDRESS?=0x200000	8	LOADER_ADDRESS?=0x200000
8	CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \	9	CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \
Lines 12-18 LDFLAGS+= -nostdlib Link Here
12	.if ${MACHINE_CPUARCH} == "amd64"	13	.if ${MACHINE_CPUARCH} == "amd64"
13	CFLAGS+= -m32 -march=i386	14	CFLAGS+= -m32 -march=i386
14	ACFLAGS+= -m32	15	ACFLAGS+= -m32
		16	.if ${CC_AS_LD} == "yes"
		17	LDFLAGS+= -Wl,-m,elf_i386_fbsd
		18	.else
15	LDFLAGS+= -m elf_i386_fbsd	19	LDFLAGS+= -m elf_i386_fbsd
		20	.endif
16	AFLAGS+= --32	21	AFLAGS+= --32
17	.endif	22	.endif
18		23

Lines 5-10 STRIP= Link Here

(-)a/sys/boot/i386/boot0/Makefile (+1 lines)
5	BINMODE=${NOBINMODE}	5	BINMODE=${NOBINMODE}
6	NO_MAN=	6	NO_MAN=
7	SRCS= ${PROG}.S	7	SRCS= ${PROG}.S
		8	CC_AS_LD=yes
8		9
9	# Additional options that you can specify with make OPTS="..."	10	# Additional options that you can specify with make OPTS="..."
10	# (these only apply to boot0.S)	11	# (these only apply to boot0.S)

Lines 4-9 PROG= btx Link Here

(-)a/sys/boot/i386/btx/btx/Makefile (+1 lines)
4	INTERNALPROG=	4	INTERNALPROG=
5	NO_MAN=	5	NO_MAN=
6	SRCS= btx.S	6	SRCS= btx.S
		7	CC_AS_LD=yes
7		8
8	.if defined(BOOT_BTX_NOHANG)	9	.if defined(BOOT_BTX_NOHANG)
9	BOOT_BTX_FLAGS=0x1	10	BOOT_BTX_FLAGS=0x1

Lines 4-9 PROG= btxldr Link Here

(-)a/sys/boot/i386/btx/btxldr/Makefile (+1 lines)
4	INTERNALPROG=	4	INTERNALPROG=
5	NO_MAN=	5	NO_MAN=
6	SRCS= btxldr.S	6	SRCS= btxldr.S
		7	CC_AS_LD=yes
7		8
8	CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}	9	CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
9		10

Lines 5-9 INTERNALPROG= Link Here

(-)a/sys/boot/i386/btx/lib/Makefile (+1 lines)
5	NO_MAN=	5	NO_MAN=
6	SRCS= btxcsu.s btxsys.s btxv86.s	6	SRCS= btxcsu.s btxsys.s btxv86.s
7	LDFLAGS=-Wl,-r	7	LDFLAGS=-Wl,-r
		8	CC_AS_LD=yes
8		9
9	.include <bsd.prog.mk>	10	.include <bsd.prog.mk>

Lines 5-10 STRIP= Link Here

(-)a/sys/boot/i386/cdboot/Makefile (+1 lines)
5	BINMODE=${NOBINMODE}	5	BINMODE=${NOBINMODE}
6	NO_MAN=	6	NO_MAN=
7	SRCS= ${PROG}.s	7	SRCS= ${PROG}.s
		8	CC_AS_LD=yes
8		9
9	ORG= 0x7c00	10	ORG= 0x7c00
10		11

Lines 5-10 STRIP= Link Here

(-)a/sys/boot/i386/mbr/Makefile (+1 lines)
5	BINMODE=${NOBINMODE}	5	BINMODE=${NOBINMODE}
6	NO_MAN=	6	NO_MAN=
7	SRCS= ${PROG}.s	7	SRCS= ${PROG}.s
		8	CC_AS_LD=yes
8		9
9	# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)	10	# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)
10	BOOT_MBR_FLAGS?= 0x80	11	BOOT_MBR_FLAGS?= 0x80

Lines 5-10 STRIP= Link Here

(-)a/sys/boot/i386/pmbr/Makefile (+1 lines)
5	BINMODE=${NOBINMODE}	5	BINMODE=${NOBINMODE}
6	NO_MAN=	6	NO_MAN=
7	SRCS= ${PROG}.s	7	SRCS= ${PROG}.s
		8	CC_AS_LD=yes
8		9
9	ORG= 0x600	10	ORG= 0x600
10		11

Lines 9-14 FILES= ${BOOT} Link Here

(-)a/sys/boot/i386/pxeldr/Makefile (+1 lines)
9	MAN= ${BOOT}.8	9	MAN= ${BOOT}.8
10	SRCS= ${LDR}.S	10	SRCS= ${LDR}.S
11	CLEANFILES= ${BOOT}	11	CLEANFILES= ${BOOT}
		12	CC_AS_LD=yes
12		13
13	BOOT= pxeboot	14	BOOT= pxeboot
14	LDR= pxeldr	15	LDR= pxeldr

Lines 4-9 PROG= btx Link Here

(-)a/sys/boot/pc98/btx/btx/Makefile (+1 lines)
4	INTERNALPROG=	4	INTERNALPROG=
5	NO_MAN=	5	NO_MAN=
6	SRCS= btx.S	6	SRCS= btx.S
		7	CC_AS_LD=yes
7		8
8	.if defined(BOOT_BTX_NOHANG)	9	.if defined(BOOT_BTX_NOHANG)
9	BOOT_BTX_FLAGS=0x1	10	BOOT_BTX_FLAGS=0x1

Lines 4-9 PROG= btxldr Link Here

(-)a/sys/boot/pc98/btx/btxldr/Makefile (+1 lines)
4	INTERNALPROG=	4	INTERNALPROG=
5	NO_MAN=	5	NO_MAN=
6	SRCS= btxldr.S	6	SRCS= btxldr.S
		7	CC_AS_LD=yes
7		8
8	CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}	9	CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
9		10

Lines 5-10 STRIP= Link Here

(-)a/sys/boot/pc98/cdboot/Makefile (+1 lines)
5	BINMODE=${NOBINMODE}	5	BINMODE=${NOBINMODE}
6	NO_MAN=	6	NO_MAN=
7	SRCS= ${PROG}.s	7	SRCS= ${PROG}.s
		8	CC_AS_LD=yes
8		9
9	ORG= 0x0000	10	ORG= 0x0000
10		11

Return to bug 409815