Author: dim
Date: Sun Jan 5 21:03:49 2014
New Revision: 260334
URL: http://svnweb.freebsd.org/changeset/base/260334
Log:
Split the last gcc-specific flags off into CFLAGS.gcc. This also
removes the need to use -Qunused-arguments for clang throughout the
tree.
MFC after: 3 days
Modified:
head/lib/libiconv/Makefile
head/lib/libiconv_modules/BIG5/Makefile
head/lib/libiconv_modules/EUC/Makefile
head/lib/libiconv_modules/EUCTW/Makefile
head/lib/libiconv_modules/GBK2K/Makefile
head/lib/libiconv_modules/ISO2022/Makefile
head/lib/libiconv_modules/JOHAB/Makefile
head/lib/libiconv_modules/UES/Makefile
head/lib/libiconv_modules/UTF1632/Makefile
head/lib/libiconv_modules/UTF7/Makefile
head/lib/libiconv_modules/iconv_std/Makefile
head/lib/libiconv_modules/mapper_parallel/Makefile
head/lib/libiconv_modules/mapper_serial/Makefile
head/lib/libiconv_modules/mapper_std/Makefile
head/lib/libiconv_modules/mapper_zone/Makefile
head/share/mk/bsd.sys.mk
head/sys/boot/i386/boot2/Makefile
head/sys/boot/i386/gptboot/Makefile
head/sys/boot/i386/gptzfsboot/Makefile
head/sys/boot/i386/zfsboot/Makefile
head/sys/boot/pc98/boot2/Makefile
head/usr.sbin/mfiutil/Makefile
Modified: head/lib/libiconv/Makefile
==============================================================================
--- head/lib/libiconv/Makefile Sun Jan 5 20:44:10 2014 (r260333)
+++ head/lib/libiconv/Makefile Sun Jan 5 21:03:49 2014 (r260334)
@@ -19,6 +19,7 @@ SRCS= citrus_bcs.c citrus_bcs_strtol.c 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>
Modified: head/lib/libiconv_modules/BIG5/Makefile
==============================================================================
--- head/lib/libiconv_modules/BIG5/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/BIG5/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/EUC/Makefile
==============================================================================
--- head/lib/libiconv_modules/EUC/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/EUC/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/EUCTW/Makefile
==============================================================================
--- head/lib/libiconv_modules/EUCTW/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/EUCTW/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/GBK2K/Makefile
==============================================================================
--- head/lib/libiconv_modules/GBK2K/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/GBK2K/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/ISO2022/Makefile
==============================================================================
--- head/lib/libiconv_modules/ISO2022/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/ISO2022/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/JOHAB/Makefile
==============================================================================
--- head/lib/libiconv_modules/JOHAB/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/JOHAB/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/UES/Makefile
==============================================================================
--- head/lib/libiconv_modules/UES/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/UES/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/UTF1632/Makefile
==============================================================================
--- head/lib/libiconv_modules/UTF1632/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/UTF1632/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/UTF7/Makefile
==============================================================================
--- head/lib/libiconv_modules/UTF7/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/lib/libiconv_modules/UTF7/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/iconv_std/Makefile
==============================================================================
--- head/lib/libiconv_modules/iconv_std/Makefile Sun Jan 5 20:44:10
2014 (r260333)
+++ head/lib/libiconv_modules/iconv_std/Makefile Sun Jan 5 21:03:49
2014 (r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/mapper_parallel/Makefile
==============================================================================
--- head/lib/libiconv_modules/mapper_parallel/Makefile Sun Jan 5 20:44:10
2014 (r260333)
+++ head/lib/libiconv_modules/mapper_parallel/Makefile Sun Jan 5 21:03:49
2014 (r260334)
@@ -4,6 +4,6 @@
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>
Modified: head/lib/libiconv_modules/mapper_serial/Makefile
==============================================================================
--- head/lib/libiconv_modules/mapper_serial/Makefile Sun Jan 5 20:44:10
2014 (r260333)
+++ head/lib/libiconv_modules/mapper_serial/Makefile Sun Jan 5 21:03:49
2014 (r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/mapper_std/Makefile
==============================================================================
--- head/lib/libiconv_modules/mapper_std/Makefile Sun Jan 5 20:44:10
2014 (r260333)
+++ head/lib/libiconv_modules/mapper_std/Makefile Sun Jan 5 21:03:49
2014 (r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/lib/libiconv_modules/mapper_zone/Makefile
==============================================================================
--- head/lib/libiconv_modules/mapper_zone/Makefile Sun Jan 5 20:44:10
2014 (r260333)
+++ head/lib/libiconv_modules/mapper_zone/Makefile Sun Jan 5 21:03:49
2014 (r260334)
@@ -2,6 +2,6 @@
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>
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Sun Jan 5 20:44:10 2014 (r260333)
+++ head/share/mk/bsd.sys.mk Sun Jan 5 21:03:49 2014 (r260334)
@@ -119,7 +119,6 @@ CWARNFLAGS+= -Wno-unknown-pragmas
CLANG_NO_IAS= -no-integrated-as
CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
-mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
-CFLAGS+= -Qunused-arguments
CFLAGS+= ${CFLAGS.clang}
CXXFLAGS+= ${CXXFLAGS.clang}
.else # !CLANG
Modified: head/sys/boot/i386/boot2/Makefile
==============================================================================
--- head/sys/boot/i386/boot2/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/sys/boot/i386/boot2/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -37,12 +37,13 @@ CFLAGS= -Os \
-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
Modified: head/sys/boot/i386/gptboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/sys/boot/i386/gptboot/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -35,7 +35,9 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \
-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
Modified: head/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/sys/boot/i386/gptzfsboot/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -32,7 +32,9 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \
-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
Modified: head/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/zfsboot/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/sys/boot/i386/zfsboot/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -29,7 +29,9 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \
-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
Modified: head/sys/boot/pc98/boot2/Makefile
==============================================================================
--- head/sys/boot/pc98/boot2/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/sys/boot/pc98/boot2/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -42,7 +42,9 @@ CFLAGS= -Os \
-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
Modified: head/usr.sbin/mfiutil/Makefile
==============================================================================
--- head/usr.sbin/mfiutil/Makefile Sun Jan 5 20:44:10 2014
(r260333)
+++ head/usr.sbin/mfiutil/Makefile Sun Jan 5 21:03:49 2014
(r260334)
@@ -6,7 +6,7 @@ SRCS= mfiutil.c mfi_bbu.c mfi_cmd.c mfi_
mfi_properties.c
MAN8= mfiutil.8
-CFLAGS+= -fno-builtin-strftime
+CFLAGS.gcc+= -fno-builtin-strftime
DPADD= ${LIBUTIL}
LDADD= -lutil
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
