From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:36:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA20816A4D0; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2F3B16A4CE for ; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42E7643D49 for ; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1Nataw025755 for ; Wed, 1 Dec 2004 23:36:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1NasfC025752 for perforce@freebsd.org; Wed, 1 Dec 2004 23:36:54 GMT (envelope-from peter@freebsd.org) Date: Wed, 1 Dec 2004 23:36:54 GMT Message-Id: <200412012336.iB1NasfC025752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 23:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=66226 Change 66226 by peter@peter_overcee on 2004/12/01 23:36:27 IFC @66223 Affected files ... .. //depot/projects/hammer/MAINTAINERS#29 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#44 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#6 integrate .. //depot/projects/hammer/release/i386/mkisoimages.sh#6 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#58 integrate .. //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#56 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#17 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/hammer/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/hammer/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#8 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#8 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#11 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.h#4 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#28 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#25 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#25 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#5 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#5 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#16 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null.h#4 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#11 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#9 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap.h#3 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#18 integrate .. //depot/projects/hammer/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#35 integrate .. //depot/projects/hammer/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/hammer/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#21 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#16 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#6 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#27 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#63 integrate .. //depot/projects/hammer/sys/net/if.c#36 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/hammer/sys/posix4/posix4_mib.c#6 integrate .. //depot/projects/hammer/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/sys/domain.h#4 integrate .. //depot/projects/hammer/sys/sys/file.h#10 integrate .. //depot/projects/hammer/sys/sys/reboot.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#36 integrate .. //depot/projects/hammer/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#36 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#28 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#8 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#23 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#6 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#4 integrate .. //depot/projects/hammer/usr.bin/make/buf.h#3 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#10 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#9 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#7 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#3 integrate .. //depot/projects/hammer/usr.bin/make/for.c#7 integrate .. //depot/projects/hammer/usr.bin/make/hash.c#4 integrate .. //depot/projects/hammer/usr.bin/make/hash.h#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#14 integrate .. //depot/projects/hammer/usr.bin/make/job.h#10 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstLast.c#4 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#5 delete .. //depot/projects/hammer/usr.bin/make/main.c#21 integrate .. //depot/projects/hammer/usr.bin/make/make.c#7 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#16 integrate .. //depot/projects/hammer/usr.bin/make/str.c#7 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#8 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#7 integrate .. //depot/projects/hammer/usr.bin/make/util.c#2 integrate .. //depot/projects/hammer/usr.bin/make/var.c#12 integrate .. //depot/projects/hammer/usr.bin/make/var.h#2 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#3 integrate .. //depot/projects/hammer/usr.bin/ncal/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#29 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ +$FreeBSD: src/MAINTAINERS,v 1.101 2004/11/30 20:04:47 eik Exp $ subsystem login notes ----------------------------- @@ -102,6 +102,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +pkg_install eik Pre-commit review or approval from portmgr@ requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/etc/defaults/rc.conf#44 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -61,7 +61,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). ==== //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.10 2004/07/06 21:55:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.11 2004/11/30 05:12:35 marcel Exp $ VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -36,6 +36,12 @@ GENSRCS+= nm.h tm.h +.if defined(GDB_CROSS_DEBUGGER) +CFLAGS+= -DCROSS_DEBUGGER +GDB_SUFFIX= -${TARGET_ARCH} +NOMAN= +.endif + .include "${TARGET_SUBDIR}/Makefile" SRCS+= ${GENSRCS} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.2 2004/11/30 05:12:35 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= core-regset.c solib-legacy.c -LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-nat.c alphabsd-tdep.c \ - alphafbsd-tdep.c +LIBSRCS+= alphabsd-nat.c +.endif +LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c nm.h: echo '#include "alpha/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== @@ -1,10 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= amd64-nat.c amd64-tdep.c amd64bsd-nat.c amd64fbsd-nat.c \ - amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c \ - i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c +.endif +LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ + i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#3 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.3 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ - i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c +.endif +LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#2 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= ia64-fbsd-nat.c ia64-fbsd-tdep.c ia64-tdep.c +LIBSRCS+= ia64-fbsd-nat.c +.endif +LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c nm.h: echo '#include "ia64/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.1 2004/06/25 06:48:54 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= solib-legacy.c -LIBSRCS+= sparc-nat.c sparc-tdep.c sparc64-nat.c sparc64-tdep.c \ - sparc64fbsd-nat.c sparc64fbsd-tdep.c +LIBSRCS+= sparc-nat.c sparc64-nat.c sparc64fbsd-nat.c +.endif +LIBSRCS+= sparc-tdep.c sparc64-tdep.c sparc64fbsd-tdep.c nm.h: echo '#include "sparc/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.42 2004/06/26 08:48:50 bde Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.43 2004/11/30 05:12:36 marcel Exp $ -PROG= gdb +PROG= gdb${GDB_SUFFIX} SRCS= gdb.c BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.3 2004/10/24 15:32:28 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.4 2004/11/30 05:12:37 marcel Exp $ -PROG= gdbtui +PROG= gdbtui${GDB_SUFFIX} SRCS= tui-main.c NOMAN= ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.1 2004/07/25 05:29:15 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.3 2004/11/30 05:12:37 marcel Exp $ -PROG= kgdb -SRCS= kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c +PROG= kgdb${GDB_SUFFIX} +SRCS= kthr.c main.c trgt.c trgt_${TARGET_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#6 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.6 2004/11/30 05:12:37 marcel Exp $ + +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif LIB= gdb INTERNALLIB= @@ -16,11 +21,11 @@ elfread.c environ.c eval.c event-loop.c event-top.c exec.c \ expprint.c \ f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ - fork-child.c frame-base.c frame-unwind.c frame.c \ + ${_fork_child} frame-base.c frame-unwind.c frame.c \ gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \ hpacc-abi.c \ - inf-loop.c infcall.c infcmd.c inflow.c infptrace.c infrun.c \ - inftarg.c init.c interps.c \ + inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \ + ${_inftarg} init.c interps.c \ jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ kod-cisco.c kod.c \ language.c linespec.c \ @@ -47,12 +52,19 @@ valarith.c valops.c valprint.c values.c varobj.c \ wrapper.c ${LIBSRCS} -GENSRCS= version.c +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -LIBSRCS+= fbsd-threads.c +.if !defined(GDB_CROSS_DEBUGGER) +_fork_child= fork-child.c +_infptrace= infptrace.c +_inftarg= inftarg.c .endif +GENSRCS= version.c + version.c: echo '#include "version.h"' > ${.TARGET} echo 'const char version[] = ${VERSION};' >> ${.TARGET} ==== //depot/projects/hammer/release/i386/mkisoimages.sh#6 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.12 2004/12/01 18:03:18 jhb Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -14,9 +14,9 @@ # # Usage: # -# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir] +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] # -# Where -[e]b is passed if the ISO image should be made "bootable" by +# Where -b is passed if the ISO image should be made "bootable" by # whatever standards this architecture supports (may be unsupported), # image-label is the ISO image label, image-name is the filename of the # resulting ISO image, base-bits-dir contains the image contents and @@ -28,9 +28,6 @@ if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift -elif [ "x$1" = "x-eb" ]; then - bootable="-b floppies/boot.flp -c floppies/boot.catalog" - shift else bootable="" fi ==== //depot/projects/hammer/sbin/mount/mntopts.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.23 2004/11/29 09:35:01 ru Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.24 2004/11/30 19:36:40 ru Exp $ */ struct mntopt { @@ -40,6 +40,7 @@ /* User-visible MNT_ flags. */ #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 } #define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 } +#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 } #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 } #define MOPT_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 } @@ -75,6 +76,7 @@ MOPT_GROUPQUOTA, \ MOPT_FSTAB_COMPAT, \ MOPT_NOATIME, \ + MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \ MOPT_NOSUID, \ ==== //depot/projects/hammer/share/man/man4/Makefile#58 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.296 2004/11/30 16:16:34 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -361,6 +361,7 @@ MLINKS+=bge.4 if_bge.4 MLINKS+=bktr.4 brooktree.4 MLINKS+=cnw.4 if_cnw.4 +MLINKS+=crypto.4 cryptodev.4 MLINKS+=cue.4 if_cue.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 ==== //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -46,7 +46,7 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -81,14 +81,13 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { - val = __bswap64(val); switch (regnum) { case GDB_REG_PC: - kdb_thrctx->pcb_rip = val; + kdb_thrctx->pcb_rip = *(register_t *)val; if (kdb_thread == curthread) - kdb_frame->tf_rip = val; + kdb_frame->tf_rip = *(register_t *)val; } } ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#56 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.239 2004/11/29 23:25:56 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.240 2004/11/30 20:25:46 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -334,18 +334,14 @@ cpu_reset_real(); /* NOTREACHED */ } else { + u_int map; - u_int map; - int cnt; printf("cpu_reset called on cpu#%d\n", PCPU_GET(cpuid)); - map = PCPU_GET(other_cpus) & ~ stopped_cpus; - if (map != 0) { printf("cpu_reset: Stopping other CPUs\n"); stop_cpus(map); /* Stop all other CPUs */ } - DELAY(1000000); cpu_reset_real(); /* NOTREACHED */ ==== //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:21 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:34 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -52,6 +52,6 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/hammer/sys/boot/common/loader.8#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $ .\" .Dd October 15, 2004 .Dt LOADER 8 @@ -352,10 +352,6 @@ Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. -Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. ==== //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $"); #include #include @@ -53,7 +53,6 @@ } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -86,9 +85,6 @@ case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; ==== //depot/projects/hammer/sys/boot/ficl/ficl.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -1114,7 +1114,6 @@ extern void ficlInb(FICL_VM *pVM); #endif -#if !defined(TESTMAIN) extern void ficlSetenv(FICL_VM *pVM); extern void ficlSetenvq(FICL_VM *pVM); extern void ficlGetenv(FICL_VM *pVM); @@ -1122,9 +1121,10 @@ extern void ficlCopyin(FICL_VM *pVM); extern void ficlCopyout(FICL_VM *pVM); extern void ficlFindfile(FICL_VM *pVM); +extern void ficlCcall(FICL_VM *pVM); +#if !defined(TESTMAIN) extern void ficlPnpdevices(FICL_VM *pVM); extern void ficlPnphandlers(FICL_VM *pVM); -extern void ficlCcall(FICL_VM *pVM); #endif /* ==== //depot/projects/hammer/sys/boot/ficl/loader.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $ */ /******************************************************************* @@ -56,11 +56,13 @@ * .# ( value -- ) */ -#ifndef TESTMAIN void ficlSetenv(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values; #if FICL_ROBUST > 1 @@ -71,6 +73,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -85,6 +88,7 @@ setenv(name, value, 1); ficlFree(name); ficlFree(value); +#endif return; } @@ -92,7 +96,10 @@ void ficlSetenvq(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values, overwrite; #if FICL_ROBUST > 1 @@ -104,6 +111,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -118,6 +126,7 @@ setenv(name, value, overwrite); ficlFree(name); ficlFree(value); +#endif return; } @@ -125,7 +134,10 @@ void ficlGetenv(FICL_VM *pVM) { - char *namep, *name, *value; +#ifndef TESTMAIN + char *name; +#endif + char *namep, *value; int names; #if FICL_ROBUST > 1 @@ -134,6 +146,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -147,6 +160,7 @@ stackPushPtr(pVM->pStack, value); stackPushINT(pVM->pStack, strlen(value)); } else +#endif stackPushINT(pVM->pStack, -1); return; @@ -155,7 +169,10 @@ void ficlUnsetenv(FICL_VM *pVM) { - char *namep, *name; +#ifndef TESTMAIN + char *name; +#endif + char *namep; int names; #if FICL_ROBUST > 1 @@ -164,6 +181,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -172,6 +190,7 @@ unsetenv(name); ficlFree(name); +#endif return; } @@ -191,7 +210,9 @@ dest = stackPopINT(pVM->pStack); src = stackPopPtr(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyin(src, dest, len); +#endif return; } @@ -211,7 +232,9 @@ dest = stackPopPtr(pVM->pStack); src = stackPopINT(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyout(src, dest, len); +#endif return; } @@ -219,7 +242,10 @@ void ficlFindfile(FICL_VM *pVM) { - char *name, *type, *namep, *typep; +#ifndef TESTMAIN + char *name; +#endif + char *type, *namep, *typep; struct preloaded_file* fp; int names, types; @@ -231,6 +257,7 @@ typep = (char*) stackPopPtr(pVM->pStack); names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -243,11 +270,15 @@ type[types] = '\0'; fp = file_findfile(name, type); +#else + fp = NULL; +#endif stackPushPtr(pVM->pStack, fp); return; } +#ifndef TESTMAIN #ifdef HAVE_PNP void @@ -637,11 +668,6 @@ dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT); dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT); -#ifndef TESTMAIN -#ifdef __i386__ - dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); - dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); -#endif dictAppendWord(dp, "setenv", ficlSetenv, FW_DEFAULT); dictAppendWord(dp, "setenv?", ficlSetenvq, FW_DEFAULT); dictAppendWord(dp, "getenv", ficlGetenv, FW_DEFAULT); @@ -649,11 +675,16 @@ dictAppendWord(dp, "copyin", ficlCopyin, FW_DEFAULT); >>> TRUNCATED FOR MAIL (1000 lines) <<<