Index: head/sys/alpha/conf/Makefile.alpha
===================================================================
--- head/sys/alpha/conf/Makefile.alpha	(revision 46725)
+++ head/sys/alpha/conf/Makefile.alpha	(revision 46726)
@@ -1,301 +1,305 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.22 1999/04/21 19:50:27 dfr Exp $
+#	$Id: Makefile.alpha,v 1.23 1999/04/24 21:38:49 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/alpha/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	400014
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 ALPHA=	${S}/alpha
 
 HCC?=${CC}
 SIZE?=size
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	0xfffffc0000300000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 NORMAL_M= ${NORMAL_C}
 
 # ${ALPHA}/alpha/setdef0.c and ${ALPHA}/alpha/setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They depend on setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${ALPHA}/alpha/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 
 .if defined(DEBUG)
 FULLKERNEL=	${KERNEL}.debug
 .else
 FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %LOAD
 
 %CLEAN
 
 .if !exists(.depend)
 ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
 	rm -f *.o *.s eddep errs genassym gensetdefs ${KERNEL} ${FULLKERNEL} \
 	      linterrs makelinks param.c setdefs.h symbols.exclude \
 	      symbols.sort tags vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${ALPHA}/alpha/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${ALPHA}/alpha/symbols.raw
 	grep -v '^#' ${ALPHA}/alpha/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
 hack.So: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
 	${CC} -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: ${ALPHA}/alpha/setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdefs.h: gensetdefs ${OBJS}
 	@echo Generating kernel linker sets
 	@./gensetdefs ${OBJS} >setdefs.h
 
 gensetdefs: gensetdefs.o
 	${HCC} -static gensetdefs.o -o $@
 
 gensetdefs.o: ${ALPHA}/alpha/gensetdefs.c
 	${HCC} -c -I${INCLUDES} ${ALPHA}/alpha/gensetdefs.c
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # XXX - may no longer be needed
 locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
 genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
 	${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 
 genassym: genassym.o
 	${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
 CLEAN+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEAN+=	__remqu.S __remq.S __remlu.S __reml.S
 
 __divqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divl.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __reml.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 
 ${OBJS}: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 	MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
 ${KERNEL}:	${FULLKERNEL}
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .endif
   
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
 	-chflags noschg ${DESTDIR}/${KERNEL}
 	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
+
+reinstall reinstall.debug:
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.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
 
 .if exists($S/../share/mk)
 .include "$S/../share/mk/bsd.kern.mk"
 .else
 .include <bsd.kern.mk>
 .endif
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/Makefile.alpha
===================================================================
--- head/sys/conf/Makefile.alpha	(revision 46725)
+++ head/sys/conf/Makefile.alpha	(revision 46726)
@@ -1,301 +1,305 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.22 1999/04/21 19:50:27 dfr Exp $
+#	$Id: Makefile.alpha,v 1.23 1999/04/24 21:38:49 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/alpha/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	400014
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 ALPHA=	${S}/alpha
 
 HCC?=${CC}
 SIZE?=size
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	0xfffffc0000300000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 NORMAL_M= ${NORMAL_C}
 
 # ${ALPHA}/alpha/setdef0.c and ${ALPHA}/alpha/setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They depend on setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${ALPHA}/alpha/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \
 	${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \
 	-o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
 
 .if defined(DEBUG)
 FULLKERNEL=	${KERNEL}.debug
 .else
 FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %LOAD
 
 %CLEAN
 
 .if !exists(.depend)
 ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
 	rm -f *.o *.s eddep errs genassym gensetdefs ${KERNEL} ${FULLKERNEL} \
 	      linterrs makelinks param.c setdefs.h symbols.exclude \
 	      symbols.sort tags vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${ALPHA}/alpha/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${ALPHA}/alpha/symbols.raw
 	grep -v '^#' ${ALPHA}/alpha/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${ALPHA}/alpha/locore.s assym.s
 	${NORMAL_S}
 
 hack.So: Makefile
 	echo "void __elf_kld_hack() {}" > hack.c
 	${CC} -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 
 setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: ${ALPHA}/alpha/setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdefs.h: gensetdefs ${OBJS}
 	@echo Generating kernel linker sets
 	@./gensetdefs ${OBJS} >setdefs.h
 
 gensetdefs: gensetdefs.o
 	${HCC} -static gensetdefs.o -o $@
 
 gensetdefs.o: ${ALPHA}/alpha/gensetdefs.c
 	${HCC} -c -I${INCLUDES} ${ALPHA}/alpha/gensetdefs.c
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # XXX - may no longer be needed
 locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the
 # value of kernel options.
 genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
 	${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 
 genassym: genassym.o
 	${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
 CLEAN+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEAN+=	__remqu.S __remq.S __remlu.S __reml.S
 
 __divqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __divl.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remqu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remq.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __remlu.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 __reml.S: ${S}/alpha/alpha/divrem.m4
 	@echo 'building ${.TARGET} from ${.ALLSRC}'
 	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
 	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
 
 
 ${OBJS}: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
 	MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
 ${KERNEL}:	${FULLKERNEL}
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .endif
   
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
 	-chflags noschg ${DESTDIR}/${KERNEL}
 	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
+
+reinstall reinstall.debug:
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
 
 ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.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
 
 .if exists($S/../share/mk)
 .include "$S/../share/mk/bsd.kern.mk"
 .else
 .include <bsd.kern.mk>
 .endif
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/Makefile.i386
===================================================================
--- head/sys/conf/Makefile.i386	(revision 46725)
+++ head/sys/conf/Makefile.i386	(revision 46726)
@@ -1,280 +1,284 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.147 1999/04/19 14:14:08 peter Exp $
+#	$Id: Makefile.i386,v 1.148 1999/04/24 21:38:50 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	400014
 
 KERNFORMAT?=	elf
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h 
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
 # Use the default object format for genassym, etc.
 GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # Select the correct set of tools. Can't set OBJFORMAT here because it
 # doesn't get exported into the environment, and if it were exported
 # then it might break building of genassym, etc.
 .if ${KERNFORMAT} == "elf"
 CFLAGS+=	-elf
 .else
 CFLAGS+=	-aout
 .endif
 
 LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 GEN_CFILES= ${I386}/i386/genassym.c
 # setdef0.c and setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
 
 .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/i386/conf/kernel.script
 .endif
 
 .if defined(DEBUG)
 FULLKERNEL=	${KERNEL}.debug
 .else
 FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %LOAD
 
 %CLEAN
 
 .if !exists(.depend)
 ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
 	      ${KERNEL} ${FULLKERNEL} linterrs makelinks param.c \
 	      setdef[01].c setdefs.h symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude:
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 .if ${KERNFORMAT} == elf
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
 hack.So: Makefile
 	touch hack.c
 	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
 .ORDER: setdefs.h setdef0.c setdef1.c
 
 setdef0.o: setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdef0.c setdef1.c setdefs.h: ${OBJS}
 	@echo generating linker set emulation glue for ELF
 	@gensetdefs ${OBJS}
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 genassym.o: ${I386}/i386/genassym.c
 	${CC} -c ${GEN_CFLAGS} ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \
 	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d kernel
 .endif
 .endif
 
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
 	-chflags noschg ${DESTDIR}/${KERNEL}
 	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
+
+reinstall reinstall.debug:
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
 
 config.o:
 	${NORMAL_C}
 
 ioconf.o:
 	${NORMAL_C}
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o:
 	${NORMAL_C}
 
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
 # XXX strictly, everything depends on Makefile because changes to ${PROF}
 # only appear there, but we don't handle that.
 vers.o:
 	${NORMAL_C}
 
 .ORDER: vnode_if.c vnode_if.h
 vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 vnode_if.o:
 	${NORMAL_C}
 
 .if exists($S/../share/mk)
 .include "$S/../share/mk/bsd.kern.mk"
 .else
 .include <bsd.kern.mk>
 .endif
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/Makefile.powerpc
===================================================================
--- head/sys/conf/Makefile.powerpc	(revision 46725)
+++ head/sys/conf/Makefile.powerpc	(revision 46726)
@@ -1,280 +1,284 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.147 1999/04/19 14:14:08 peter Exp $
+#	$Id: Makefile.i386,v 1.148 1999/04/24 21:38:50 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	400014
 
 KERNFORMAT?=	elf
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h 
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
 # Use the default object format for genassym, etc.
 GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # Select the correct set of tools. Can't set OBJFORMAT here because it
 # doesn't get exported into the environment, and if it were exported
 # then it might break building of genassym, etc.
 .if ${KERNFORMAT} == "elf"
 CFLAGS+=	-elf
 .else
 CFLAGS+=	-aout
 .endif
 
 LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 GEN_CFILES= ${I386}/i386/genassym.c
 # setdef0.c and setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
 
 .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/i386/conf/kernel.script
 .endif
 
 .if defined(DEBUG)
 FULLKERNEL=	${KERNEL}.debug
 .else
 FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %LOAD
 
 %CLEAN
 
 .if !exists(.depend)
 ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
 	      ${KERNEL} ${FULLKERNEL} linterrs makelinks param.c \
 	      setdef[01].c setdefs.h symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude:
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 .if ${KERNFORMAT} == elf
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
 hack.So: Makefile
 	touch hack.c
 	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
 .ORDER: setdefs.h setdef0.c setdef1.c
 
 setdef0.o: setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdef0.c setdef1.c setdefs.h: ${OBJS}
 	@echo generating linker set emulation glue for ELF
 	@gensetdefs ${OBJS}
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 genassym.o: ${I386}/i386/genassym.c
 	${CC} -c ${GEN_CFLAGS} ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \
 	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d kernel
 .endif
 .endif
 
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
 	-chflags noschg ${DESTDIR}/${KERNEL}
 	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
+
+reinstall reinstall.debug:
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
 
 config.o:
 	${NORMAL_C}
 
 ioconf.o:
 	${NORMAL_C}
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o:
 	${NORMAL_C}
 
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
 # XXX strictly, everything depends on Makefile because changes to ${PROF}
 # only appear there, but we don't handle that.
 vers.o:
 	${NORMAL_C}
 
 .ORDER: vnode_if.c vnode_if.h
 vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 vnode_if.o:
 	${NORMAL_C}
 
 .if exists($S/../share/mk)
 .include "$S/../share/mk/bsd.kern.mk"
 .else
 .include <bsd.kern.mk>
 .endif
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/i386/conf/Makefile.i386
===================================================================
--- head/sys/i386/conf/Makefile.i386	(revision 46725)
+++ head/sys/i386/conf/Makefile.i386	(revision 46726)
@@ -1,280 +1,284 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.147 1999/04/19 14:14:08 peter Exp $
+#	$Id: Makefile.i386,v 1.148 1999/04/24 21:38:50 peter Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
 %VERSREQ=	400014
 
 KERNFORMAT?=	elf
 
 STD8X16FONT?=	iso
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 COPTFLAGS?=-O
 INCLUDES= -nostdinc -I- -I. -I$S
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h 
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
 # Use the default object format for genassym, etc.
 GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
 # Select the correct set of tools. Can't set OBJFORMAT here because it
 # doesn't get exported into the environment, and if it were exported
 # then it might break building of genassym, etc.
 .if ${KERNFORMAT} == "elf"
 CFLAGS+=	-elf
 .else
 CFLAGS+=	-aout
 .endif
 
 LOAD_ADDRESS?=	C0100000
 DEFINED_PROF=	${PROF}
 .if defined(PROF)
 CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 GEN_CFILES= ${I386}/i386/genassym.c
 # setdef0.c and setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
 # is generated from all of ${OBJS}.  We don't want to have to compile
 # everything just to do a make depend.
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
 
 .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 
 .if ${KERNFORMAT} == elf
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/i386/conf/kernel.script
 .endif
 
 .if defined(DEBUG)
 FULLKERNEL=	${KERNEL}.debug
 .else
 FULLKERNEL=	${KERNEL}
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %LOAD
 
 %CLEAN
 
 .if !exists(.depend)
 ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
 	      ${KERNEL} ${FULLKERNEL} linterrs makelinks param.c \
 	      setdef[01].c setdefs.h symbols.exclude symbols.sort tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude:
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 .if ${KERNFORMAT} == elf
 # This is a hack.  BFD "optimizes" away dynamic mode if there are no
 # dynamic references.  We could probably do a '-Bforcedynamic' mode like
 # in the a.out ld.  For now, this works.
 hack.So: Makefile
 	touch hack.c
 	${CC} -elf -shared -nostdlib hack.c -o hack.So
 	rm -f hack.c
 .endif
 
 .ORDER: setdefs.h setdef0.c setdef1.c
 
 setdef0.o: setdef0.c setdefs.h
 	${NORMAL_C}
 
 setdef1.o: setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdef0.c setdef1.c setdefs.h: ${OBJS}
 	@echo generating linker set emulation glue for ELF
 	@gensetdefs ${OBJS}
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 genassym.o: ${I386}/i386/genassym.c
 	${CC} -c ${GEN_CFLAGS} ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET}
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \
 	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
 	mv -f .newdep .depend
 
 cleandepend:
 	rm -f .depend
 
 links:
 	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 .if defined(DEBUG)
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d kernel
 .endif
 .endif
 
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
 		exit 1 ; \
 	fi
 .if exists(${DESTDIR}/${KERNEL})
 	-chflags noschg ${DESTDIR}/${KERNEL}
 	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
 .endif
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
 		if [ -f /var/db/kvm_kernel.db ] ; then \
 			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
+
+reinstall reinstall.debug:
+	install -c -m 555 -o root -g wheel -fschg \
+		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
 
 config.o:
 	${NORMAL_C}
 
 ioconf.o:
 	${NORMAL_C}
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o:
 	${NORMAL_C}
 
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
 # XXX strictly, everything depends on Makefile because changes to ${PROF}
 # only appear there, but we don't handle that.
 vers.o:
 	${NORMAL_C}
 
 .ORDER: vnode_if.c vnode_if.h
 vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 vnode_if.o:
 	${NORMAL_C}
 
 .if exists($S/../share/mk)
 .include "$S/../share/mk/bsd.kern.mk"
 .else
 .include <bsd.kern.mk>
 .endif
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it