From 1a8853734ad238c7c39bd79fb944ea1893b48377 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 12 Oct 2012 10:16:20 +0200
Subject: [PATCH] kernel: Some adjustments for the GCC 4.1 removal in
 Makefiles.

---
 sys/conf/bsd.kern.mk | 7 ++-----
 sys/conf/kern.pre.mk | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/conf/bsd.kern.mk b/sys/conf/bsd.kern.mk
index d13a63e94f..3b233e379a 100644
--- a/sys/conf/bsd.kern.mk
+++ b/sys/conf/bsd.kern.mk
@@ -9,11 +9,8 @@
 
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		-Wold-style-definition -Wno-pointer-sign -std=c99
-
-.if ${CCVER} != "gcc41"
-CWARNFLAGS+=	-Wold-style-declaration
-.endif
+		-Wold-style-definition -Wold-style-declaration \
+		-Wno-pointer-sign -std=c99
 
 CFLAGS+= -finline-limit=${INLINE_LIMIT}
 CFLAGS+= --param inline-unit-growth=100
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index d944533904..ae2a039ab4 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -79,7 +79,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
 NORMAL_M= awk -f $S/tools/makeobjops.awk -- -c $<; \
 	${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
-.if !defined(NO_WERROR) && (${CCVER} == "gcc41" || ${CCVER} == "gcc44")
+.if !defined(NO_WERROR) && ${CCVER} == "gcc44"
 WERROR=-Werror
 .endif
 
-- 
2.41.0