Commit some infrastructure for turning on -Werror for kernel compiles.

It doesn't actually do it yet though.  This adds a flag to config so
that we can exclude certain vendor files from this even when the rest
of the kernel has it on.  make -DNO_WERROR would also bypass all of it.

7 files changed, 16 insertions, 10 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index c744f5e..4ccb876 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 .if !defined(S)
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 2341789..51d2afb 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index fbccd26..20eddd1 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -30,7 +30,7 @@ MACHINE_ARCH=	ia64
 FMT=				# Needs to be blank for linux cross tools.
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 5373c0e..9330d8d 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 .if !defined(S)
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 9d228ea..31dfd1b 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 # Temporary stuff while we're still embryonic
 NO_MODULES?=	yes
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 88d3a05..1dfd1d5 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -36,7 +36,7 @@ CWARNFLAGS=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 FMT=
 
 # Which version of config(8) is required.
-%VERSREQ=	500009
+%VERSREQ=	500010
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 2753418..261025f 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -58,14 +58,20 @@ PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
+#.if defined(NO_WERROR)
+#WERROR=
+#.else
+#WERROR?=	-Werror
+#.endif
+
 # Put configuration-specific C flags last (except for ${PROF}) so that they
 # can override the others.
 CFLAGS+=	${CONF_CFLAGS}
 
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
-PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
+NORMAL_C= ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
+NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
+PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC}
+NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
 
 NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c