summaryrefslogtreecommitdiff
path: root/sys/arch/vax/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/vax/conf')
-rw-r--r--sys/arch/vax/conf/Makefile.vax11
-rw-r--r--sys/arch/vax/conf/files.vax3
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 58f5bbfc2e1..cfa126f7399 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.vax,v 1.54 2010/05/25 17:27:56 deraadt Exp $
+# $OpenBSD: Makefile.vax,v 1.55 2010/05/26 16:35:27 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -68,7 +68,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= intvec.o subr.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o subr.o param.o ioconf.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -124,7 +124,7 @@ lint:
tags:
@echo "see $S/kern/Makefile for tags"
-AFILES= ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s
+AFILES= ${_machdir}/${_mach}/locore.S ${_machdir}/${_mach}/subr.s
depend:: .depend
.depend: ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} assym.h ${DB_STRUCTINFO}
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES}
@@ -143,9 +143,8 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@
rm -f db_structinfo.o
-intvec.o: ${_machdir}/${_mach}/intvec.s assym.h
-subr.o: ${_machdir}/${_mach}/subr.s assym.h
-unimpl_emul.o: assym.h
+locore.o: ${_machdir}/${_mach}/locore.S assym.h
+subr.o unimpl_emul.o: assym.h
# The install target can be redefined by putting a
# install-kernel-${MACHINE_NAME} target into /etc/mk.conf
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index f0b0cb02e7d..f9f517e2452 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: files.vax,v 1.50 2009/03/20 18:39:26 miod Exp $
+# $OpenBSD: files.vax,v 1.51 2010/05/26 16:35:27 deraadt Exp $
# $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
#
# new style config file for vax architecture
@@ -383,7 +383,6 @@ file arch/vax/vax/ka660.c vax660
file arch/vax/vax/ka670.c vax670
file arch/vax/vax/ka680.c vax680
file arch/vax/vax/ka820.c vax8200
-file arch/vax/vax/locore.c
file arch/vax/vax/machdep.c
file arch/vax/vax/mem.c
file arch/vax/vax/mutex.c