Index: stable/10/lib/libiconv/Makefile
===================================================================
--- stable/10/lib/libiconv/Makefile	(revision 260496)
+++ stable/10/lib/libiconv/Makefile	(revision 260497)
@@ -1,24 +1,25 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/iconv
 
 LIB=	iconv
 SHLIB_MAJOR= 4
 MAN=	iconv.3 iconvctl.3 iconv_canonicalize.3 iconvlist.3 \
 	__iconv_get_list.3
 MLNKS=	iconv.3 iconv_open.3 \
 	iconv.3 iconv_open_into.3 \
 	iconv.3 iconv_close.3 \
 	iconv.3 __iconv.3 \
 	__iconv_get_list.3 __iconv_free_list.3
 SRCS=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
 	citrus_csmapper.c citrus_db.c citrus_db_factory.c \
 	citrus_db_hash.c citrus_esdb.c citrus_hash.c \
 	citrus_iconv.c citrus_lookup.c citrus_lookup_factory.c \
 	citrus_mapper.c citrus_memstream.c citrus_mmap.c \
 	citrus_module.c citrus_none.c citrus_pivot_factory.c \
 	citrus_prop.c citrus_stdenc.c iconv.c
 
-CFLAGS+= --param max-inline-insns-single=128 -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
+CFLAGS.gcc+= --param max-inline-insns-single=128
+CFLAGS+= -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/BIG5/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/BIG5/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/BIG5/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	BIG5
 SRCS+=	citrus_big5.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/EUC/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/EUC/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/EUC/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	EUC
 SRCS+=	citrus_euc.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/EUCTW/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/EUCTW/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/EUCTW/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	EUCTW
 SRCS+=	citrus_euctw.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/GBK2K/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/GBK2K/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/GBK2K/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	GBK2K
 SRCS+=	citrus_gbk2k.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/ISO2022/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/ISO2022/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/ISO2022/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	ISO2022
 SRCS+=	citrus_iso2022.c
-CFLAGS+= --param max-inline-insns-single=128
+CFLAGS.gcc+= --param max-inline-insns-single=128
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/JOHAB/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/JOHAB/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/JOHAB/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	JOHAB
 SRCS+=	citrus_johab.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/UES/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/UES/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/UES/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UES
 SRCS+=	citrus_ues.c
-CFLAGS+= --param max-inline-insns-single=64
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/UTF1632/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/UTF1632/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/UTF1632/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UTF1632
 SRCS+=	citrus_utf1632.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/UTF7/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/UTF7/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/UTF7/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UTF7
 SRCS+=	citrus_utf7.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/iconv_std/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/iconv_std/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/iconv_std/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	iconv_std
 SRCS+=	citrus_iconv_std.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/mapper_parallel/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/mapper_parallel/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/mapper_parallel/Makefile	(revision 260497)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../mapper_serial
 
 SHLIB=	mapper_parallel
 SRCS+=	citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/mapper_serial/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/mapper_serial/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/mapper_serial/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_serial
 SRCS+=	citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/mapper_std/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/mapper_std/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/mapper_std/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_std
 SRCS+=	citrus_mapper_std.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
 
 .include <bsd.lib.mk>
Index: stable/10/lib/libiconv_modules/mapper_zone/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/mapper_zone/Makefile	(revision 260496)
+++ stable/10/lib/libiconv_modules/mapper_zone/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_zone
 SRCS+=	citrus_mapper_zone.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
 
 .include <bsd.lib.mk>
