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.

15 files changed, 61 insertions, 141 deletions

diff --git a/Makefile.cross b/Makefile.cross
index 78fc2c82fb3..7ba44a6e831 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.66 2013/07/06 17:52:57 miod Exp $
+# $OpenBSD: Makefile.cross,v 1.67 2013/08/06 19:11:53 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -83,12 +83,10 @@ CROSSGCC=	${CROSSDIR}/.gcc_done
 .include <bsd.own.mk>
 
 .for _arch in ${TARGET_ARCH}
-.if !empty(GCC2_ARCH:M${_arch})
-COMPILER_VERSION=gcc2
-.elif !empty(GCC4_ARCH:M${_arch})
-COMPILER_VERSION=gcc4
-.else
+.if !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION=gcc3
+.else
+COMPILER_VERSION=gcc4
 .endif
 
 .if !empty(BINUTILS217_ARCH:M${_arch})
@@ -229,102 +227,69 @@ ${CROSSBINUTILS}:	${CROSSINCLUDES}
 
 
 ${CROSSGCC}:		${CROSSBINUTILS}
-.if ${COMPILER_VERSION:L} == "gcc4"
-	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+.if ${COMPILER_VERSION:L} == "gcc3"
+	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
-	    MACHINE=${TARGET} \
-	    PATH=${CROSSPATH} ${MAKE} depend  )
-	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper depend && \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
-	    MACHINE=${TARGET} \
-	    ${MAKE} all )
-	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    ${MAKE} -f Makefile.bsd-wrapper all && \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
-	    MACHINE=${TARGET} \
-	    PATH=${CROSSPATH} ${MAKE} install)
-	cp -f ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ 
+	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
 	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
-	cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
 	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
+	cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
+	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
 	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
-
-	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
-	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
-	# fix links
+	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
 	rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
-	    -e 's/@GNUC@//' \
+	    -e 's/@GNUC@/-D__GNUC__/' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
 	    -e 's/@dollaropt@//' \
 	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
-.elif ${COMPILER_VERSION:L} == "gcc3"
-	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
+.else
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
-	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper depend && \
+	    MACHINE=${TARGET} \
+	    PATH=${CROSSPATH} ${MAKE} depend  )
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
-	    ${MAKE} -f Makefile.bsd-wrapper all && \
+	    MACHINE=${TARGET} \
+	    ${MAKE} all )
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    MACHINE=${TARGET} \
+	    PATH=${CROSSPATH} ${MAKE} install)
+	cp -f ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ 
 	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
-	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
 	cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
-	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
+	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
 	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
-	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
+
+	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
+	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
+	# fix links
 	rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
-	    -e 's/@GNUC@/-D__GNUC__/' \
+	    -e 's/@GNUC@//' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
 	    -e 's/@dollaropt@//' \
 	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
 	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
-.else
-	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
-	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
-	    --with-gnu-as --with-gnu-ld --prefix ${CROSSDIR}/usr \
-	    --target ${TARGET_CANON} \
-	    --enable-languages="c,c++" --enable-cpp --disable-nls \
-	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
-	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
-	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
-	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
-	    DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
-	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
-	    ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
-	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
-	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
-	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
-	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
-	mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
-	rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
-	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
-	    -e 's/@GNUC@/-D__GNUC__/' \
-	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
-	    -e 's/@dollaropt@/-$$/' ${.CURDIR}/usr.bin/cpp/cpp.sh > \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
-	chmod ${BINMODE} \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
-	chown ${BINOWN}:${BINGRP}\
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
-	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
-	ln -sf gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
-	ln -sf gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
-	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
-	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
 .endif
 	@touch ${CROSSGCC}
 
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index d43d4fbed96..5aa9429368e 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,20 +1,17 @@
-#	$OpenBSD: Makefile,v 1.16 2011/11/21 01:36:18 jsg Exp $
+#	$OpenBSD: Makefile,v 1.17 2013/08/06 19:11:53 miod Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR+=libiberty libreadline
 .if make(obj)
-SUBDIR+=libobjc libstdc++ ../egcs \
-libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc
+SUBDIR+=libobjc libstdc++ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc
 .else
 .  if ${COMPILER_VERSION:L} == "gcc3"
 SUBDIR+=libobjc libstdc++
-.  elif ${COMPILER_VERSION:L} == "gcc4"
+.  else
 # XXX make sure we build libobjc & libstdc++-v3 from gcc4
 SUBDIR+=../usr.bin/cc/libobjc
 SUBDIR+=libstdc++-v3 libsupc++-v3
-.  elif ${COMPILER_VERSION:L} == "gcc2"
-SUBDIR+=libobjc ../egcs
 .  endif
 .endif
 
diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper
index bd5073ef425..2c2ec019358 100644
--- a/gnu/lib/libobjc/Makefile.bsd-wrapper
+++ b/gnu/lib/libobjc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.7 2011/06/24 22:47:51 deraadt Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.8 2013/08/06 19:11:53 miod Exp $
 
 LIB=		objc
 
@@ -10,13 +10,8 @@ LIBIBERTY_INCLUDES=${.CURDIR}/../libiberty/include
 . if ${COMPILER_VERSION:L} == "gcc3"
 GCCDIR= $(.CURDIR)/../../usr.bin/gcc
 GCCSRCDIR=${GCCDIR}/gcc
-. elif ${COMPILER_VERSION:L} == "gcc2"
-GCCDIR= $(.CURDIR)/../../egcs/gcc
-GCCSRCDIR=${GCCDIR}
-. elif ${COMPILER_VERSION:L} == "gcc4" 
-error GCC4 should not build gnu/lib/libobjc
 . else
-error unknown compiler
+error wrong compiler
 . endif
 .endif
 
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'
 
diff --git a/include/Makefile b/include/Makefile
index dd6f5c67387..6b90cf7d342 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.171 2013/06/19 19:47:48 robert Exp $
+#	$OpenBSD: Makefile,v 1.172 2013/08/06 19:11:53 miod Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -54,13 +54,10 @@ RDIRS=	../lib/librthread ../lib/libcompat ../lib/libcurses \
 .if ${COMPILER_VERSION:L} == "gcc3"
 RDIRS+= ../gnu/usr.bin/gcc ../gnu/lib/libobjc
 PRDIRS+= ../gnu/lib/libstdc++
-.elif ${COMPILER_VERSION:L} == "gcc4"
+.else
 RDIRS+= ../gnu/usr.bin/cc/libobjc
 PRDIRS+= ../gnu/lib/libstdc++-v3
 RDIRS+= ../gnu/usr.bin/cc/include
-.else
-RDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
-	../gnu/lib/libobjc ../gnu/egcs/gcc
 .endif
 
 # prereq implies includes
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index d143e6c886f..939c3477bca 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,16 +1,10 @@
-#	$OpenBSD: Makefile,v 1.36 2013/07/05 21:29:51 miod Exp $
-
-# For ``COMPILER_VERSION''
-.include <bsd.own.mk>
+#	$OpenBSD: Makefile,v 1.37 2013/08/06 19:11:53 miod Exp $
 
 LIB=pthread
 LIBCSRCDIR=	${.CURDIR}/../libc
 
 CFLAGS+=-Wall -g -Werror -Wshadow
-.if ${COMPILER_VERSION:L} == "gcc4" || ${COMPILER_VERSION:L} == "gcc3"
-CFLAGS+=-Wmissing-prototypes
-.endif
-CFLAGS+=-Wstrict-prototypes
+CFLAGS+=-Wmissing-prototypes -Wstrict-prototypes
 CFLAGS+=-Wsign-compare
 CFLAGS+=-I${LIBCSRCDIR}/arch/${MACHINE_CPU} -I${LIBCSRCDIR}/include
 CDIAGFLAGS=
diff --git a/regress/gnu/egcs/gcc-bounds/Makefile b/regress/gnu/egcs/gcc-bounds/Makefile
index bd639639460..688843a10ad 100644
--- a/regress/gnu/egcs/gcc-bounds/Makefile
+++ b/regress/gnu/egcs/gcc-bounds/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/05/14 09:59:53 avsm Exp $
+# $OpenBSD: Makefile,v 1.13 2013/08/06 19:11:53 miod Exp $
 
 C_MODULES?=	strlcpy strlcat getcwd memcpy fread memcpy declare \
 		sscanf vararray md builtins
@@ -55,8 +55,6 @@ NOOBJ= Yes
 .include <bsd.regress.mk>
 .if ${COMPILER_VERSION:L} == "gcc3" 
 EXP=		.exp.gcc3
-.elif ${COMPILER_VERSION:L} == "gcc4" 
-EXP=		.exp.gcc4
 .else
-EXP=		.exp
+EXP=		.exp.gcc4
 .endif
diff --git a/regress/gnu/egcs/gcc/Makefile b/regress/gnu/egcs/gcc/Makefile
index 9c4f3f68a7e..83c35c70543 100644
--- a/regress/gnu/egcs/gcc/Makefile
+++ b/regress/gnu/egcs/gcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/05/10 18:20:31 drahn Exp $
+# $OpenBSD: Makefile,v 1.8 2013/08/06 19:11:53 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -7,10 +7,8 @@ NOPROG=
 
 .if ${COMPILER_VERSION:L} == "gcc3" 
 TESTDIR=${BSDSRCDIR}/gnu/usr.bin/gcc
-.elif ${COMPILER_VERSION:L} == "gcc4" 
-TESTDIR=${BSDSRCDIR}/gnu/usr.bin/cc
 .else
