diff --git a/sys/arch/newsmips/conf/Makefile.newsmips b/sys/arch/newsmips/conf/Makefile.newsmips
index 2e8669d2414d..e4d81bea776a 100644
--- a/sys/arch/newsmips/conf/Makefile.newsmips
+++ b/sys/arch/newsmips/conf/Makefile.newsmips
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.newsmips,v 1.10 1999/01/08 19:26:13 augustss Exp $
+#	$NetBSD: Makefile.newsmips,v 1.11 1999/01/15 10:33:11 castor Exp $
 
 # Makefile for NetBSD
 #
@@ -92,8 +92,14 @@ NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o fp.o locore_machdep.o \
-		param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
+SYSTEM_OBJ=     locore.o locore_machdep.o
+.if !empty(IDENT:M-DMIPS1)
+SYSTEM_OBJ+=    locore_mips1.o
+.endif
+.if !empty(IDENT:M-DMIPS3)
+SYSTEM_OBJ+=    locore_mips3.o
+.endif
+SYSTEM_OBJ+=    fp.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
@@ -194,9 +200,14 @@ machdep.o: Makefile
 machdep.o mainbus.o trap.o: Makefile
 
 
-locore.o: ${MIPS}/mips/locore.S ${MIPS}/mips/locore_r2000.S ${MIPS}/mips/locore_r4000.S assym.h
+locore.o: ${MIPS}/mips/locore.S assym.h
 	${NORMAL_S}
 
+locore_mips1.o: ${MIPS}/mips/locore_mips1.S assym.h
+	${NORMAL_S}
+
+locore_mips3.o: ${MIPS}/mips/locore_mips3.S assym.h
+	${NORMAL_S}
 
 fp.o: ${MIPS}/mips/fp.S assym.h
 	${NORMAL_S}
diff --git a/sys/arch/pmax/conf/Makefile.pmax b/sys/arch/pmax/conf/Makefile.pmax
index 7996582fd076..ac6f40487494 100644
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pmax,v 1.65 1999/01/08 19:26:14 augustss Exp $
+#	$NetBSD: Makefile.pmax,v 1.66 1999/01/15 10:33:12 castor Exp $
 
 # Makefile for NetBSD
 #
@@ -94,8 +94,14 @@ NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o fp.o locore_machdep.o \
-		param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
+SYSTEM_OBJ=     locore.o locore_machdep.o
+.if !empty(IDENT:M-DMIPS1)
+SYSTEM_OBJ+=    locore_mips1.o
+.endif
+.if !empty(IDENT:M-DMIPS3)
+SYSTEM_OBJ+=    locore_mips3.o
+.endif
+SYSTEM_OBJ+=    fp.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
@@ -201,10 +207,14 @@ machdep.o mainbus.o trap.o: Makefile
 # depend on System V IPC/shmem options
 mips_machdep.o pmap.o: Makefile
 
-
-locore.o: ${MIPS}/mips/locore.S ${MIPS}/mips/locore_r2000.S ${MIPS}/mips/locore_r4000.S assym.h
+locore.o: ${MIPS}/mips/locore.S assym.h
 	${NORMAL_S}
 
+locore_mips1.o: ${MIPS}/mips/locore_mips1.S assym.h
+	${NORMAL_S}
+
+locore_mips3.o: ${MIPS}/mips/locore_mips3.S assym.h
+	${NORMAL_S}
 
 fp.o: ${MIPS}/mips/fp.S assym.h
 	${NORMAL_S}