Index: stable/10/sys/boot/i386/boot2/Makefile
===================================================================
--- stable/10/sys/boot/i386/boot2/Makefile	(revision 260496)
+++ stable/10/sys/boot/i386/boot2/Makefile	(revision 260497)
@@ -1,114 +1,115 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 FILES=		boot boot1 boot2
 
 NM?=		nm
 
 # A value of 0x80 enables LBA support.
 BOOT_BOOT1_FLAGS?=	0x80
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x2000
 
 # Decide level of UFS support.
 BOOT2_UFS?=	UFS1_AND_UFS2
 #BOOT2_UFS?=	UFS2_ONLY
 #BOOT2_UFS?=	UFS1_ONLY
 
 CFLAGS=	-Os \
 	-fomit-frame-pointer \
 	-mrtd \
 	-mregparm=3 \
 	-DUSE_XREAD \
 	-D${BOOT2_UFS} \
 	-DFLAGS=${BOOT_BOOT1_FLAGS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100 \
+	-Winline \
 	${CLANG_OPT_SMALL}
 
 CFLAGS.gcc+=	-fno-guess-branch-probability \
 		-fno-unit-at-a-time \
 		-mno-align-long-strings \
+		--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	boot
 
 boot: boot1 boot2
 	cat boot1 boot2 > boot
 
 CLEANFILES+=	boot1 boot1.out boot1.o
 
 boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
 
 boot2: boot2.ld
 	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
 
 boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
 	    -o ${.TARGET} -P 1 boot2.bin
 
 boot2.ldr:
 	dd if=/dev/zero of=${.TARGET} bs=512 count=1
 
 boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 	${CC} ${ACFLAGS} -c boot2.s
 
 SRCS=	boot2.c boot2.h
 
 boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c
 	${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c
 	sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
 	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define XREADORG %#x\n", REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
 	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend boot2.s: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.boot1.S=		${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/10/sys/boot/i386/gptboot/Makefile
===================================================================
--- stable/10/sys/boot/i386/gptboot/Makefile	(revision 260496)
+++ stable/10/sys/boot/i386/gptboot/Makefile	(revision 260497)
@@ -1,81 +1,83 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		gptboot
 MAN=		gptboot.8
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x0
 
 # Decide level of UFS support.
 GPTBOOT_UFS?=	UFS1_AND_UFS2
 #GPTBOOT_UFS?=	UFS2_ONLY
 #GPTBOOT_UFS?=	UFS1_ONLY
 
 CFLAGS=	-DBOOTPROG=\"gptboot\" \
 	-O1 \
 	-DGPT \
 	-D${GPTBOOT_UFS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-I${.CURDIR}/../../.. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	gptboot
 
 gptboot: gptldr.bin gptboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
 	    -o ${.TARGET} gptboot.bin
 
 CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \
 		cons.o util.o
 
 gptboot.bin: gptboot.out
 	objcopy -S -O binary gptboot.out ${.TARGET}
 
 gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 gptboot.o: ${.CURDIR}/../../common/ufsread.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend gptboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.gptldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/10/sys/boot/i386/gptzfsboot/Makefile
===================================================================
--- stable/10/sys/boot/i386/gptzfsboot/Makefile	(revision 260496)
+++ stable/10/sys/boot/i386/gptzfsboot/Makefile	(revision 260497)
@@ -1,78 +1,80 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
 		${.CURDIR}/../zfsboot ${.CURDIR}/../common \
 		${.CURDIR}/../../common
 
 FILES=		gptzfsboot
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x0
 
 CFLAGS=	-DBOOTPROG=\"gptzfsboot\" \
 	-O1 \
 	-DGPT -DBOOT2 \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../../zfs \
 	-I${.CURDIR}/../../../cddl/boot/zfs \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-I${.CURDIR}/../../.. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	gptzfsboot
 
 gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
 	    -o ${.TARGET} gptzfsboot.bin
 
 CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \
 		drv.o gpt.o util.o
 
 gptzfsboot.bin: gptzfsboot.out
 	objcopy -S -O binary gptzfsboot.out ${.TARGET}
 
 gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.gptldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/10/sys/boot/i386/zfsboot/Makefile
===================================================================
--- stable/10/sys/boot/i386/zfsboot/Makefile	(revision 260496)
+++ stable/10/sys/boot/i386/zfsboot/Makefile	(revision 260497)
@@ -1,91 +1,93 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		zfsboot
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x2000
 
 CFLAGS=	-DBOOTPROG=\"zfsboot\" \
 	-O1 \
 	-DBOOT2 \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../../zfs \
 	-I${.CURDIR}/../../../cddl/boot/zfs \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	zfsboot
 
 zfsboot: zfsboot1 zfsboot2
 	cat zfsboot1 zfsboot2 > zfsboot
 
 CLEANFILES+=	zfsboot1 zfsldr.out zfsldr.o
 
 zfsboot1: zfsldr.out
 	objcopy -S -O binary zfsldr.out ${.TARGET}
 
 zfsldr.out: zfsldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
 
 CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
 		zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o
 
 # We currently allow 65536 bytes for zfsboot - in practice it could be
 # any size up to 3.5Mb but keeping it fixed size simplifies zfsldr.
 # 
 BOOT2SIZE=	65536
 
 zfsboot2: zfsboot.ld
 	@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
 
 zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
 	    -o ${.TARGET} -P 1 zfsboot.bin
 
 zfsboot.ldr:
 	cp /dev/null ${.TARGET}
 
 zfsboot.bin: zfsboot.out
 	objcopy -S -O binary zfsboot.out ${.TARGET}
 
 zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 SRCS=	zfsboot.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/10/sys/boot/pc98/boot2/Makefile
===================================================================
--- stable/10/sys/boot/pc98/boot2/Makefile	(revision 260496)
+++ stable/10/sys/boot/pc98/boot2/Makefile	(revision 260497)
@@ -1,110 +1,112 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
 CC:=		gcc
 COMPILER_TYPE:=	gcc
 
 FILES=		boot boot1 boot2
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x238
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0
 ORG2=	0x2000
 
 # Decide level of UFS support.
 BOOT2_UFS?=	UFS1_AND_UFS2
 #BOOT2_UFS?=	UFS2_ONLY
 #BOOT2_UFS?=	UFS1_ONLY
 
 CFLAGS=	-Os \
 	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
 	-fno-unit-at-a-time \
 	-mno-align-long-strings \
 	-mrtd \
 	-mregparm=3 \
 	-D${BOOT2_UFS} \
 	-DFLAGS=${BOOT_BOOT1_FLAGS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../.. \
 	-I${.CURDIR}/../../i386/boot2 \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 # Set machine type to PC98_SYSTEM_PARAMETER
 #CFLAGS+=	-DSET_MACHINE_TYPE
 
 # Initialize the bi_bios_geom using the BIOS geometry
 #CFLAGS+=	-DGET_BIOSGEOM
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 .PATH:	${.CURDIR}/../../i386/boot2
 
 CLEANFILES=	boot
 
 boot: boot1 boot2
 	cat boot1 boot2 > boot
 
 CLEANFILES+=	boot1 boot1.out boot1.o
 
 boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
 
 boot2: boot2.ld
 	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
 
 boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
 	    -o ${.TARGET} -P 1 boot2.bin
 
 boot2.ldr:
 	dd if=/dev/zero of=${.TARGET} bs=276 count=1
 
 boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 
 SRCS=	boot2.c boot2.h
 
 boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c
 	${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c
 	sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
 	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
 	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/10/usr.sbin/mfiutil/Makefile
===================================================================
--- stable/10/usr.sbin/mfiutil/Makefile	(revision 260496)
+++ stable/10/usr.sbin/mfiutil/Makefile	(revision 260497)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 PROG=	mfiutil
 
 SRCS=	mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \
 	mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c
 MAN8=	mfiutil.8
 
-CFLAGS+= -fno-builtin-strftime
+CFLAGS.gcc+= -fno-builtin-strftime
 
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
 # Here be dragons
 .ifdef DEBUG
 CFLAGS+= -DDEBUG
 .endif
 
 .include <bsd.prog.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 260496)
+++ stable/10	(revision 260497)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r260334,260369
Index: stable/9/lib/libiconv/Makefile
===================================================================
--- stable/9/lib/libiconv/Makefile	(revision 260496)
+++ stable/9/lib/libiconv/Makefile	(revision 260497)
@@ -1,24 +1,25 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/iconv
 
 LIB=	iconv
 SHLIB_MAJOR= 4
 MAN=	iconv.3 iconvctl.3 iconv_canonicalize.3 iconvlist.3 \
 	__iconv_get_list.3
 MLNKS=	iconv.3 iconv_open.3 \
 	iconv.3 iconv_open_into.3 \
 	iconv.3 iconv_close.3 \
 	iconv.3 __iconv.3 \
 	__iconv_get_list.3 __iconv_free_list.3
 SRCS=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
 	citrus_csmapper.c citrus_db.c citrus_db_factory.c \
 	citrus_db_hash.c citrus_esdb.c citrus_hash.c \
 	citrus_iconv.c citrus_lookup.c citrus_lookup_factory.c \
 	citrus_mapper.c citrus_memstream.c citrus_mmap.c \
 	citrus_module.c citrus_none.c citrus_pivot_factory.c \
 	citrus_prop.c citrus_stdenc.c iconv.c
 
-CFLAGS+= --param max-inline-insns-single=128 -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
+CFLAGS.gcc+= --param max-inline-insns-single=128
+CFLAGS+= -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/BIG5/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/BIG5/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/BIG5/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	BIG5
 SRCS+=	citrus_big5.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/EUC/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/EUC/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/EUC/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	EUC
 SRCS+=	citrus_euc.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/EUCTW/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/EUCTW/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/EUCTW/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	EUCTW
 SRCS+=	citrus_euctw.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/GBK2K/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/GBK2K/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/GBK2K/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	GBK2K
 SRCS+=	citrus_gbk2k.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/ISO2022/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/ISO2022/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/ISO2022/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	ISO2022
 SRCS+=	citrus_iso2022.c
-CFLAGS+= --param max-inline-insns-single=128
+CFLAGS.gcc+= --param max-inline-insns-single=128
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/JOHAB/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/JOHAB/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/JOHAB/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	JOHAB
 SRCS+=	citrus_johab.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/UES/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/UES/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/UES/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UES
 SRCS+=	citrus_ues.c
-CFLAGS+= --param max-inline-insns-single=64
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/UTF1632/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/UTF1632/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/UTF1632/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UTF1632
 SRCS+=	citrus_utf1632.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/UTF7/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/UTF7/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/UTF7/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	UTF7
 SRCS+=	citrus_utf7.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/iconv_std/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/iconv_std/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/iconv_std/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	iconv_std
 SRCS+=	citrus_iconv_std.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/mapper_parallel/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/mapper_parallel/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/mapper_parallel/Makefile	(revision 260497)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../mapper_serial
 
 SHLIB=	mapper_parallel
 SRCS+=	citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/mapper_serial/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/mapper_serial/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/mapper_serial/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_serial
 SRCS+=	citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/mapper_std/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/mapper_std/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/mapper_std/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_std
 SRCS+=	citrus_mapper_std.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules/mapper_zone/Makefile
===================================================================
--- stable/9/lib/libiconv_modules/mapper_zone/Makefile	(revision 260496)
+++ stable/9/lib/libiconv_modules/mapper_zone/Makefile	(revision 260497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB=	mapper_zone
 SRCS+=	citrus_mapper_zone.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
 
 .include <bsd.lib.mk>
Index: stable/9/lib/libiconv_modules
===================================================================
--- stable/9/lib/libiconv_modules	(revision 260496)
+++ stable/9/lib/libiconv_modules	(revision 260497)

Property changes on: stable/9/lib/libiconv_modules
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/lib/libiconv_modules:r260334
Index: stable/9/share/mk/bsd.sys.mk
===================================================================
--- stable/9/share/mk/bsd.sys.mk	(revision 260496)
+++ stable/9/share/mk/bsd.sys.mk	(revision 260497)

Property changes on: stable/9/share/mk/bsd.sys.mk
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share/mk/bsd.sys.mk:r260334,260369
Index: stable/9/share/mk
===================================================================
--- stable/9/share/mk	(revision 260496)
+++ stable/9/share/mk	(revision 260497)

Property changes on: stable/9/share/mk
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/share/mk:r260334,260369
Index: stable/9/sys/boot/i386/boot2/Makefile
===================================================================
--- stable/9/sys/boot/i386/boot2/Makefile	(revision 260496)
+++ stable/9/sys/boot/i386/boot2/Makefile	(revision 260497)
@@ -1,114 +1,115 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 FILES=		boot boot1 boot2
 
 NM?=		nm
 
 # A value of 0x80 enables LBA support.
 BOOT_BOOT1_FLAGS?=	0x80
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x2000
 
 # Decide level of UFS support.
 BOOT2_UFS?=	UFS1_AND_UFS2
 #BOOT2_UFS?=	UFS2_ONLY
 #BOOT2_UFS?=	UFS1_ONLY
 
 CFLAGS=	-Os \
 	-fomit-frame-pointer \
 	-mrtd \
 	-mregparm=3 \
 	-DUSE_XREAD \
 	-D${BOOT2_UFS} \
 	-DFLAGS=${BOOT_BOOT1_FLAGS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100 \
+	-Winline \
 	${CLANG_OPT_SMALL}
 
 CFLAGS.gcc+=	-fno-guess-branch-probability \
 		-fno-unit-at-a-time \
 		-mno-align-long-strings \
+		--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	boot
 
 boot: boot1 boot2
 	cat boot1 boot2 > boot
 
 CLEANFILES+=	boot1 boot1.out boot1.o
 
 boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
 
 boot2: boot2.ld
 	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
 
 boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
 	    -o ${.TARGET} -P 1 boot2.bin
 
 boot2.ldr:
 	dd if=/dev/zero of=${.TARGET} bs=512 count=1
 
 boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 	${CC} ${ACFLAGS} -c boot2.s
 
 SRCS=	boot2.c boot2.h
 
 boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c
 	${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c
 	sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
 	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define XREADORG %#x\n", REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
 	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend boot2.s: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.boot1.S=		${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/9/sys/boot/i386/gptboot/Makefile
===================================================================
--- stable/9/sys/boot/i386/gptboot/Makefile	(revision 260496)
+++ stable/9/sys/boot/i386/gptboot/Makefile	(revision 260497)
@@ -1,81 +1,83 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		gptboot
 MAN=		gptboot.8
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x0
 
 # Decide level of UFS support.
 GPTBOOT_UFS?=	UFS1_AND_UFS2
 #GPTBOOT_UFS?=	UFS2_ONLY
 #GPTBOOT_UFS?=	UFS1_ONLY
 
 CFLAGS=	-DBOOTPROG=\"gptboot\" \
 	-O1 \
 	-DGPT \
 	-D${GPTBOOT_UFS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-I${.CURDIR}/../../.. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	gptboot
 
 gptboot: gptldr.bin gptboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
 	    -o ${.TARGET} gptboot.bin
 
 CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \
 		cons.o util.o
 
 gptboot.bin: gptboot.out
 	objcopy -S -O binary gptboot.out ${.TARGET}
 
 gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 gptboot.o: ${.CURDIR}/../../common/ufsread.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend gptboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.gptldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/9/sys/boot/i386/gptboot
===================================================================
--- stable/9/sys/boot/i386/gptboot	(revision 260496)
+++ stable/9/sys/boot/i386/gptboot	(revision 260497)

Property changes on: stable/9/sys/boot/i386/gptboot
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/i386/gptboot:r260334
Index: stable/9/sys/boot/i386/gptzfsboot/Makefile
===================================================================
--- stable/9/sys/boot/i386/gptzfsboot/Makefile	(revision 260496)
+++ stable/9/sys/boot/i386/gptzfsboot/Makefile	(revision 260497)
@@ -1,78 +1,80 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
 		${.CURDIR}/../zfsboot ${.CURDIR}/../common \
 		${.CURDIR}/../../common
 
 FILES=		gptzfsboot
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x0
 
 CFLAGS=	-DBOOTPROG=\"gptzfsboot\" \
 	-O1 \
 	-DGPT -DBOOT2 \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../../zfs \
 	-I${.CURDIR}/../../../cddl/boot/zfs \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-I${.CURDIR}/../../.. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	gptzfsboot
 
 gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
 	    -o ${.TARGET} gptzfsboot.bin
 
 CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
 
 gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \
 		drv.o gpt.o util.o
 
 gptzfsboot.bin: gptzfsboot.out
 	objcopy -S -O binary gptzfsboot.out ${.TARGET}
 
 gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.gptldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/9/sys/boot/i386/zfsboot/Makefile
===================================================================
--- stable/9/sys/boot/i386/zfsboot/Makefile	(revision 260496)
+++ stable/9/sys/boot/i386/zfsboot/Makefile	(revision 260497)
@@ -1,91 +1,93 @@
 # $FreeBSD$
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
 FILES=		zfsboot
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0x7c00
 ORG2=	0x2000
 
 CFLAGS=	-DBOOTPROG=\"zfsboot\" \
 	-O1 \
 	-DBOOT2 \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../common \
 	-I${.CURDIR}/../../zfs \
 	-I${.CURDIR}/../../../cddl/boot/zfs \
 	-I${.CURDIR}/../btx/lib -I. \
 	-I${.CURDIR}/../boot2 \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 CLEANFILES=	zfsboot
 
 zfsboot: zfsboot1 zfsboot2
 	cat zfsboot1 zfsboot2 > zfsboot
 
 CLEANFILES+=	zfsboot1 zfsldr.out zfsldr.o
 
 zfsboot1: zfsldr.out
 	objcopy -S -O binary zfsldr.out ${.TARGET}
 
 zfsldr.out: zfsldr.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
 
 CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
 		zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o
 
 # We currently allow 65536 bytes for zfsboot - in practice it could be
 # any size up to 3.5Mb but keeping it fixed size simplifies zfsldr.
 # 
 BOOT2SIZE=	65536
 
 zfsboot2: zfsboot.ld
 	@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
 
 zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
 	    -o ${.TARGET} -P 1 zfsboot.bin
 
 zfsboot.ldr:
 	cp /dev/null ${.TARGET}
 
 zfsboot.bin: zfsboot.out
 	objcopy -S -O binary zfsboot.out ${.TARGET}
 
 zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 SRCS=	zfsboot.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
 
 .include <bsd.prog.mk>
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
Index: stable/9/sys/boot/pc98/boot2/Makefile
===================================================================
--- stable/9/sys/boot/pc98/boot2/Makefile	(revision 260496)
+++ stable/9/sys/boot/pc98/boot2/Makefile	(revision 260497)
@@ -1,110 +1,112 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
 CC:=		gcc
 COMPILER_TYPE:=	gcc
 
 FILES=		boot boot1 boot2
 
 NM?=		nm
 
 BOOT_COMCONSOLE_PORT?= 0x238
 BOOT_COMCONSOLE_SPEED?= 9600
 B2SIOFMT?=	0x3
 
 REL1=	0x700
 ORG1=	0
 ORG2=	0x2000
 
 # Decide level of UFS support.
 BOOT2_UFS?=	UFS1_AND_UFS2
 #BOOT2_UFS?=	UFS2_ONLY
 #BOOT2_UFS?=	UFS1_ONLY
 
 CFLAGS=	-Os \
 	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
 	-fno-unit-at-a-time \
 	-mno-align-long-strings \
 	-mrtd \
 	-mregparm=3 \
 	-D${BOOT2_UFS} \
 	-DFLAGS=${BOOT_BOOT1_FLAGS} \
 	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 	-DSIOFMT=${B2SIOFMT} \
 	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
 	-I${.CURDIR}/../../.. \
 	-I${.CURDIR}/../../i386/boot2 \
 	-I${.CURDIR}/../../common \
 	-I${.CURDIR}/../btx/lib -I. \
 	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-	-Winline --param max-inline-insns-single=100
+	-Winline
+
+CFLAGS.gcc+=	--param max-inline-insns-single=100
 
 # Set machine type to PC98_SYSTEM_PARAMETER
 #CFLAGS+=	-DSET_MACHINE_TYPE
 
 # Initialize the bi_bios_geom using the BIOS geometry
 #CFLAGS+=	-DGET_BIOSGEOM
 
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
 
 .PATH:	${.CURDIR}/../../i386/boot2
 
 CLEANFILES=	boot
 
 boot: boot1 boot2
 	cat boot1 boot2 > boot
 
 CLEANFILES+=	boot1 boot1.out boot1.o
 
 boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
 	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
 
 boot2: boot2.ld
 	@set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
 
 boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
 	    -o ${.TARGET} -P 1 boot2.bin
 
 boot2.ldr:
 	dd if=/dev/zero of=${.TARGET} bs=276 count=1
 
 boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 
 SRCS=	boot2.c boot2.h
 
 boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c
 	${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c
 	sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s
 	rm -f boot2.s.tmp
 
 boot2.h: boot1.out
 	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \
 	    { x = $$1 - ORG1; \
 	    printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \
 	    ORG1=`printf "%d" ${ORG1}` \
 	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/9/sys
===================================================================
--- stable/9/sys	(revision 260496)
+++ stable/9/sys	(revision 260497)

Property changes on: stable/9/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r260334
Index: stable/9/usr.sbin/mfiutil/Makefile
===================================================================
--- stable/9/usr.sbin/mfiutil/Makefile	(revision 260496)
+++ stable/9/usr.sbin/mfiutil/Makefile	(revision 260497)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 PROG=	mfiutil
 
 SRCS=	mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \
 	mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c
 MAN8=	mfiutil.8
 
-CFLAGS+= -fno-builtin-strftime
+CFLAGS.gcc+= -fno-builtin-strftime
 
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
 # Here be dragons
 .ifdef DEBUG
 CFLAGS+= -DDEBUG
 .endif
 
 .include <bsd.prog.mk>
Index: stable/9/usr.sbin/mfiutil
===================================================================
--- stable/9/usr.sbin/mfiutil	(revision 260496)
+++ stable/9/usr.sbin/mfiutil	(revision 260497)

Property changes on: stable/9/usr.sbin/mfiutil
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.sbin/mfiutil:r260334