diff --git a/gnu/usr.bin/gcc/Makefile.cc1 b/gnu/usr.bin/gcc/Makefile.cc1
index c28ccea376ff..fa3d46d86107 100644
--- a/gnu/usr.bin/gcc/Makefile.cc1
+++ b/gnu/usr.bin/gcc/Makefile.cc1
@@ -1,14 +1,17 @@
-#	$NetBSD: Makefile.cc1,v 1.8 1998/04/09 00:32:34 tv Exp $
+#	$NetBSD: Makefile.cc1,v 1.9 1998/07/27 02:29:24 tv Exp $
 
 NOMAN=
 
+# XXX temporary for mips -> mipsel migration
+TARGET_ARCH=${MACHINE_ARCH:C/^mips.*/mips/}
+
 BINDIR=	/usr/libexec
 
 COMMON!=cd $(.CURDIR)/../common; \
 	 printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
 
 CPPFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-	-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
+	-I${.CURDIR}/../arch/$(TARGET_ARCH) -I$(COMMON)
 
 LDADD+=	-L${COMMON} -lcc1 -lgnumalloc
 DPADD+=	${COMMON}/libcc1.a ${LIBGNUMALLOC}
diff --git a/gnu/usr.bin/gcc/cc/Makefile b/gnu/usr.bin/gcc/cc/Makefile
index 2c9ef12f7bf1..5d18c44c66e0 100644
--- a/gnu/usr.bin/gcc/cc/Makefile
+++ b/gnu/usr.bin/gcc/cc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    6.2 (Berkeley) 3/25/91
-#	$NetBSD: Makefile,v 1.4 1997/10/25 10:10:59 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 1998/07/27 02:29:24 tv Exp $
 
 .if	(${MACHINE_ARCH} == "i386") || \
 	(${MACHINE_ARCH} == "m68k") || \
@@ -7,12 +7,12 @@
 	(${MACHINE_ARCH} == "sparc") || \
 	(${MACHINE_ARCH} == "vax") || \
 	(${MACHINE_ARCH} == "arm32") || \
-	(${MACHINE_ARCH} == "mips") 
+	(${MACHINE_ARCH:Mmips*} != "") 
 PROG=           gcc
 SRCS=	gcc.c obstack.c version.c 
 BINDIR=		/usr/bin
 CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
-	-I${.CURDIR}/../arch/$(MACHINE_ARCH) \
+	-I${.CURDIR}/../arch/$(MACHINE_ARCH:C/^mips.*/mips/) \
 	-DMD_EXEC_PREFIX=\"/usr/libexec/\" \
 	-DMD_STARTFILE_PREFIX=\"/usr/lib/\"
 
diff --git a/gnu/usr.bin/gcc/common/Makefile b/gnu/usr.bin/gcc/common/Makefile
index 7e90cdfa22ba..3330846540fd 100644
--- a/gnu/usr.bin/gcc/common/Makefile
+++ b/gnu/usr.bin/gcc/common/Makefile
@@ -1,7 +1,10 @@
-#	$NetBSD: Makefile,v 1.15 1998/05/20 12:34:14 pk Exp $
+#	$NetBSD: Makefile,v 1.16 1998/07/27 02:29:25 tv Exp $
 
 LIB=	cc1
 
+# XXX temporary for mips -> mipsel migration
+TARGET_ARCH=${MACHINE_ARCH:C/^mips.*/mips/}
+
 NOMAN=
 NOPIC=
 NOPROFILE=
@@ -12,13 +15,13 @@ COMMON!=cd $(.CURDIR)/../common; \
 	 printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
 
 CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch \
-	-I${.CURDIR}/../arch/$(MACHINE_ARCH) -I$(COMMON)
+	-I${.CURDIR}/../arch/$(TARGET_ARCH) -I$(COMMON)
 
-MD= ${.CURDIR}/../arch/${MACHINE_ARCH}/${MACHINE_ARCH}.md
+MD= ${.CURDIR}/../arch/${TARGET_ARCH}/${TARGET_ARCH}.md
 
 BCDEF= ${.CURDIR}/bytecode.def
 
-.PATH:	${.CURDIR}/../arch/${MACHINE_ARCH}
+.PATH:	${.CURDIR}/../arch/${TARGET_ARCH}
 
 SRCS=	bc-arity.h bc-opcode.h bc-opname.h c-parse.h bc-emit.c \
 	bc-optab.c bi-reverse.c c-aux-info.c c-common.c c-convert.c \
@@ -32,7 +35,7 @@ SRCS=	bc-arity.h bc-opcode.h bc-opname.h c-parse.h bc-emit.c \
 	reload1.c reorg.c rtl.c rtlanal.c sched.c \
 	sdbout.c stmt.c stor-layout.c stupid.c toplev.c \
 	tree.c unroll.c varasm.c version.c xcoffout.c \
-	$(MACHINE_ARCH).c insn-attr.h insn-codes.h insn-config.h insn-flags.h \
+	$(TARGET_ARCH).c insn-attr.h insn-codes.h insn-config.h insn-flags.h \
 	insn-peep.c insn-opinit.c insn-recog.c insn-extract.c insn-output.c \
 	insn-emit.c insn-attrtab.c 
 
