Merge with 4.4-Lite.

sys/arch/hp300/conf/Makefile.hp300

@@ -1,16 +1,16 @@
-#	from: @(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.hp300,v 1.13 1994/04/16 08:38:00 cgd Exp $
+#	from: @(#)Makefile.hp300	8.2 (Berkeley) 1/23/94
+#	$Id: Makefile.hp300,v 1.14 1994/05/23 10:17:41 mycroft Exp $
 #
 # Makefile for NetBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/conf/``machineid''
+#	/sys/arch/hp300/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Machine generic makefile changes should be made in
-#	/sys/conf/Makefile.``machinetype''
+#	/sys/arch/hp300/conf/Makefile.hp300
 # after which config should be rerun for all machines of that type.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
@@ -27,14 +27,13 @@ CC=	cc ${DEBUG}
 CPP=	cpp
 LD=	ld
 TOUCH=	touch -f -c
-GPROF.EX=/usr/src/usr.lib/libc/csu/hp300/gmon.ex
 
 # source tree is located via $S relative to the compilation directory
 S=	../../../..
 HP300=	../..
 
 INCLUDES= -I. -I$S/arch -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Dmc68020 -Dhp300 -DFPCOPROC -DREFBIT
+COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Dmc68020 -Dhp300 -DFPCOPROC
 CFLAGS=	-O ${COPTS}
 
 ### find out what to use for libkern
@@ -57,8 +56,8 @@ DRIVER_C=	${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 
 PROFILE_C=	${CC} -S -c ${COPTS} $<; \
-		ex - $*.s < ${GPROF.EX}; \
-		${AS} -o $@ $*.s; \
+		sed -e s/_mcount/mcount/ -e s/subrmcount/subr_mcount/ <$*.s | \
+		${AS} -o $@; \
 		rm -f $*.s
 
 NORMAL_S=	${CPP} ${COPTS} $< | ${AS} -o $@
@@ -75,8 +74,12 @@ NORMAL_S_C=	${CPP} ${COPTS} ${PARAM} $< | ${AS} -o $@
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ=	locore.o ${OBJS} param.o ioconf.o ${LIBKERN}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	@echo loading $@; rm -f $@
-SYSTEM_LD=	@strip=-x; [ X${DEBUG} = X-g ] && strip=-X || true; \
+SYSTEM_LD_HEAD=	rm -f $@
+SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
+		then strip=-X; \
+		else strip=-x; \
+		fi; \
+		echo ${LD} $$strip -n -T 0 -o $@ -e start '$${SYSTEM_OBJ}' vers.o; \
 		${LD} $$strip -n -T 0 -o $@ -e start ${SYSTEM_OBJ} vers.o
 SYSTEM_LD_TAIL=	@size $@; chmod 755 $@; \
 		[ X${DEBUG} = X-g ] && { \
@@ -90,13 +93,13 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	${CC} ${CFLAGS} -c vers.c
 
 clean:
-	rm -f eddep *netbsd tags *.o locore.i [a-z]*.s \
+	rm -f eddep *netbsd netbsd.gdb tags *.o locore.i [a-z]*.s \
 		[Ee]rrs linterrs makelinks
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
 	    ${HP300}/hp300/Locore.c ${CFILES} ${HP300}/hp300/swapgeneric.c \
-	    ioconf.c param.c| \
+	    ioconf.c param.c | \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
@@ -110,10 +113,10 @@ autoconf.o: Makefile
 
 # the following are necessary because the files depend on the types of
 # hp cpu's included in the system configuration
-clock.o machdep.o autoconf.o conf.o: Makefile
+machdep.o sys_machdep.o pmap.o pmap_bootstrap.o trap.o dma.o: Makefile
 
-# depend on network configuration
-af.o uipc_proto.o locore.o: Makefile
+# depend on network or filesystem configuration
+uipc_proto.o vfs_conf.o locore.o: Makefile
 
 # depend on maxusers
 assym.s: Makefile
@@ -122,7 +125,7 @@ assym.s: genassym
 	./genassym >assym.s
 
 genassym:
-	${CC} ${INCLUDES} ${IDENT} -DKERNEL ${PARAM} -Dmc68020 -Dhp300 -o genassym \
+	${CC} ${INCLUDES} ${IDENT} ${PARAM} -Dmc68020 -Dhp300 -o genassym \
 	    ${HP300}/hp300/genassym.c
 
 depend: assym.s param.c
@@ -150,4 +153,9 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
+vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
+	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
+vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
+	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
+
 %RULES