Index: head/sys/amd64/amd64/genassym.c
===================================================================
--- head/sys/amd64/amd64/genassym.c	(revision 48307)
+++ head/sys/amd64/amd64/genassym.c	(revision 48308)
@@ -1,232 +1,235 @@
 /*-
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.69 1999/05/12 21:38:40 luoqi Exp $
+ *	$Id: genassym.c,v 1.70 1999/06/01 18:19:38 jlemon Exp $
  */
 
 #include "opt_user_ldt.h"
 
 #include <stddef.h>
 
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
+#include <sys/errno.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/resourcevar.h>
 #include <machine/frame.h>
 #include <machine/bootinfo.h>
 #include <machine/tss.h>
 #include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
+#define KERNEL	/* Avoid userland compatability headers */
 #include <sys/user.h>
+#undef KERNEL
 #include <net/if.h>
 #include <netinet/in.h>
 #include <nfs/nfsv2.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsdiskless.h>
 #ifdef SMP
 #include <machine/apic.h>
 #endif
 #include <machine/segments.h>
 #include <machine/globaldata.h>
 #include <machine/vm86.h>
 
 #define	OS(s, m)	((u_int)offsetof(struct s, m))
 
 int	main __P((void));
 int	printf __P((const char *, ...));
 
 int
 main()
 {
 
 	printf("#define\tP_FORW %#x\n", OS(proc, p_procq.tqe_next));
 	printf("#define\tP_BACK %#x\n", OS(proc, p_procq.tqe_prev));
 	printf("#define\tP_VMSPACE %#x\n", OS(proc, p_vmspace));
 	printf("#define\tVM_PMAP %#x\n", OS(vmspace, vm_pmap));
 	printf("#define\tPM_ACTIVE %#x\n", OS(pmap, pm_active));
 	printf("#define\tP_ADDR %#x\n", OS(proc, p_addr));
 	printf("#define\tP_PRI %#x\n", OS(proc, p_priority));
 	printf("#define\tP_RTPRIO_TYPE %#x\n", OS(proc, p_rtprio.type));
 	printf("#define\tP_RTPRIO_PRIO %#x\n", OS(proc, p_rtprio.prio));
 	printf("#define\tP_STAT %#x\n", OS(proc, p_stat));
 	printf("#define\tP_WCHAN %#x\n", OS(proc, p_wchan));
 	printf("#define\tP_FLAG %#x\n", OS(proc, p_flag));
 	printf("#define\tP_PID %#x\n", OS(proc, p_pid));
 #ifdef SMP
 	printf("#define\tP_ONCPU %#x\n", OS(proc, p_oncpu));
 	printf("#define\tP_LASTCPU %#x\n", OS(proc, p_lastcpu));
 #endif
 	printf("#define\tSSLEEP %d\n", SSLEEP);
 	printf("#define\tSRUN %d\n", SRUN);
 	printf("#define\tV_TRAP %#x\n", OS(vmmeter, v_trap));
 	printf("#define\tV_SYSCALL %#x\n", OS(vmmeter, v_syscall));
 	printf("#define\tV_INTR %#x\n", OS(vmmeter, v_intr));
 	printf("#define\tUPAGES %d\n", UPAGES);
 	printf("#define\tPAGE_SIZE %d\n", PAGE_SIZE);
 	printf("#define\tNPTEPG %d\n", NPTEPG);
 	printf("#define\tNPDEPG %d\n", NPDEPG);
 	printf("#define\tPDESIZE %d\n", PDESIZE);
 	printf("#define\tPTESIZE %d\n", PTESIZE);
 	printf("#define\tNKPDE %d\n", NKPDE);
 	printf("#define\tNKPT %d\n", NKPT);
 	printf("#define\tPAGE_SHIFT %d\n", PAGE_SHIFT);
 	printf("#define\tPAGE_MASK %d\n", PAGE_MASK);
 	printf("#define\tPDRSHIFT %d\n", PDRSHIFT);
 	printf("#define\tUSRSTACK %#x\n", USRSTACK);
 	printf("#define\tVM_MAXUSER_ADDRESS %#x\n", VM_MAXUSER_ADDRESS);
 	printf("#define\tKERNBASE %#x\n", KERNBASE);
 	printf("#define\tMCLBYTES %d\n", MCLBYTES);
 	printf("#define\tPCB_CR3 %#x\n", OS(pcb, pcb_cr3));
 	printf("#define\tPCB_EDI %#x\n", OS(pcb, pcb_edi));
 	printf("#define\tPCB_ESI %#x\n", OS(pcb, pcb_esi));
 	printf("#define\tPCB_EBP %#x\n", OS(pcb, pcb_ebp));
 	printf("#define\tPCB_ESP %#x\n", OS(pcb, pcb_esp));
 	printf("#define\tPCB_EBX %#x\n", OS(pcb, pcb_ebx));
 	printf("#define\tPCB_EIP %#x\n", OS(pcb, pcb_eip));
 	printf("#define\tTSS_ESP0 %#x\n", OS(i386tss, tss_esp0));
 	printf("#define\tPCB_USERLDT %#x\n", OS(pcb, pcb_ldt));
 	printf("#define\tPCB_GS %#x\n", OS(pcb, pcb_gs));
 	printf("#define\tPCB_EXT %#x\n", OS(pcb, pcb_ext));
 #ifdef SMP
 	printf("#define\tPCB_MPNEST %#x\n", OS(pcb, pcb_mpnest));
 #endif
 	printf("#define\tPCB_SPARE %#x\n", OS(pcb, __pcb_spare));
 	printf("#define\tU_PROF %#x\n", OS(user, u_stats.p_prof));
 	printf("#define\tU_PROFSCALE %#x\n",
 	    OS(user, u_stats.p_prof.pr_scale));
 	printf("#define\tPR_BASE %#x\n", OS(uprof, pr_base));
 	printf("#define\tPR_SIZE %#x\n", OS(uprof, pr_size));
 	printf("#define\tPR_OFF %#x\n", OS(uprof, pr_off));
 	printf("#define\tPR_SCALE %#x\n", OS(uprof, pr_scale));
 	printf("#define\tRU_MINFLT %#x\n", OS(rusage, ru_minflt));
 	printf("#define\tPCB_FLAGS %#x\n", OS(pcb, pcb_flags));
 	printf("#define\tPCB_SAVEFPU %#x\n", OS(pcb, pcb_savefpu));
 	printf("#define\tPCB_SAVEFPU_SIZE %u\n", sizeof(struct save87));
 	printf("#define\tPCB_ONFAULT %#x\n", OS(pcb, pcb_onfault));
 #ifdef SMP
 	printf("#define\tPCB_SIZE %u\n", sizeof(struct pcb));
 #endif
 
 	printf("#define\tTF_ES %#x\n", OS(trapframe, tf_es));
 	printf("#define\tTF_DS %#x\n", OS(trapframe, tf_ds));
 	printf("#define\tTF_EDI %#x\n", OS(trapframe, tf_edi));
 	printf("#define\tTF_ESI %#x\n", OS(trapframe, tf_esi));
 	printf("#define\tTF_EBP %#x\n", OS(trapframe, tf_ebp));
 	printf("#define\tTF_ISP %#x\n", OS(trapframe, tf_isp));
 	printf("#define\tTF_EBX %#x\n", OS(trapframe, tf_ebx));
 	printf("#define\tTF_EDX %#x\n", OS(trapframe, tf_edx));
 	printf("#define\tTF_ECX %#x\n", OS(trapframe, tf_ecx));
 	printf("#define\tTF_EAX %#x\n", OS(trapframe, tf_eax));
 	printf("#define\tTF_TRAPNO %#x\n", OS(trapframe, tf_trapno));
 	printf("#define\tTF_ERR %#x\n", OS(trapframe, tf_err));
 	printf("#define\tTF_EIP %#x\n", OS(trapframe, tf_eip));
 	printf("#define\tTF_CS %#x\n", OS(trapframe, tf_cs));
 	printf("#define\tTF_EFLAGS %#x\n", OS(trapframe, tf_eflags));
 	printf("#define\tTF_ESP %#x\n", OS(trapframe, tf_esp));
 	printf("#define\tTF_SS %#x\n", OS(trapframe, tf_ss));
 
 	printf("#define\tSIGF_SIGNUM %#x\n", OS(sigframe, sf_signum));
 	printf("#define\tSIGF_CODE %#x\n", OS(sigframe, sf_code));
 	printf("#define\tSIGF_SCP %#x\n", OS(sigframe, sf_scp));
 	printf("#define\tSIGF_HANDLER %#x\n", OS(sigframe, sf_handler));
 	printf("#define\tSIGF_SC %#x\n", OS(sigframe, sf_sc));
 
 	printf("#define\tB_READ %#x\n", B_READ);
 	printf("#define\tENOENT %d\n", ENOENT);
 	printf("#define\tEFAULT %d\n", EFAULT);
 	printf("#define\tENAMETOOLONG %d\n", ENAMETOOLONG);
 	printf("#define\tMAXPATHLEN %d\n", MAXPATHLEN);
 
 	printf("#define\tBOOTINFO_SIZE %u\n", sizeof(struct bootinfo));
 	printf("#define\tBI_VERSION %#x\n", OS(bootinfo, bi_version));
 	printf("#define\tBI_KERNELNAME %#x\n", OS(bootinfo, bi_kernelname));
 	printf("#define\tBI_NFS_DISKLESS %#x\n", OS(bootinfo, bi_nfs_diskless));
 	printf("#define\tBI_ENDCOMMON %#x\n", OS(bootinfo, bi_endcommon));
 	printf("#define\tNFSDISKLESS_SIZE %u\n", sizeof(struct nfs_diskless));
 	printf("#define\tBI_SIZE %#x\n", OS(bootinfo, bi_size));
 	printf("#define\tBI_SYMTAB %#x\n", OS(bootinfo, bi_symtab));
 	printf("#define\tBI_ESYMTAB %#x\n", OS(bootinfo, bi_esymtab));
 	printf("#define\tBI_KERNEND %#x\n", OS(bootinfo, bi_kernend));
 	printf("#define\tBI_ENVP %#x\n", OS(bootinfo, bi_envp));
 	printf("#define\tBI_MODULEP %#x\n", OS(bootinfo, bi_modulep));
 
 	printf("#define\tGD_SIZEOF %u\n", sizeof(struct globaldata));
 	printf("#define\tGD_CURPROC %#x\n", OS(globaldata, gd_curproc));
 	printf("#define\tGD_NPXPROC %#x\n", OS(globaldata, gd_npxproc));
 	printf("#define\tGD_CURPCB %#x\n", OS(globaldata, gd_curpcb));
 	printf("#define\tGD_COMMON_TSS %#x\n", OS(globaldata, gd_common_tss));
 	printf("#define\tGD_SWITCHTIME %#x\n", OS(globaldata, gd_switchtime));
 	printf("#define\tGD_SWITCHTICKS %#x\n", OS(globaldata, gd_switchticks));
 	printf("#define\tGD_COMMON_TSSD %#x\n", OS(globaldata, gd_common_tssd));
 	printf("#define\tGD_TSS_GDT %#x\n", OS(globaldata, gd_tss_gdt));
 #ifdef USER_LDT
 	printf("#define\tGD_CURRENTLDT %#x\n", OS(globaldata, gd_currentldt));
 #endif
 #ifdef SMP
 	printf("#define\tGD_CPUID %#x\n", OS(globaldata, gd_cpuid));
 	printf("#define\tGD_CPU_LOCKID %#x\n", OS(globaldata, gd_cpu_lockid));
 	printf("#define\tGD_OTHER_CPUS %#x\n", OS(globaldata, gd_other_cpus));
 	printf("#define\tGD_SS_EFLAGS %#x\n", OS(globaldata, gd_ss_eflags));
 	printf("#define\tGD_INSIDE_INTR %#x\n", OS(globaldata, gd_inside_intr));
 	printf("#define\tGD_PRV_CMAP1 %#x\n", OS(globaldata, gd_prv_CMAP1));
 	printf("#define\tGD_PRV_CMAP2 %#x\n", OS(globaldata, gd_prv_CMAP2));
 	printf("#define\tGD_PRV_CMAP3 %#x\n", OS(globaldata, gd_prv_CMAP3));
 	printf("#define\tGD_PRV_PMAP1 %#x\n", OS(globaldata, gd_prv_PMAP1));
 	printf("#define\tGD_PRV_CADDR1 %#x\n", OS(globaldata, gd_prv_CADDR1));
 	printf("#define\tGD_PRV_CADDR2 %#x\n", OS(globaldata, gd_prv_CADDR2));
 	printf("#define\tGD_PRV_CADDR3 %#x\n", OS(globaldata, gd_prv_CADDR3));
 	printf("#define\tGD_PRV_PADDR1 %#x\n", OS(globaldata, gd_prv_PADDR1));
 	printf("#define\tPS_GLOBALDATA %#x\n", OS(privatespace, globaldata));
 	printf("#define\tPS_IDLESTACK %#x\n", OS(privatespace, idlestack));
 	printf("#define\tPS_IDLESTACK_TOP %#x\n", sizeof(struct privatespace));
 #endif
 
 	printf("#define\tKCSEL %#x\n", GSEL(GCODE_SEL, SEL_KPL));
 	printf("#define\tKDSEL %#x\n", GSEL(GDATA_SEL, SEL_KPL));
 #ifdef SMP
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
 	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame));
 
 	return (0);
 }
