From owner-svn-src-head@FreeBSD.ORG Sun Jan 5 21:03:54 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E7D287A; Sun, 5 Jan 2014 21:03:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EEE2138E; Sun, 5 Jan 2014 21:03:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05L3rKD076414; Sun, 5 Jan 2014 21:03:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05L3nCU076384; Sun, 5 Jan 2014 21:03:49 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401052103.s05L3nCU076384@svn.freebsd.org> From: Dimitry Andric Date: Sun, 5 Jan 2014 21:03:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260334 - in head: lib/libiconv lib/libiconv_modules/BIG5 lib/libiconv_modules/EUC lib/libiconv_modules/EUCTW lib/libiconv_modules/GBK2K lib/libiconv_modules/ISO2022 lib/libiconv_module... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2014 21:03:54 -0000 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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