From 3c0948a6b28273e64c35d11bc7ba6263d7a920a6 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Sun, 26 Jul 2015 00:11:04 +0000 Subject: [PATCH] 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. --- lib/libiconv_modules/BIG5/Makefile | 2 +- lib/libiconv_modules/EUC/Makefile | 2 +- lib/libiconv_modules/EUCTW/Makefile | 2 +- lib/libiconv_modules/UTF1632/Makefile | 2 +- lib/libiconv_modules/UTF7/Makefile | 2 +- lib/libiconv_modules/iconv_std/Makefile | 2 +- usr.bin/grep/Makefile | 2 ++ 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/libiconv_modules/BIG5/Makefile b/lib/libiconv_modules/BIG5/Makefile index cdaf9ddf188..34ff9ebaa22 100644 --- a/lib/libiconv_modules/BIG5/Makefile +++ b/lib/libiconv_modules/BIG5/Makefile @@ -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 diff --git a/lib/libiconv_modules/EUC/Makefile b/lib/libiconv_modules/EUC/Makefile index aeceff40d23..b2f02ee3b92 100644 --- a/lib/libiconv_modules/EUC/Makefile +++ b/lib/libiconv_modules/EUC/Makefile @@ -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 diff --git a/lib/libiconv_modules/EUCTW/Makefile b/lib/libiconv_modules/EUCTW/Makefile index 4808ca3ac58..c719a1aa1f8 100644 --- a/lib/libiconv_modules/EUCTW/Makefile +++ b/lib/libiconv_modules/EUCTW/Makefile @@ -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 diff --git a/lib/libiconv_modules/UTF1632/Makefile b/lib/libiconv_modules/UTF1632/Makefile index 485d0702b40..b42e58c7d15 100644 --- a/lib/libiconv_modules/UTF1632/Makefile +++ b/lib/libiconv_modules/UTF1632/Makefile @@ -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 diff --git a/lib/libiconv_modules/UTF7/Makefile b/lib/libiconv_modules/UTF7/Makefile index 733cb26e3d4..e191fb9afd3 100644 --- a/lib/libiconv_modules/UTF7/Makefile +++ b/lib/libiconv_modules/UTF7/Makefile @@ -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 diff --git a/lib/libiconv_modules/iconv_std/Makefile b/lib/libiconv_modules/iconv_std/Makefile index 88d68aafc77..f6eeb76d20c 100644 --- a/lib/libiconv_modules/iconv_std/Makefile +++ b/lib/libiconv_modules/iconv_std/Makefile @@ -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 diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index af214718003..1c0e8ccd362 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -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 \