Remove support for COMPILER_VERSION == gcc2.

Change the logic depending upon COMPILER_VERSION everywhere, to assume gcc4
is the norm and to explicitely test for gcc3 when a different behaviour
is required.
No functional change intended. Be sure to `make install' in share/mk before
attempting to do anything.

2 files changed, 5 insertions, 9 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index a3ab6eb6e4b..52f88f1ae53 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,17 +1,15 @@
-#	$OpenBSD: Makefile,v 1.53 2013/07/05 21:29:51 miod Exp $
+#	$OpenBSD: Makefile,v 1.54 2013/08/06 19:11:53 miod Exp $
 #	$NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
 
 .include <bsd.own.mk>
 
 .if make(obj)
-SUBDIR+=	cc gcc ../egcs/gcc
+SUBDIR+=	cc gcc
 .else
 .  if ${COMPILER_VERSION:L} == "gcc3"
 SUBDIR+=	gcc
-.  elif ${COMPILER_VERSION:L} == "gcc4"
+.  else
 SUBDIR+=	cc
-.  elif ${COMPILER_VERSION:L} == "gcc2"
-SUBDIR+=	../egcs/gcc
 .  endif
 .endif
 
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper
index 539c1421f24..9d737113278 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.91 2013/03/29 20:59:04 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.92 2013/08/06 19:11:53 miod Exp $
 #
 # Build wrapper for Perl 5.16.2
 #
 
-# For ``NOMAN'' and ``COMPILER_VERSION''
+# For ``NOMAN''
 .include <bsd.own.mk>
 
 # There is no point in building a profiled libperl that is never used.
@@ -13,9 +13,7 @@ TARGET_MACHINE_ARCH?=	$(MACHINE_ARCH)
 
 # Perl builds with -fno-strict-aliasing, we want libperl to do the same
 CFLAGS+= -fno-strict-aliasing
-.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4"
 CFLAGS+= -fno-delete-null-pointer-checks
-.endif
 
 CONFIGURE_ARGS= -dsE -Dopenbsd_distribution=defined -Dccflags='-DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE'