From e73a17cf23c25b1f8ce4d97f5674c167171198a3 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 18 Jan 2010 21:56:08 +0000
Subject: [PATCH] Undo r169961, removing WITH_GCC3, added as a temporary
 workaround three years ago.

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

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 9b366635dfea..afce04474e97 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -55,9 +55,7 @@ CWARNFLAGS	+=	-Wchar-subscripts -Winline -Wnested-externs\
 # 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 0013dd2b5c8c..4dac285190a4 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -12,10 +12,7 @@ CWARNFLAGS=
 .else
 CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-.if !defined(WITH_GCC3)
-_Wno_pointer_sign=-Wno-pointer-sign
-.endif
+		${_wundef} -Wno-pointer-sign -fformat-extensions
 .if !defined(NO_UNDEF)
 _wundef=	-Wundef
 .endif