diff --git a/gnu/usr.bin/gcc/cpp/Makefile b/gnu/usr.bin/gcc/cpp/Makefile
index 3acf8c1c2455..24f2464d3ad6 100644
--- a/gnu/usr.bin/gcc/cpp/Makefile
+++ b/gnu/usr.bin/gcc/cpp/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.4 (Berkeley) 2/21/91
-#	$NetBSD: Makefile,v 1.8 1998/04/09 00:32:35 tv Exp $
+#	$NetBSD: Makefile,v 1.9 1998/07/27 02:29:25 tv Exp $
 
 .if	(${MACHINE_ARCH} == "i386") || \
 	(${MACHINE_ARCH} == "m68k") || \
@@ -7,12 +7,12 @@
 	(${MACHINE_ARCH} == "sparc") || \
 	(${MACHINE_ARCH} == "vax") || \
 	(${MACHINE_ARCH} == "arm32") || \
-	(${MACHINE_ARCH} == "mips") 
+	(${MACHINE_ARCH:Mmips*} != "") 
 PROG=	cpp
 BINDIR=	/usr/libexec
 SRCS=	cccp.c cexp.y obstack.c version.c 
 CPPFLAGS+=-I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \
-	-I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
+	-I$(.CURDIR)/../arch/$(MACHINE_ARCH:C/^mips.*/mips/) \
 	-DGCC_INCLUDE_DIR=\"\" \
 	-DTOOL_INCLUDE_DIR=\"\" \
 	-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\"
diff --git a/gnu/usr.bin/gcc/g++/Makefile b/gnu/usr.bin/gcc/g++/Makefile
index 199392838879..d8eb25898f95 100644
--- a/gnu/usr.bin/gcc/g++/Makefile
+++ b/gnu/usr.bin/gcc/g++/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    6.2 (Berkeley) 3/25/91
-#	$NetBSD: Makefile,v 1.7 1997/10/25 10:11:07 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 1998/07/27 02:29:25 tv Exp $
 
 .if	(${MACHINE_ARCH} == "i386") || \
 	(${MACHINE_ARCH} == "m68k") || \
@@ -7,12 +7,12 @@
 	(${MACHINE_ARCH} == "sparc") || \
 	(${MACHINE_ARCH} == "vax") || \
 	(${MACHINE_ARCH} == "arm32") || \
-	(${MACHINE_ARCH} == "mips") 
+	(${MACHINE_ARCH:Mmips*} != "") 
 PROG=	g++
 SRCS=	g++.c obstack.c version.c 
 BINDIR=	/usr/bin
 CPPFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
-	-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
+	-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH:C/^mips.*/mips/) \
 	-DGCC_NAME=\"/usr/bin/cc\"
 LDADD+=	-lgnumalloc
 DPADD+=	${LIBGNUMALLOC}
diff --git a/gnu/usr.bin/gcc/libgcc/Makefile b/gnu/usr.bin/gcc/libgcc/Makefile
index 15bc3215c656..6812ab3d1e08 100644
--- a/gnu/usr.bin/gcc/libgcc/Makefile
+++ b/gnu/usr.bin/gcc/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 1998/05/08 00:36:07 enami Exp $
+#	$NetBSD: Makefile,v 1.9 1998/07/27 02:29:25 tv Exp $
 
 LIB=	gcc
 NOLINT=		nolint (gcc private fns library)
@@ -6,7 +6,7 @@ NOPROFILE=
 NOPIC=
 
 CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-	-I${.CURDIR}/../arch/${MACHINE_ARCH}
+	-I${.CURDIR}/../arch/${MACHINE_ARCH:C/^mips.*/mips/}
 
 #LIB1OBJS= _mulsi3.o _udivsi3.o _divsi3.o _umodsi3.o _modsi3.o _lshrsi3.o \
 #	  _lshlsi3.o _ashrsi3.o _ashlsi3.o _divdf3.o _muldf3.o _negdf2.o \
diff --git a/gnu/usr.bin/gcc/libobjc/Makefile b/gnu/usr.bin/gcc/libobjc/Makefile
index ea2800014dd6..b4e8e43fa2b4 100644
--- a/gnu/usr.bin/gcc/libobjc/Makefile
+++ b/gnu/usr.bin/gcc/libobjc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1998/02/19 02:17:06 cgd Exp $
+#	$NetBSD: Makefile,v 1.8 1998/07/27 02:29:25 tv Exp $
 
 LIB=	objc
 INCSDIR=/usr/include/objc
@@ -9,7 +9,7 @@ NOPROFILE=
 NOPIC=
 
 CPPFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-	-I${.CURDIR}/../arch/${MACHINE_ARCH}
+	-I${.CURDIR}/../arch/${MACHINE_ARCH:C/^mips.*/mips/}
 
 
 SRCS=	NXConstStr.m Object.m Protocol.m archive.c class.c \