From 9eef6e338b83da253fd03cbf08f450a44daae9d6 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 24 May 2007 21:53:42 +0000
Subject: [PATCH] Temporarily add 'WITH_GCC3' that removes -Wno-pointer-sign
 from the compiler invocation.  This is just to help get over the hump of
 people tracking down bugs that may cross the GCC 4.2 upgrade. It is
 envisioned that this option goes away after a suitable amount of time.

---
 share/mk/bsd.sys.mk | 2 ++
 sys/conf/kern.mk    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 09cc84360d8..169268f9a68 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -54,7 +54,9 @@ CWARNFLAGS	+=	-Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
 # XXX always get it right.
 CWARNFLAGS	+=	-Wno-uninitialized
 .  endif
+.  if !defined(WITH_GCC3)
 CWARNFLAGS	+=	-Wno-pointer-sign
+.  endif
 . endif
 
 . if defined(FORMAT_AUDIT)
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 91c52df8746..eede8c70981 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -12,7 +12,10 @@ CWARNFLAGS=
 .else
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		${_wundef} -Wno-pointer-sign -fformat-extensions
+		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
+.if !defined(WITH_GCC3)
+_Wno_pointer_sign=-Wno-pointer-sign
+.endif
 .if !defined(NO_UNDEF)
 _wundef=	-Wundef
 .endif