From owner-svn-src-stable-10@FreeBSD.ORG Thu Jan 9 23:09:06 2014 Return-Path: Delivered-To: svn-src-stable-10@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 9C07A4F7; Thu, 9 Jan 2014 23:09:06 +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 6B5BC18D5; Thu, 9 Jan 2014 23:09:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s09N96vU082982; Thu, 9 Jan 2014 23:09:06 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s09N92TW082950; Thu, 9 Jan 2014 23:09:02 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401092309.s09N92TW082950@svn.freebsd.org> From: Dimitry Andric Date: Thu, 9 Jan 2014 23:09:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260497 - in stable: 10/lib/libiconv 10/lib/libiconv_modules/BIG5 10/lib/libiconv_modules/EUC 10/lib/libiconv_modules/EUCTW 10/lib/libiconv_modules/GBK2K 10/lib/libiconv_modules/ISO2022... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 23:09:06 -0000 Author: dim Date: Thu Jan 9 23:08:56 2014 New Revision: 260497 URL: http://svnweb.freebsd.org/changeset/base/260497 Log: MFC r260334: 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 r260369: Apply band-aid for 32-bit compat libs failures after r260334: put back -Qunused-arguments for clang for now, until I can figure out a way to make it unneeded in all scenarios. Sorry about the breakage. Modified: stable/10/lib/libiconv/Makefile stable/10/lib/libiconv_modules/BIG5/Makefile stable/10/lib/libiconv_modules/EUC/Makefile stable/10/lib/libiconv_modules/EUCTW/Makefile stable/10/lib/libiconv_modules/GBK2K/Makefile stable/10/lib/libiconv_modules/ISO2022/Makefile stable/10/lib/libiconv_modules/JOHAB/Makefile stable/10/lib/libiconv_modules/UES/Makefile stable/10/lib/libiconv_modules/UTF1632/Makefile stable/10/lib/libiconv_modules/UTF7/Makefile stable/10/lib/libiconv_modules/iconv_std/Makefile stable/10/lib/libiconv_modules/mapper_parallel/Makefile stable/10/lib/libiconv_modules/mapper_serial/Makefile stable/10/lib/libiconv_modules/mapper_std/Makefile stable/10/lib/libiconv_modules/mapper_zone/Makefile stable/10/sys/boot/i386/boot2/Makefile stable/10/sys/boot/i386/gptboot/Makefile stable/10/sys/boot/i386/gptzfsboot/Makefile stable/10/sys/boot/i386/zfsboot/Makefile stable/10/sys/boot/pc98/boot2/Makefile stable/10/usr.sbin/mfiutil/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/lib/libiconv/Makefile stable/9/lib/libiconv_modules/BIG5/Makefile stable/9/lib/libiconv_modules/EUC/Makefile stable/9/lib/libiconv_modules/EUCTW/Makefile stable/9/lib/libiconv_modules/GBK2K/Makefile stable/9/lib/libiconv_modules/ISO2022/Makefile stable/9/lib/libiconv_modules/JOHAB/Makefile stable/9/lib/libiconv_modules/UES/Makefile stable/9/lib/libiconv_modules/UTF1632/Makefile stable/9/lib/libiconv_modules/UTF7/Makefile stable/9/lib/libiconv_modules/iconv_std/Makefile stable/9/lib/libiconv_modules/mapper_parallel/Makefile stable/9/lib/libiconv_modules/mapper_serial/Makefile stable/9/lib/libiconv_modules/mapper_std/Makefile stable/9/lib/libiconv_modules/mapper_zone/Makefile stable/9/sys/boot/i386/boot2/Makefile stable/9/sys/boot/i386/gptboot/Makefile stable/9/sys/boot/i386/gptzfsboot/Makefile stable/9/sys/boot/i386/zfsboot/Makefile stable/9/sys/boot/pc98/boot2/Makefile stable/9/usr.sbin/mfiutil/Makefile Directory Properties: stable/9/lib/libiconv_modules/ (props changed) stable/9/share/mk/ (props changed) stable/9/share/mk/bsd.sys.mk (props changed) stable/9/sys/ (props changed) stable/9/sys/boot/i386/gptboot/ (props changed) stable/9/usr.sbin/mfiutil/ (props changed) Modified: stable/10/lib/libiconv/Makefile ============================================================================== --- stable/10/lib/libiconv/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/BIG5/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/BIG5/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/BIG5/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/EUC/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/EUC/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/EUC/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/EUCTW/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/EUCTW/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/EUCTW/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/GBK2K/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/GBK2K/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/GBK2K/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/ISO2022/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/ISO2022/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/ISO2022/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/JOHAB/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/JOHAB/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/JOHAB/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/UES/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/UES/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/UES/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/UTF1632/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/UTF1632/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/UTF1632/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/UTF7/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/UTF7/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/UTF7/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/iconv_std/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/iconv_std/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/iconv_std/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/mapper_parallel/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/mapper_parallel/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/mapper_parallel/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/mapper_serial/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/mapper_serial/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/mapper_serial/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/mapper_std/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/mapper_std/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/mapper_std/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/lib/libiconv_modules/mapper_zone/Makefile ============================================================================== --- stable/10/lib/libiconv_modules/mapper_zone/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/lib/libiconv_modules/mapper_zone/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/sys/boot/i386/boot2/Makefile ============================================================================== --- stable/10/sys/boot/i386/boot2/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/sys/boot/i386/boot2/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/sys/boot/i386/gptboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/gptboot/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/sys/boot/i386/gptboot/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/gptzfsboot/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/sys/boot/i386/gptzfsboot/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/sys/boot/i386/zfsboot/Makefile ============================================================================== --- stable/10/sys/boot/i386/zfsboot/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/sys/boot/i386/zfsboot/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/sys/boot/pc98/boot2/Makefile ============================================================================== --- stable/10/sys/boot/pc98/boot2/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/sys/boot/pc98/boot2/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -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: stable/10/usr.sbin/mfiutil/Makefile ============================================================================== --- stable/10/usr.sbin/mfiutil/Makefile Thu Jan 9 22:41:18 2014 (r260496) +++ stable/10/usr.sbin/mfiutil/Makefile Thu Jan 9 23:08:56 2014 (r260497) @@ -5,7 +5,7 @@ SRCS= mfiutil.c mfi_bbu.c mfi_cmd.c mfi_ 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