Index: head/sys/conf/Makefile.i386
===================================================================
--- head/sys/conf/Makefile.i386	(revision 48307)
+++ head/sys/conf/Makefile.i386	(revision 48308)
@@ -1,286 +1,286 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $
+#	$Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk 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=	400016
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL?=	kernel
 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}
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL
 
 # 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
 
 .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
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %CLEAN
 
 all:	${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d ${KERNEL}
 .endif
 .endif
 
 ${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
 	${SYSTEM_LD_TAIL}
 
 .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}
 	@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} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | 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"
 
 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 48307)
+++ head/sys/conf/Makefile.powerpc	(revision 48308)
@@ -1,286 +1,286 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $
+#	$Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk 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=	400016
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL?=	kernel
 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}
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL
 
 # 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
 
 .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
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %CLEAN
 
 all:	${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d ${KERNEL}
 .endif
 .endif
 
 ${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
 	${SYSTEM_LD_TAIL}
 
 .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}
 	@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} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | 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"
 
 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 48307)
+++ head/sys/i386/conf/Makefile.i386	(revision 48308)
@@ -1,286 +1,286 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $
+#	$Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk 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=	400016
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL?=	kernel
 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}
+GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL
 
 # 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
 
 .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
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %SFILES
 
 %MFILES
 
 %CLEAN
 
 all:	${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
 ${KERNEL}:	${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
 	strip -d ${KERNEL}
 .endif
 .endif
 
 ${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
 	${SYSTEM_LD_TAIL}
 
 .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}
 	@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} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | 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"
 
 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/i386/genassym.c
===================================================================
--- head/sys/i386/i386/genassym.c	(revision 48307)
+++ head/sys/i386/i386/genassym.c	(revision 48308)
@@ -1,232 +1,235 @@
 /*-
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.69 1999/05/12 21:38:40 luoqi Exp $
+ *	$Id: genassym.c,v 1.70 1999/06/01 18:19:38 jlemon Exp $
  */
 
 #include "opt_user_ldt.h"
 
 #include <stddef.h>
 
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
+#include <sys/errno.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/resourcevar.h>
 #include <machine/frame.h>
 #include <machine/bootinfo.h>
 #include <machine/tss.h>
 #include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
+#define KERNEL	/* Avoid userland compatability headers */
 #include <sys/user.h>
+#undef KERNEL
 #include <net/if.h>
 #include <netinet/in.h>
 #include <nfs/nfsv2.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsdiskless.h>
 #ifdef SMP
 #include <machine/apic.h>
 #endif
 #include <machine/segments.h>
 #include <machine/globaldata.h>
 #include <machine/vm86.h>
 
 #define	OS(s, m)	((u_int)offsetof(struct s, m))
 
 int	main __P((void));
 int	printf __P((const char *, ...));
 
 int
 main()
 {
 
 	printf("#define\tP_FORW %#x\n", OS(proc, p_procq.tqe_next));
 	printf("#define\tP_BACK %#x\n", OS(proc, p_procq.tqe_prev));
 	printf("#define\tP_VMSPACE %#x\n", OS(proc, p_vmspace));
 	printf("#define\tVM_PMAP %#x\n", OS(vmspace, vm_pmap));
 	printf("#define\tPM_ACTIVE %#x\n", OS(pmap, pm_active));
 	printf("#define\tP_ADDR %#x\n", OS(proc, p_addr));
 	printf("#define\tP_PRI %#x\n", OS(proc, p_priority));
 	printf("#define\tP_RTPRIO_TYPE %#x\n", OS(proc, p_rtprio.type));
 	printf("#define\tP_RTPRIO_PRIO %#x\n", OS(proc, p_rtprio.prio));
 	printf("#define\tP_STAT %#x\n", OS(proc, p_stat));
 	printf("#define\tP_WCHAN %#x\n", OS(proc, p_wchan));
 	printf("#define\tP_FLAG %#x\n", OS(proc, p_flag));
 	printf("#define\tP_PID %#x\n", OS(proc, p_pid));
 #ifdef SMP
 	printf("#define\tP_ONCPU %#x\n", OS(proc, p_oncpu));
 	printf("#define\tP_LASTCPU %#x\n", OS(proc, p_lastcpu));
 #endif
 	printf("#define\tSSLEEP %d\n", SSLEEP);
 	printf("#define\tSRUN %d\n", SRUN);
 	printf("#define\tV_TRAP %#x\n", OS(vmmeter, v_trap));
 	printf("#define\tV_SYSCALL %#x\n", OS(vmmeter, v_syscall));
 	printf("#define\tV_INTR %#x\n", OS(vmmeter, v_intr));
 	printf("#define\tUPAGES %d\n", UPAGES);
 	printf("#define\tPAGE_SIZE %d\n", PAGE_SIZE);
 	printf("#define\tNPTEPG %d\n", NPTEPG);
 	printf("#define\tNPDEPG %d\n", NPDEPG);
 	printf("#define\tPDESIZE %d\n", PDESIZE);
 	printf("#define\tPTESIZE %d\n", PTESIZE);
 	printf("#define\tNKPDE %d\n", NKPDE);
 	printf("#define\tNKPT %d\n", NKPT);
 	printf("#define\tPAGE_SHIFT %d\n", PAGE_SHIFT);
 	printf("#define\tPAGE_MASK %d\n", PAGE_MASK);
 	printf("#define\tPDRSHIFT %d\n", PDRSHIFT);
 	printf("#define\tUSRSTACK %#x\n", USRSTACK);
 	printf("#define\tVM_MAXUSER_ADDRESS %#x\n", VM_MAXUSER_ADDRESS);
 	printf("#define\tKERNBASE %#x\n", KERNBASE);
 	printf("#define\tMCLBYTES %d\n", MCLBYTES);
 	printf("#define\tPCB_CR3 %#x\n", OS(pcb, pcb_cr3));
 	printf("#define\tPCB_EDI %#x\n", OS(pcb, pcb_edi));
 	printf("#define\tPCB_ESI %#x\n", OS(pcb, pcb_esi));
 	printf("#define\tPCB_EBP %#x\n", OS(pcb, pcb_ebp));
 	printf("#define\tPCB_ESP %#x\n", OS(pcb, pcb_esp));
 	printf("#define\tPCB_EBX %#x\n", OS(pcb, pcb_ebx));
 	printf("#define\tPCB_EIP %#x\n", OS(pcb, pcb_eip));
 	printf("#define\tTSS_ESP0 %#x\n", OS(i386tss, tss_esp0));
 	printf("#define\tPCB_USERLDT %#x\n", OS(pcb, pcb_ldt));
 	printf("#define\tPCB_GS %#x\n", OS(pcb, pcb_gs));
 	printf("#define\tPCB_EXT %#x\n", OS(pcb, pcb_ext));
 #ifdef SMP
 	printf("#define\tPCB_MPNEST %#x\n", OS(pcb, pcb_mpnest));
 #endif
 	printf("#define\tPCB_SPARE %#x\n", OS(pcb, __pcb_spare));
 	printf("#define\tU_PROF %#x\n", OS(user, u_stats.p_prof));
 	printf("#define\tU_PROFSCALE %#x\n",
 	    OS(user, u_stats.p_prof.pr_scale));
 	printf("#define\tPR_BASE %#x\n", OS(uprof, pr_base));
 	printf("#define\tPR_SIZE %#x\n", OS(uprof, pr_size));
 	printf("#define\tPR_OFF %#x\n", OS(uprof, pr_off));
 	printf("#define\tPR_SCALE %#x\n", OS(uprof, pr_scale));
 	printf("#define\tRU_MINFLT %#x\n", OS(rusage, ru_minflt));
 	printf("#define\tPCB_FLAGS %#x\n", OS(pcb, pcb_flags));
 	printf("#define\tPCB_SAVEFPU %#x\n", OS(pcb, pcb_savefpu));
 	printf("#define\tPCB_SAVEFPU_SIZE %u\n", sizeof(struct save87));
 	printf("#define\tPCB_ONFAULT %#x\n", OS(pcb, pcb_onfault));
 #ifdef SMP
 	printf("#define\tPCB_SIZE %u\n", sizeof(struct pcb));
 #endif
 
 	printf("#define\tTF_ES %#x\n", OS(trapframe, tf_es));
 	printf("#define\tTF_DS %#x\n", OS(trapframe, tf_ds));
 	printf("#define\tTF_EDI %#x\n", OS(trapframe, tf_edi));
 	printf("#define\tTF_ESI %#x\n", OS(trapframe, tf_esi));
 	printf("#define\tTF_EBP %#x\n", OS(trapframe, tf_ebp));
 	printf("#define\tTF_ISP %#x\n", OS(trapframe, tf_isp));
 	printf("#define\tTF_EBX %#x\n", OS(trapframe, tf_ebx));
 	printf("#define\tTF_EDX %#x\n", OS(trapframe, tf_edx));
 	printf("#define\tTF_ECX %#x\n", OS(trapframe, tf_ecx));
 	printf("#define\tTF_EAX %#x\n", OS(trapframe, tf_eax));
 	printf("#define\tTF_TRAPNO %#x\n", OS(trapframe, tf_trapno));
 	printf("#define\tTF_ERR %#x\n", OS(trapframe, tf_err));
 	printf("#define\tTF_EIP %#x\n", OS(trapframe, tf_eip));
 	printf("#define\tTF_CS %#x\n", OS(trapframe, tf_cs));
 	printf("#define\tTF_EFLAGS %#x\n", OS(trapframe, tf_eflags));
 	printf("#define\tTF_ESP %#x\n", OS(trapframe, tf_esp));
 	printf("#define\tTF_SS %#x\n", OS(trapframe, tf_ss));
 
 	printf("#define\tSIGF_SIGNUM %#x\n", OS(sigframe, sf_signum));
 	printf("#define\tSIGF_CODE %#x\n", OS(sigframe, sf_code));
 	printf("#define\tSIGF_SCP %#x\n", OS(sigframe, sf_scp));
 	printf("#define\tSIGF_HANDLER %#x\n", OS(sigframe, sf_handler));
 	printf("#define\tSIGF_SC %#x\n", OS(sigframe, sf_sc));
 
 	printf("#define\tB_READ %#x\n", B_READ);
 	printf("#define\tENOENT %d\n", ENOENT);
 	printf("#define\tEFAULT %d\n", EFAULT);
 	printf("#define\tENAMETOOLONG %d\n", ENAMETOOLONG);
 	printf("#define\tMAXPATHLEN %d\n", MAXPATHLEN);
 
 	printf("#define\tBOOTINFO_SIZE %u\n", sizeof(struct bootinfo));
 	printf("#define\tBI_VERSION %#x\n", OS(bootinfo, bi_version));
 	printf("#define\tBI_KERNELNAME %#x\n", OS(bootinfo, bi_kernelname));
 	printf("#define\tBI_NFS_DISKLESS %#x\n", OS(bootinfo, bi_nfs_diskless));
 	printf("#define\tBI_ENDCOMMON %#x\n", OS(bootinfo, bi_endcommon));
 	printf("#define\tNFSDISKLESS_SIZE %u\n", sizeof(struct nfs_diskless));
 	printf("#define\tBI_SIZE %#x\n", OS(bootinfo, bi_size));
 	printf("#define\tBI_SYMTAB %#x\n", OS(bootinfo, bi_symtab));
 	printf("#define\tBI_ESYMTAB %#x\n", OS(bootinfo, bi_esymtab));
 	printf("#define\tBI_KERNEND %#x\n", OS(bootinfo, bi_kernend));
 	printf("#define\tBI_ENVP %#x\n", OS(bootinfo, bi_envp));
 	printf("#define\tBI_MODULEP %#x\n", OS(bootinfo, bi_modulep));
 
 	printf("#define\tGD_SIZEOF %u\n", sizeof(struct globaldata));
 	printf("#define\tGD_CURPROC %#x\n", OS(globaldata, gd_curproc));
 	printf("#define\tGD_NPXPROC %#x\n", OS(globaldata, gd_npxproc));
 	printf("#define\tGD_CURPCB %#x\n", OS(globaldata, gd_curpcb));
 	printf("#define\tGD_COMMON_TSS %#x\n", OS(globaldata, gd_common_tss));
 	printf("#define\tGD_SWITCHTIME %#x\n", OS(globaldata, gd_switchtime));
 	printf("#define\tGD_SWITCHTICKS %#x\n", OS(globaldata, gd_switchticks));
 	printf("#define\tGD_COMMON_TSSD %#x\n", OS(globaldata, gd_common_tssd));
 	printf("#define\tGD_TSS_GDT %#x\n", OS(globaldata, gd_tss_gdt));
 #ifdef USER_LDT
 	printf("#define\tGD_CURRENTLDT %#x\n", OS(globaldata, gd_currentldt));
 #endif
 #ifdef SMP
 	printf("#define\tGD_CPUID %#x\n", OS(globaldata, gd_cpuid));
 	printf("#define\tGD_CPU_LOCKID %#x\n", OS(globaldata, gd_cpu_lockid));
 	printf("#define\tGD_OTHER_CPUS %#x\n", OS(globaldata, gd_other_cpus));
 	printf("#define\tGD_SS_EFLAGS %#x\n", OS(globaldata, gd_ss_eflags));
 	printf("#define\tGD_INSIDE_INTR %#x\n", OS(globaldata, gd_inside_intr));
 	printf("#define\tGD_PRV_CMAP1 %#x\n", OS(globaldata, gd_prv_CMAP1));
 	printf("#define\tGD_PRV_CMAP2 %#x\n", OS(globaldata, gd_prv_CMAP2));
 	printf("#define\tGD_PRV_CMAP3 %#x\n", OS(globaldata, gd_prv_CMAP3));
 	printf("#define\tGD_PRV_PMAP1 %#x\n", OS(globaldata, gd_prv_PMAP1));
 	printf("#define\tGD_PRV_CADDR1 %#x\n", OS(globaldata, gd_prv_CADDR1));
 	printf("#define\tGD_PRV_CADDR2 %#x\n", OS(globaldata, gd_prv_CADDR2));
 	printf("#define\tGD_PRV_CADDR3 %#x\n", OS(globaldata, gd_prv_CADDR3));
 	printf("#define\tGD_PRV_PADDR1 %#x\n", OS(globaldata, gd_prv_PADDR1));
 	printf("#define\tPS_GLOBALDATA %#x\n", OS(privatespace, globaldata));
 	printf("#define\tPS_IDLESTACK %#x\n", OS(privatespace, idlestack));
 	printf("#define\tPS_IDLESTACK_TOP %#x\n", sizeof(struct privatespace));
 #endif
 
 	printf("#define\tKCSEL %#x\n", GSEL(GCODE_SEL, SEL_KPL));
 	printf("#define\tKDSEL %#x\n", GSEL(GDATA_SEL, SEL_KPL));
 #ifdef SMP
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
 	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame));
 
 	return (0);
 }