svn commit: r285884 - in head: lib/libiconv_modules/BIG5 lib/libiconv_modules/EUC lib/libiconv_modules/EUCTW lib/libiconv_modules/UTF1632 lib/libiconv_modules/UTF7 lib/libiconv_modules/iconv_std us...

[Pedro F. Giffuni]

Author: pfg
Date: Sun Jul 26 00:11:04 2015
New Revision: 285884
URL: https://svnweb.freebsd.org/changeset/base/285884

Log:
  Bump GCC max-inline-insns-single in libiconv_modules and grep
  
  This is required by our FORTIFY_SOURCE implementation as it
  does more inlining. As a rule of thumb, FORTIFY_SOURCE doubles
  the number  of inlines except that in grep inlining
  blows up for some reason.

Modified:
  head/lib/libiconv_modules/BIG5/Makefile
  head/lib/libiconv_modules/EUC/Makefile
  head/lib/libiconv_modules/EUCTW/Makefile
  head/lib/libiconv_modules/UTF1632/Makefile
  head/lib/libiconv_modules/UTF7/Makefile
  head/lib/libiconv_modules/iconv_std/Makefile
  head/usr.bin/grep/Makefile

Modified: head/lib/libiconv_modules/BIG5/Makefile
==============================================================================
--- head/lib/libiconv_modules/BIG5/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/BIG5/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	BIG5
 SRCS+=	citrus_big5.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: head/lib/libiconv_modules/EUC/Makefile
==============================================================================
--- head/lib/libiconv_modules/EUC/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/EUC/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	EUC
 SRCS+=	citrus_euc.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: head/lib/libiconv_modules/EUCTW/Makefile
==============================================================================
--- head/lib/libiconv_modules/EUCTW/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/EUCTW/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	EUCTW
 SRCS+=	citrus_euctw.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+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	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/UTF1632/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	UTF1632
 SRCS+=	citrus_utf1632.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: head/lib/libiconv_modules/UTF7/Makefile
==============================================================================
--- head/lib/libiconv_modules/UTF7/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/UTF7/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	UTF7
 SRCS+=	citrus_utf7.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: head/lib/libiconv_modules/iconv_std/Makefile
==============================================================================
--- head/lib/libiconv_modules/iconv_std/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/lib/libiconv_modules/iconv_std/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -2,6 +2,6 @@
 
 SHLIB=	iconv_std
 SRCS+=	citrus_iconv_std.c
-CFLAGS.gcc+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=64
 
 .include <bsd.lib.mk>

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Sat Jul 25 20:17:19 2015	(r285883)
+++ head/usr.bin/grep/Makefile	Sun Jul 26 00:11:04 2015	(r285884)
@@ -20,6 +20,8 @@ SRCS=	file.c grep.c queue.c util.c
 SRCS+=	fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c xmalloc.c
 CFLAGS+=-I${.CURDIR}/regex
 
+CFLAGS.gcc+= --param max-inline-insns-single=500
+
 .if ${MK_BSD_GREP} == "yes"
 LINKS=	${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep \