From d2d693aa23eaa893aab2598a5baa3cf6378164d9 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Wed, 23 Jul 2003 20:03:42 +0000
Subject: Provide a knob for raising the inline instruction estimate threshold
 and set an initial value.  This is aimed at getting us closer to being able
 to turn -Werror back on and we can adjust the settings later on.  Yes, we
 could turn off -Wno-inline instead, but that would hide the effect of gcc's
 bogo-estimator ignoring inline (either rightly or wrongly).

---
 sys/conf/kern.pre.mk | 3 +++
 sys/conf/kmod.mk     | 3 +++
 sys/conf/newvers.sh  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'sys')

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index bce263f..077dd1b 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -53,6 +53,9 @@ PROF=	-pg
 .endif
 DEFINED_PROF=	${PROF}
 # WERROR?=	-Werror
+INLINE_LIMIT?=	2500
+CFLAGS+=	--param max-inline-insns-single=${INLINE_LIMIT}
+
 
 # Put configuration-specific C flags last (except for ${PROF}) so that they
 # can override the others.
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index b25bfca..15b2e98 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -99,6 +99,9 @@ CFLAGS+=	-I${DESTDIR}/usr/include
 CFLAGS+=	-I@/../include -I${DESTDIR}/usr/include
 .endif # @
 
+INLINE_LIMIT?=	2500
+CFLAGS+=	--param max-inline-insns-single=${INLINE_LIMIT}
+
 # Disallow common variables, and if we end up with commons from
 # somewhere unexpected, allocate storage for them in the module itself.
 CFLAGS+=	-fno-common
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0cce419..6845675 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
 
 TYPE="FreeBSD"
 REVISION="5.1"
-BRANCH="CURRENT"
+BRANCH="XP"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 
-- 
cgit v1.1