-TESTDIR=${BSDSRCDIR}/gnu/egcs/gcc
+TESTDIR=${BSDSRCDIR}/gnu/usr.bin/cc
 .endif
 
 REGRESS_TARGETS=do-gcc
diff --git a/regress/lib/csu/init_priority/Makefile b/regress/lib/csu/init_priority/Makefile
index 837ccdf213f..d1d2a0ad71a 100644
--- a/regress/lib/csu/init_priority/Makefile
+++ b/regress/lib/csu/init_priority/Makefile
@@ -1,9 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2012/09/07 05:01:20 miod Exp $
-
-.include <bsd.own.mk>
-.if ${COMPILER_VERSION} == "gcc2"
-CFLAGS+=	-finit-priority
-.endif
+# $OpenBSD: Makefile,v 1.3 2013/08/06 19:11:53 miod Exp $
 
 PROG=init_priority_test
 SRCS=init_priority_test.cc
diff --git a/regress/lib/libc/cxa-atexit/Makefile b/regress/lib/libc/cxa-atexit/Makefile
index 5061ca04ac8..a2821e01d3b 100644
--- a/regress/lib/libc/cxa-atexit/Makefile
+++ b/regress/lib/libc/cxa-atexit/Makefile
@@ -1,11 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2010/05/10 18:20:31 drahn Exp $
+# $OpenBSD: Makefile,v 1.3 2013/08/06 19:11:53 miod Exp $
 
-.include <bsd.own.mk>
-
-
-.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" 
 SUBDIR+= libgd1 libgd2 test1
-.endif
 
 install:
 
diff --git a/regress/libexec/ld.so/df_1_noopen/Makefile b/regress/libexec/ld.so/df_1_noopen/Makefile
index b59bb852fde..485b8719be4 100644
--- a/regress/libexec/ld.so/df_1_noopen/Makefile
+++ b/regress/libexec/ld.so/df_1_noopen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/04/02 07:15:02 miod Exp $
+# $OpenBSD: Makefile,v 1.4 2013/08/06 19:11:53 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -6,10 +6,7 @@ REGRESS_TARGETS = test
 
 .include <bsd.regress.mk>
 
-.if ${COMPILER_VERSION} == "gcc4"
-EMPTYFILE=	/dev/null
-LIB_DEPENDS=
-.else
+.if ${COMPILER_VERSION} == "gcc3"
 EMPTYFILE=	emptyfile
 CLEANFILES+=	${EMPTYFILE}
 LIB_DEPENDS=	${EMPTYFILE}
@@ -18,6 +15,9 @@ LIB_DEPENDS=	${EMPTYFILE}
 # is not at least four bytes long!
 ${EMPTYFILE}:
 	printf "\n\n\n\n" > $@
+.else
+EMPTYFILE=	/dev/null
+LIB_DEPENDS=
 .endif
 
 CLEANFILES+=lib1.so lib2.so lib3.so dlopen dlopen1 dlopen2 dlopen3
diff --git a/regress/libexec/ld.so/hidden/Makefile b/regress/libexec/ld.so/hidden/Makefile
index c3751a2434d..7fec9799ef1 100644
--- a/regress/libexec/ld.so/hidden/Makefile
+++ b/regress/libexec/ld.so/hidden/Makefile
@@ -1,10 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2010/05/10 18:20:31 drahn Exp $
+# $OpenBSD: Makefile,v 1.3 2013/08/06 19:11:53 miod Exp $
 
-.include <bsd.own.mk>
-
-.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" 
 SUBDIR+= libaa libab test1 test2
-.endif
 
 install:
 
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index d783b13bb07..4cd42f4706d 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2010/05/10 18:20:31 drahn Exp $
+#	$OpenBSD: Makefile,v 1.11 2013/08/06 19:11:53 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -11,10 +11,8 @@ INSTALL_STRIP=
 cpp: cpp.sh
 .if ${COMPILER_VERSION:L} == "gcc3"
 	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
-.elif ${COMPILER_VERSION:L} == "gcc4"
-	sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
 .else
-	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@/-$$/' ${.CURDIR}/cpp.sh >$@
+	sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index e9bd2d34811..c67f79c002f 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,13 +1,9 @@
-#	$OpenBSD: Makefile,v 1.69 2012/04/15 13:52:59 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.70 2013/08/06 19:11:53 miod Exp $
 
 .include <bsd.own.mk>
 
 CFLAGS+=-DVERSION=\"1.12.1\"
-CFLAGS+=-W -Wall -Wstrict-prototypes
-
-.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" 
-CFLAGS+=-Wno-unused-parameter
-.endif
+CFLAGS+=-W -Wall -Wstrict-prototypes -Wno-unused-parameter
 
 SRCS=	roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c mandoc.c read.c
 SRCS+=	mdoc_macro.c mdoc.c mdoc_hash.c \