===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/share/mk/bsd.own.mk,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- src/share/mk/bsd.own.mk	2013/07/05 21:13:35	1.140
+++ src/share/mk/bsd.own.mk	2013/08/06 19:05:57	1.141
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.140 2013/07/05 21:13:35 miod Exp $
+#	$OpenBSD: bsd.own.mk,v 1.141 2013/08/06 19:05:57 miod Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -24,8 +24,7 @@
 # Set toolchain to be able to know differences.
 ELF_TOOLCHAIN?=	yes
 
-GCC2_ARCH=vax
-GCC4_ARCH=alpha amd64 arm hppa hppa64 i386 ia64 mips64 mips64el powerpc sh sparc sparc64
+GCC3_ARCH=m68k m88k vax
 BINUTILS217_ARCH=hppa64 ia64
 
 # i386 PIE works; but there are RAMDISK fitting problems.
@@ -34,12 +33,10 @@
 PIE_ARCH=alpha amd64 hppa mips64 mips64el sh sparc64
 
 .for _arch in ${MACHINE_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})