From fc4ff23a7a94c0eee76261c212bfb3a13b682f97 Mon Sep 17 00:00:00 2001 From: fvdl Date: Tue, 19 Jun 2001 13:19:54 +0000 Subject: [PATCH] Fix a few bogons. --- sys/arch/x86_64/conf/Makefile.x86_64 | 17 +++++++++-------- sys/arch/x86_64/conf/files.x86_64 | 3 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/arch/x86_64/conf/Makefile.x86_64 b/sys/arch/x86_64/conf/Makefile.x86_64 index c36d3ef2a4d5..d92225679196 100644 --- a/sys/arch/x86_64/conf/Makefile.x86_64 +++ b/sys/arch/x86_64/conf/Makefile.x86_64 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.x86_64,v 1.1 2001/06/19 00:19:47 fvdl Exp $ +# $NetBSD: Makefile.x86_64,v 1.2 2001/06/19 13:19:54 fvdl Exp $ # Makefile for NetBSD # @@ -91,7 +91,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o vector.o copy.o \ +SYSTEM_OBJ= locore.o vector.o copy.o microtime.o \ param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ @@ -162,15 +162,15 @@ links: sh makelinks && rm -f dontlink SRCS= ${X86_64}/x86_64/locore.S ${X86_64}/x86_64/vector.S \ - ${X86_64}/x86_64/copy.S \ + ${X86_64}/x86_64/copy.S ${X86_64}/x86_64/microtime.S \ param.c ioconf.c ${CFILES} ${SFILES} depend: .depend .depend: ${SRCS} assym.h param.c ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/locore.S - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/vector.S - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/copy.S + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/vector.S + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/copy.S + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${X86_64}/x86_64/microtime.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} - ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} < ${X86_64}/x86_64/genassym.cf @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend @@ -197,10 +197,11 @@ locore.o: ${X86_64}/x86_64/locore.S assym.h vector.o: ${X86_64}/x86_64/vector.S assym.h ${NORMAL_S} -copy.o: ${X86_64}/x86_64/vector.S assym.h +copy.o: ${X86_64}/x86_64/copy.S assym.h ${NORMAL_S} -in_cksum.o: assym.h +microtime.o: ${X86_64}/x86_64/microtime.S assym.h + ${NORMAL_S} netbsd32_sigcode.o: assym.h diff --git a/sys/arch/x86_64/conf/files.x86_64 b/sys/arch/x86_64/conf/files.x86_64 index 3041cc0622f3..55966c53a5f0 100644 --- a/sys/arch/x86_64/conf/files.x86_64 +++ b/sys/arch/x86_64/conf/files.x86_64 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86_64,v 1.2 2001/06/19 02:06:52 fvdl Exp $ +# $NetBSD: files.x86_64,v 1.3 2001/06/19 13:19:54 fvdl Exp $ # # new style config file for x86_64 architecture # @@ -47,7 +47,6 @@ file arch/x86_64/x86_64/kgdb_machdep.c kgdb file arch/x86_64/x86_64/machdep.c file arch/x86_64/x86_64/math_emulate.c math_emulate file arch/x86_64/x86_64/mem.c -file arch/x86_64/x86_64/microtime.S file netns/ns_cksum.c ns file arch/x86_64/x86_64/pmap.c file arch/x86_64/x86_64/process_machdep.c