Date: Tue, 2 Mar 2010 23:53:39 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204610 - in user/jmallett/octeon: . bin/pkill cddl cddl/lib/drti cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/libzf... Message-ID: <201003022353.o22NrdQo080734@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Tue Mar 2 23:53:38 2010 New Revision: 204610 URL: http://svn.freebsd.org/changeset/base/204610 Log: Merge from current. Added: user/jmallett/octeon/contrib/dtc/ - copied from r204608, head/contrib/dtc/ user/jmallett/octeon/gnu/usr.bin/dtc/ - copied from r204608, head/gnu/usr.bin/dtc/ user/jmallett/octeon/lib/libalias/Makefile.inc - copied unchanged from r204608, head/lib/libalias/Makefile.inc user/jmallett/octeon/sys/contrib/libfdt/ - copied from r204608, head/sys/contrib/libfdt/ user/jmallett/octeon/sys/kern/kern_gzio.c - copied unchanged from r204608, head/sys/kern/kern_gzio.c user/jmallett/octeon/sys/net/netisr_internal.h - copied unchanged from r204608, head/sys/net/netisr_internal.h user/jmallett/octeon/sys/net/zutil.h - copied unchanged from r204608, head/sys/net/zutil.h user/jmallett/octeon/sys/netinet/ipfw/dn_heap.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_heap.c user/jmallett/octeon/sys/netinet/ipfw/dn_heap.h - copied unchanged from r204608, head/sys/netinet/ipfw/dn_heap.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched.h - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched_fifo.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_fifo.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_qfq.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_qfq.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_rr.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_rr.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_wf2q.c - copied unchanged from r204608, head/sys/netinet/ipfw/dn_sched_wf2q.c user/jmallett/octeon/sys/netinet/ipfw/dummynet.txt - copied unchanged from r204608, head/sys/netinet/ipfw/dummynet.txt user/jmallett/octeon/sys/netinet/ipfw/ip_dn_glue.c - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_glue.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_io.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h - copied unchanged from r204608, head/sys/netinet/ipfw/ip_dn_private.h user/jmallett/octeon/sys/netinet/ipfw/test/ - copied from r204608, head/sys/netinet/ipfw/test/ user/jmallett/octeon/usr.bin/csup/README - copied unchanged from r204608, head/usr.bin/csup/README user/jmallett/octeon/usr.bin/csup/TODO - copied unchanged from r204608, head/usr.bin/csup/TODO user/jmallett/octeon/usr.bin/csup/attrstack.c - copied unchanged from r204608, head/usr.bin/csup/attrstack.c user/jmallett/octeon/usr.bin/csup/attrstack.h - copied unchanged from r204608, head/usr.bin/csup/attrstack.h user/jmallett/octeon/usr.bin/csup/auth.c - copied unchanged from r204608, head/usr.bin/csup/auth.c user/jmallett/octeon/usr.bin/csup/auth.h - copied unchanged from r204608, head/usr.bin/csup/auth.h user/jmallett/octeon/usr.bin/csup/config.c - copied unchanged from r204608, head/usr.bin/csup/config.c user/jmallett/octeon/usr.bin/csup/config.h - copied unchanged from r204608, head/usr.bin/csup/config.h user/jmallett/octeon/usr.bin/csup/cpasswd.1 - copied unchanged from r204608, head/usr.bin/csup/cpasswd.1 user/jmallett/octeon/usr.bin/csup/cpasswd.sh - copied unchanged from r204608, head/usr.bin/csup/cpasswd.sh user/jmallett/octeon/usr.bin/csup/csup.1 - copied unchanged from r204608, head/usr.bin/csup/csup.1 user/jmallett/octeon/usr.bin/csup/detailer.c - copied unchanged from r204608, head/usr.bin/csup/detailer.c user/jmallett/octeon/usr.bin/csup/detailer.h - copied unchanged from r204608, head/usr.bin/csup/detailer.h user/jmallett/octeon/usr.bin/csup/diff.c - copied unchanged from r204608, head/usr.bin/csup/diff.c user/jmallett/octeon/usr.bin/csup/diff.h - copied unchanged from r204608, head/usr.bin/csup/diff.h user/jmallett/octeon/usr.bin/csup/fattr.c - copied unchanged from r204608, head/usr.bin/csup/fattr.c user/jmallett/octeon/usr.bin/csup/fattr.h - copied unchanged from r204608, head/usr.bin/csup/fattr.h user/jmallett/octeon/usr.bin/csup/fattr_bsd.h - copied unchanged from r204608, head/usr.bin/csup/fattr_bsd.h user/jmallett/octeon/usr.bin/csup/fattr_posix.h - copied unchanged from r204608, head/usr.bin/csup/fattr_posix.h user/jmallett/octeon/usr.bin/csup/fixups.c - copied unchanged from r204608, head/usr.bin/csup/fixups.c user/jmallett/octeon/usr.bin/csup/fixups.h - copied unchanged from r204608, head/usr.bin/csup/fixups.h user/jmallett/octeon/usr.bin/csup/fnmatch.c - copied unchanged from r204608, head/usr.bin/csup/fnmatch.c user/jmallett/octeon/usr.bin/csup/fnmatch.h - copied unchanged from r204608, head/usr.bin/csup/fnmatch.h user/jmallett/octeon/usr.bin/csup/globtree.c - copied unchanged from r204608, head/usr.bin/csup/globtree.c user/jmallett/octeon/usr.bin/csup/globtree.h - copied unchanged from r204608, head/usr.bin/csup/globtree.h user/jmallett/octeon/usr.bin/csup/idcache.c - copied unchanged from r204608, head/usr.bin/csup/idcache.c user/jmallett/octeon/usr.bin/csup/idcache.h - copied unchanged from r204608, head/usr.bin/csup/idcache.h user/jmallett/octeon/usr.bin/csup/keyword.c - copied unchanged from r204608, head/usr.bin/csup/keyword.c user/jmallett/octeon/usr.bin/csup/keyword.h - copied unchanged from r204608, head/usr.bin/csup/keyword.h user/jmallett/octeon/usr.bin/csup/lex.rcs.c - copied unchanged from r204608, head/usr.bin/csup/lex.rcs.c user/jmallett/octeon/usr.bin/csup/lister.c - copied unchanged from r204608, head/usr.bin/csup/lister.c user/jmallett/octeon/usr.bin/csup/lister.h - copied unchanged from r204608, head/usr.bin/csup/lister.h user/jmallett/octeon/usr.bin/csup/main.c - copied unchanged from r204608, head/usr.bin/csup/main.c user/jmallett/octeon/usr.bin/csup/main.h - copied unchanged from r204608, head/usr.bin/csup/main.h user/jmallett/octeon/usr.bin/csup/misc.c - copied unchanged from r204608, head/usr.bin/csup/misc.c user/jmallett/octeon/usr.bin/csup/misc.h - copied unchanged from r204608, head/usr.bin/csup/misc.h user/jmallett/octeon/usr.bin/csup/mux.c - copied unchanged from r204608, head/usr.bin/csup/mux.c user/jmallett/octeon/usr.bin/csup/mux.h - copied unchanged from r204608, head/usr.bin/csup/mux.h user/jmallett/octeon/usr.bin/csup/parse.y - copied unchanged from r204608, head/usr.bin/csup/parse.y user/jmallett/octeon/usr.bin/csup/pathcomp.c - copied unchanged from r204608, head/usr.bin/csup/pathcomp.c user/jmallett/octeon/usr.bin/csup/pathcomp.h - copied unchanged from r204608, head/usr.bin/csup/pathcomp.h user/jmallett/octeon/usr.bin/csup/proto.c - copied unchanged from r204608, head/usr.bin/csup/proto.c user/jmallett/octeon/usr.bin/csup/proto.h - copied unchanged from r204608, head/usr.bin/csup/proto.h user/jmallett/octeon/usr.bin/csup/queue.h - copied unchanged from r204608, head/usr.bin/csup/queue.h user/jmallett/octeon/usr.bin/csup/rcsfile.c - copied unchanged from r204608, head/usr.bin/csup/rcsfile.c user/jmallett/octeon/usr.bin/csup/rcsfile.h - copied unchanged from r204608, head/usr.bin/csup/rcsfile.h user/jmallett/octeon/usr.bin/csup/rcsparse.c - copied unchanged from r204608, head/usr.bin/csup/rcsparse.c user/jmallett/octeon/usr.bin/csup/rcsparse.h - copied unchanged from r204608, head/usr.bin/csup/rcsparse.h user/jmallett/octeon/usr.bin/csup/rcstokenizer.h - copied unchanged from r204608, head/usr.bin/csup/rcstokenizer.h user/jmallett/octeon/usr.bin/csup/rcstokenizer.l - copied unchanged from r204608, head/usr.bin/csup/rcstokenizer.l user/jmallett/octeon/usr.bin/csup/rsyncfile.c - copied unchanged from r204608, head/usr.bin/csup/rsyncfile.c user/jmallett/octeon/usr.bin/csup/rsyncfile.h - copied unchanged from r204608, head/usr.bin/csup/rsyncfile.h user/jmallett/octeon/usr.bin/csup/status.c - copied unchanged from r204608, head/usr.bin/csup/status.c user/jmallett/octeon/usr.bin/csup/status.h - copied unchanged from r204608, head/usr.bin/csup/status.h user/jmallett/octeon/usr.bin/csup/stream.c - copied unchanged from r204608, head/usr.bin/csup/stream.c user/jmallett/octeon/usr.bin/csup/stream.h - copied unchanged from r204608, head/usr.bin/csup/stream.h user/jmallett/octeon/usr.bin/csup/threads.c - copied unchanged from r204608, head/usr.bin/csup/threads.c user/jmallett/octeon/usr.bin/csup/threads.h - copied unchanged from r204608, head/usr.bin/csup/threads.h user/jmallett/octeon/usr.bin/csup/token.h - copied unchanged from r204608, head/usr.bin/csup/token.h user/jmallett/octeon/usr.bin/csup/token.l - copied unchanged from r204608, head/usr.bin/csup/token.l user/jmallett/octeon/usr.bin/csup/updater.c - copied unchanged from r204608, head/usr.bin/csup/updater.c user/jmallett/octeon/usr.bin/csup/updater.h - copied unchanged from r204608, head/usr.bin/csup/updater.h Replaced: user/jmallett/octeon/usr.bin/csup/Makefile - copied unchanged from r204608, head/usr.bin/csup/Makefile Deleted: user/jmallett/octeon/contrib/csup/ user/jmallett/octeon/sys/ia64/include/sapicreg.h user/jmallett/octeon/sys/ia64/include/sapicvar.h Modified: user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/bin/pkill/pkill.1 user/jmallett/octeon/bin/pkill/pkill.c user/jmallett/octeon/cddl/Makefile.inc user/jmallett/octeon/cddl/lib/drti/Makefile user/jmallett/octeon/cddl/lib/libavl/Makefile user/jmallett/octeon/cddl/lib/libctf/Makefile user/jmallett/octeon/cddl/lib/libdtrace/Makefile user/jmallett/octeon/cddl/lib/libnvpair/Makefile user/jmallett/octeon/cddl/lib/libumem/Makefile user/jmallett/octeon/cddl/lib/libuutil/Makefile user/jmallett/octeon/cddl/lib/libzfs/Makefile user/jmallett/octeon/cddl/lib/libzpool/Makefile user/jmallett/octeon/cddl/sbin/zfs/Makefile user/jmallett/octeon/cddl/sbin/zpool/Makefile user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile user/jmallett/octeon/cddl/usr.bin/zinject/Makefile user/jmallett/octeon/cddl/usr.bin/ztest/Makefile user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile user/jmallett/octeon/contrib/tzdata/southamerica user/jmallett/octeon/etc/mtree/BSD.usr.dist user/jmallett/octeon/etc/rc.d/rtsold user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh user/jmallett/octeon/lib/libalias/libalias/Makefile user/jmallett/octeon/lib/libarchive/test/Makefile user/jmallett/octeon/lib/libbsnmp/Makefile.inc user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile user/jmallett/octeon/lib/libc/arm/gen/makecontext.c user/jmallett/octeon/lib/libc/arm/string/bzero.S user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S user/jmallett/octeon/lib/libc/arm/string/memmove.S user/jmallett/octeon/lib/libc/gen/fmtcheck.3 user/jmallett/octeon/lib/libc/gen/stringlist.3 user/jmallett/octeon/lib/libc/include/reentrant.h user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c user/jmallett/octeon/lib/libc/stdio/mktemp.c user/jmallett/octeon/lib/libc/stdlib/malloc.c user/jmallett/octeon/lib/libc/stdlib/rb.h user/jmallett/octeon/lib/libc/sys/mlockall.2 user/jmallett/octeon/lib/libc/sys/ntp_adjtime.2 user/jmallett/octeon/lib/libc/sys/utrace.2 user/jmallett/octeon/lib/libedit/editline.3 user/jmallett/octeon/lib/libedit/editrc.5 user/jmallett/octeon/lib/libedit/read.h user/jmallett/octeon/lib/libkvm/Makefile user/jmallett/octeon/lib/libkvm/kvm.c user/jmallett/octeon/lib/libkvm/kvm.h user/jmallett/octeon/lib/libkvm/kvm_getpcpu.3 user/jmallett/octeon/lib/libkvm/kvm_pcpu.c user/jmallett/octeon/lib/libkvm/kvm_private.h user/jmallett/octeon/lib/libkvm/kvm_vnet.c user/jmallett/octeon/lib/libpam/Makefile.inc user/jmallett/octeon/lib/libpam/modules/Makefile.inc user/jmallett/octeon/lib/libpam/modules/pam_krb5/Makefile user/jmallett/octeon/lib/libutil/humanize_number.3 user/jmallett/octeon/sbin/ddb/Makefile user/jmallett/octeon/sbin/hastctl/Makefile user/jmallett/octeon/sbin/hastd/Makefile user/jmallett/octeon/sbin/ipf/ipftest/Makefile user/jmallett/octeon/sbin/ipfw/Makefile user/jmallett/octeon/sbin/ipfw/altq.c user/jmallett/octeon/sbin/ipfw/dummynet.c user/jmallett/octeon/sbin/ipfw/ipfw.8 user/jmallett/octeon/sbin/ipfw/ipfw2.c user/jmallett/octeon/sbin/ipfw/ipfw2.h user/jmallett/octeon/sbin/ipfw/main.c user/jmallett/octeon/sbin/mount_hpfs/Makefile user/jmallett/octeon/sbin/mount_hpfs/mount_hpfs.c user/jmallett/octeon/sbin/mount_ntfs/Makefile user/jmallett/octeon/sbin/mount_ntfs/mount_ntfs.c user/jmallett/octeon/sbin/route/Makefile user/jmallett/octeon/sbin/route/route.c user/jmallett/octeon/sbin/routed/Makefile user/jmallett/octeon/sbin/routed/if.c user/jmallett/octeon/sbin/routed/rtquery/Makefile user/jmallett/octeon/sbin/rtsol/Makefile user/jmallett/octeon/share/examples/autofs/driver/Makefile user/jmallett/octeon/share/man/man4/ahci.4 user/jmallett/octeon/share/man/man4/ehci.4 user/jmallett/octeon/share/man/man4/gem.4 user/jmallett/octeon/share/man/man4/gre.4 user/jmallett/octeon/share/man/man4/hme.4 user/jmallett/octeon/share/man/man4/man4.sparc64/sbus.4 user/jmallett/octeon/share/man/man4/msk.4 user/jmallett/octeon/share/man/man4/ng_ipfw.4 user/jmallett/octeon/share/man/man4/siis.4 user/jmallett/octeon/share/man/man4/snd_uaudio.4 user/jmallett/octeon/share/man/man4/stge.4 user/jmallett/octeon/share/man/man4/ubsa.4 user/jmallett/octeon/share/man/man4/ucom.4 user/jmallett/octeon/share/man/man4/uftdi.4 user/jmallett/octeon/share/man/man4/ugen.4 user/jmallett/octeon/share/man/man4/uhid.4 user/jmallett/octeon/share/man/man4/ulpt.4 user/jmallett/octeon/share/man/man4/umodem.4 user/jmallett/octeon/share/man/man4/uplcom.4 user/jmallett/octeon/share/man/man4/uvisor.4 user/jmallett/octeon/share/man/man4/uvscom.4 user/jmallett/octeon/share/man/man5/core.5 user/jmallett/octeon/share/man/man9/BUF_ISLOCKED.9 user/jmallett/octeon/share/man/man9/BUF_RECURSED.9 user/jmallett/octeon/share/man/man9/DEVICE_PROBE.9 user/jmallett/octeon/share/man/man9/VOP_LOCK.9 user/jmallett/octeon/share/man/man9/devfs_set_cdevpriv.9 user/jmallett/octeon/share/man/man9/driver.9 user/jmallett/octeon/share/man/man9/kernacc.9 user/jmallett/octeon/share/man/man9/malloc.9 user/jmallett/octeon/share/man/man9/mi_switch.9 user/jmallett/octeon/share/man/man9/physio.9 user/jmallett/octeon/share/man/man9/psignal.9 user/jmallett/octeon/share/man/man9/timeout.9 user/jmallett/octeon/share/man/man9/vm_page_alloc.9 user/jmallett/octeon/share/man/man9/vslock.9 user/jmallett/octeon/share/mk/bsd.cpu.mk user/jmallett/octeon/sys/amd64/amd64/mca.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/arm/at91/if_ate.c user/jmallett/octeon/sys/compat/linux/linux_getcwd.c user/jmallett/octeon/sys/compat/linux/linux_time.c user/jmallett/octeon/sys/conf/NOTES user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/conf/options user/jmallett/octeon/sys/dev/ata/ata-pci.h user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212.h user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/cm/if_cm_isa.c user/jmallett/octeon/sys/dev/cm/smc90cx6.c user/jmallett/octeon/sys/dev/cm/smc90cx6reg.h user/jmallett/octeon/sys/dev/cm/smc90cx6var.h user/jmallett/octeon/sys/dev/isp/isp.c user/jmallett/octeon/sys/dev/isp/isp_freebsd.c user/jmallett/octeon/sys/dev/isp/isp_library.c user/jmallett/octeon/sys/dev/isp/isp_library.h user/jmallett/octeon/sys/dev/isp/isp_pci.c user/jmallett/octeon/sys/dev/isp/isp_target.c user/jmallett/octeon/sys/dev/isp/ispmbox.h user/jmallett/octeon/sys/dev/isp/ispreg.h user/jmallett/octeon/sys/dev/md/md.c user/jmallett/octeon/sys/dev/mfi/mfi_cam.c user/jmallett/octeon/sys/dev/mfi/mfi_pci.c user/jmallett/octeon/sys/dev/msk/if_msk.c user/jmallett/octeon/sys/dev/msk/if_mskreg.h user/jmallett/octeon/sys/dev/ofw/ofw_pci.h user/jmallett/octeon/sys/dev/stge/if_stge.c user/jmallett/octeon/sys/dev/stge/if_stgereg.h user/jmallett/octeon/sys/dev/uart/uart_bus_pci.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_denode.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_fat.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_fileno.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_lookup.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vfsops.c user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vnops.c user/jmallett/octeon/sys/fs/msdosfs/msdosfsmount.h user/jmallett/octeon/sys/i386/i386/mca.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/ia64/ia64/interrupt.c user/jmallett/octeon/sys/ia64/ia64/nexus.c user/jmallett/octeon/sys/ia64/ia64/sapic.c user/jmallett/octeon/sys/ia64/include/intr.h user/jmallett/octeon/sys/kern/imgact_elf.c user/jmallett/octeon/sys/kern/kern_conf.c user/jmallett/octeon/sys/kern/kern_proc.c user/jmallett/octeon/sys/kern/kern_sig.c user/jmallett/octeon/sys/kern/kern_thr.c user/jmallett/octeon/sys/kern/subr_param.c user/jmallett/octeon/sys/kern/vfs_syscalls.c user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/include/bus.h user/jmallett/octeon/sys/mips/include/cdefs.h user/jmallett/octeon/sys/mips/include/ucontext.h user/jmallett/octeon/sys/mips/rmi/files.xlr user/jmallett/octeon/sys/mips/rmi/iodi.c user/jmallett/octeon/sys/mips/rmi/xlr_pci.c user/jmallett/octeon/sys/mips/rmi/xls_ehci.c user/jmallett/octeon/sys/modules/ath/Makefile user/jmallett/octeon/sys/net/if_bridge.c user/jmallett/octeon/sys/net/if_ethersubr.c user/jmallett/octeon/sys/net/if_gre.c user/jmallett/octeon/sys/net/if_gre.h user/jmallett/octeon/sys/net/if_tap.c user/jmallett/octeon/sys/net/if_tun.c user/jmallett/octeon/sys/net/netisr.c user/jmallett/octeon/sys/net/netisr.h user/jmallett/octeon/sys/net/radix.c user/jmallett/octeon/sys/net/zlib.h user/jmallett/octeon/sys/netinet/ip_dummynet.h user/jmallett/octeon/sys/netinet/ip_fw.h user/jmallett/octeon/sys/netinet/ip_gre.c user/jmallett/octeon/sys/netinet/ip_gre.h user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_pfil.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_fw_sockopt.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_table.c user/jmallett/octeon/sys/netinet6/nd6.c user/jmallett/octeon/sys/security/mac_biba/mac_biba.c user/jmallett/octeon/sys/security/mac_lomac/mac_lomac.c user/jmallett/octeon/sys/security/mac_mls/mac_mls.c user/jmallett/octeon/sys/sys/eventhandler.h user/jmallett/octeon/sys/sys/imgact.h user/jmallett/octeon/sys/sys/imgact_aout.h user/jmallett/octeon/sys/sys/imgact_elf.h user/jmallett/octeon/sys/sys/sysent.h user/jmallett/octeon/sys/sys/systm.h user/jmallett/octeon/sys/vm/vm_page.c user/jmallett/octeon/tools/build/mk/OptionalObsoleteFiles.inc user/jmallett/octeon/tools/regression/kqueue/Makefile user/jmallett/octeon/tools/regression/priv/Makefile user/jmallett/octeon/tools/regression/sockets/unix_gc/Makefile user/jmallett/octeon/tools/regression/sockets/unix_sorflush/Makefile user/jmallett/octeon/tools/regression/sysvsem/semtest.c user/jmallett/octeon/tools/regression/tmpfs/Makefile user/jmallett/octeon/tools/regression/tmpfs/h_funcs.subr user/jmallett/octeon/tools/regression/tmpfs/h_tools.c user/jmallett/octeon/tools/regression/tmpfs/t_create user/jmallett/octeon/tools/regression/tmpfs/t_dots user/jmallett/octeon/tools/regression/tmpfs/t_exec user/jmallett/octeon/tools/regression/tmpfs/t_link user/jmallett/octeon/tools/regression/tmpfs/t_mkdir user/jmallett/octeon/tools/regression/tmpfs/t_mount user/jmallett/octeon/tools/regression/tmpfs/t_pipes user/jmallett/octeon/tools/regression/tmpfs/t_read_write user/jmallett/octeon/tools/regression/tmpfs/t_readdir user/jmallett/octeon/tools/regression/tmpfs/t_remove user/jmallett/octeon/tools/regression/tmpfs/t_rename user/jmallett/octeon/tools/regression/tmpfs/t_rmdir user/jmallett/octeon/tools/regression/tmpfs/t_setattr user/jmallett/octeon/tools/regression/tmpfs/t_sizes user/jmallett/octeon/tools/regression/tmpfs/t_sockets user/jmallett/octeon/tools/regression/tmpfs/t_statvfs user/jmallett/octeon/tools/regression/tmpfs/t_symlink user/jmallett/octeon/tools/regression/tmpfs/t_times user/jmallett/octeon/tools/regression/tmpfs/t_trail_slash user/jmallett/octeon/tools/regression/tmpfs/t_truncate user/jmallett/octeon/tools/regression/tmpfs/t_vnd user/jmallett/octeon/tools/regression/tmpfs/t_vnode_leak user/jmallett/octeon/tools/tools/netrate/http/Makefile user/jmallett/octeon/tools/tools/netrate/httpd/Makefile user/jmallett/octeon/tools/tools/netrate/juggle/Makefile user/jmallett/octeon/tools/tools/netrate/tcpconnect/Makefile user/jmallett/octeon/tools/tools/netrate/tcpp/Makefile user/jmallett/octeon/tools/tools/netrate/tcpreceive/Makefile user/jmallett/octeon/tools/tools/umastat/Makefile user/jmallett/octeon/usr.bin/locale/Makefile user/jmallett/octeon/usr.bin/netstat/main.c user/jmallett/octeon/usr.bin/netstat/netisr.c user/jmallett/octeon/usr.bin/netstat/netstat.h user/jmallett/octeon/usr.sbin/bluetooth/bthidd/Makefile user/jmallett/octeon/usr.sbin/bsnmpd/modules/Makefile.inc user/jmallett/octeon/usr.sbin/fwcontrol/Makefile user/jmallett/octeon/usr.sbin/rtsold/Makefile user/jmallett/octeon/usr.sbin/rtsold/dump.c user/jmallett/octeon/usr.sbin/rtsold/if.c user/jmallett/octeon/usr.sbin/rtsold/rtsock.c user/jmallett/octeon/usr.sbin/rtsold/rtsol.c user/jmallett/octeon/usr.sbin/rtsold/rtsold.c user/jmallett/octeon/usr.sbin/rtsold/rtsold.h user/jmallett/octeon/usr.sbin/uhsoctl/Makefile Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 2 23:53:38 2010 (r204610) @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h> +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/machine/sapicreg.h +OLD_FILES+=usr/include/machine/sapicvar.h +.endif +# 20100208: man pages moved +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz +OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz +OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz +OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz +OLD_FILES+=usr/share/man/man4/i386/scd.4.gz +OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz +.endif # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd OLD_FILES+=usr/share/doc/papers/bc.ascii.gz OLD_FILES+=usr/share/doc/papers/dc.ascii.gz Modified: user/jmallett/octeon/bin/pkill/pkill.1 ============================================================================== --- user/jmallett/octeon/bin/pkill/pkill.1 Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/bin/pkill/pkill.1 Tue Mar 2 23:53:38 2010 (r204610) @@ -16,13 +16,6 @@ .\" 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 NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/bin/pkill/pkill.c ============================================================================== --- user/jmallett/octeon/bin/pkill/pkill.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/bin/pkill/pkill.c Tue Mar 2 23:53:38 2010 (r204610) @@ -16,13 +16,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/cddl/Makefile.inc ============================================================================== --- user/jmallett/octeon/cddl/Makefile.inc Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/Makefile.inc Tue Mar 2 23:53:38 2010 (r204610) @@ -7,4 +7,5 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN +WARNS?= 6 CSTD?= gnu89 Modified: user/jmallett/octeon/cddl/lib/drti/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/drti/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/drti/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,8 +1,6 @@ # $FreeBSD$ -.include "../../Makefile.inc" - -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} @@ -10,7 +8,6 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR}/dtrace -WARNS?= 6 CLEANFILES= ${FILES} CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libavl/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libavl/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libavl/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -4,6 +4,7 @@ LIB= avl SRCS= avl.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/jmallett/octeon/cddl/lib/libctf/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libctf/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libctf/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,10 +1,10 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf LIB= ctf -SHLIB_MAJOR= 2 - SRCS= ctf_create.c \ ctf_decl.c \ ctf_error.c \ @@ -17,10 +17,7 @@ SRCS= ctf_create.c \ ctf_types.c \ ctf_util.c -.PATH: ${OPENSOLARIS_USR_DISTDIR}/common/ctf -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf - +WARNS?= 0 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libdtrace/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libdtrace/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libdtrace/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,12 +1,9 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common LIB= dtrace -SHLIB_MAJOR= 2 - -WARNS= 1 - SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ @@ -51,8 +48,7 @@ DSRCS= errno.d \ signal.d \ unistd.d -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common +WARNS?= 1 CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ Modified: user/jmallett/octeon/cddl/lib/libnvpair/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libnvpair/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libnvpair/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -10,6 +10,7 @@ SRCS= libnvpair.c \ nvpair_alloc_fixed.c \ nvpair.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common Modified: user/jmallett/octeon/cddl/lib/libumem/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libumem/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libumem/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -4,6 +4,7 @@ LIB= umem SRCS= umem.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include <bsd.lib.mk> Modified: user/jmallett/octeon/cddl/lib/libuutil/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libuutil/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libuutil/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -15,6 +15,7 @@ SRCS= avl.c \ uu_pname.c \ uu_strtoint.c +WARNS?= 0 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris Modified: user/jmallett/octeon/cddl/lib/libzfs/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libzfs/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libzfs/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -32,6 +32,7 @@ SRCS+= zfs_deleg.c \ libzfs_sendrecv.c \ libzfs_status.c +WARNS?= 0 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem Modified: user/jmallett/octeon/cddl/lib/libzpool/Makefile ============================================================================== --- user/jmallett/octeon/cddl/lib/libzpool/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/lib/libzpool/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -33,6 +33,7 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/sbin/zfs/Makefile ============================================================================== --- user/jmallett/octeon/cddl/sbin/zfs/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/sbin/zfs/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,7 @@ PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/sbin/zpool/Makefile ============================================================================== --- user/jmallett/octeon/cddl/sbin/zpool/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/sbin/zpool/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -7,6 +7,7 @@ PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfconvert/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,13 +1,12 @@ # $FreeBSD$ -.include <bsd.own.mk> - -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt DEBUG_FLAGS= -g PROG= ctfconvert - +NO_MAN= SRCS= alist.c \ ctf.c \ ctfconvert.c \ @@ -29,8 +28,6 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ @@ -43,10 +40,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${.CURDIR} -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include <bsd.prog.mk> Modified: user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfdump/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,15 +1,14 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump PROG= ctfdump - +NO_MAN= SRCS= dump.c \ symbol.c \ utils.c -WARNS?= 6 - CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ @@ -22,9 +21,4 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} LDADD= -lpthread -lelf -lz -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump - -NO_MAN= - .include <bsd.prog.mk> Modified: user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ctfmerge/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,13 +1,10 @@ # $FreeBSD$ -.include <bsd.own.mk> - -.include "../../Makefile.inc" - -WARNS= 1 +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt PROG= ctfmerge - +NO_MAN= SRCS= alist.c \ barrier.c \ ctf.c \ @@ -26,7 +23,7 @@ SRCS= alist.c \ traverse.c \ util.c -WARNS?= 6 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -40,9 +37,4 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} LDADD= -lctf -ldwarf -lelf -lz -lpthread -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt - -MK_MAN= no - .include <bsd.prog.mk> Modified: user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/sgsmsg/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,20 +1,17 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl # This program is required as a bootstrap tool for 'make buildworld' PROG= sgsmsg - +NO_MAN= SRCS= avl.c sgsmsg.c string_table.c findprime.c +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl - -NO_MAN= - .include <bsd.prog.mk> Modified: user/jmallett/octeon/cddl/usr.bin/zinject/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/zinject/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/zinject/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,7 @@ PROG= zinject SRCS= zinject.c translate.c NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.bin/ztest/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.bin/ztest/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.bin/ztest/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -5,6 +5,7 @@ PROG= ztest NO_MAN= +WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem Modified: user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/dtrace/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,14 +1,12 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace PROG= dtrace - -BINDIR?= /usr/sbin - SRCS= dtrace.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -18,8 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace - # Optional debugging stuff... #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d Modified: user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/lockstat/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -1,14 +1,13 @@ # $FreeBSD$ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat PROG= lockstat - -BINDIR?= /usr/sbin - +NO_MAN= SRCS= lockstat.c sym.c +BINDIR?= /usr/sbin -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ @@ -19,8 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_SYS_DISTDIR}/compat \ -I${.CURDIR}/../../../sys -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat - CFLAGS+= -DNEED_ERRLOC -g #YFLAGS+= -d @@ -28,6 +25,4 @@ CFLAGS+= -DNEED_ERRLOC -g DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -NO_MAN= - .include <bsd.prog.mk> Modified: user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/cddl/usr.sbin/zdb/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -6,6 +6,9 @@ PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c +WARNS?= 0 +CSTD= c99 + CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -23,6 +26,5 @@ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LI ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool -CSTD= c99 .include <bsd.prog.mk> Modified: user/jmallett/octeon/contrib/tzdata/southamerica ============================================================================== --- user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/contrib/tzdata/southamerica Tue Mar 2 23:53:38 2010 (r204610) @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.40 +# @(#)southamerica 8.41 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1364,8 +1364,24 @@ Rule Para 2002 2003 - Sep Sun>=1 0:00 1: # Decree 1,867 (2004-03-05) # From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13) # <http://www.presidencia.gov.py/decretos/D1867.pdf> -Rule Para 2004 max - Oct Sun>=15 0:00 1:00 S -Rule Para 2005 max - Mar Sun>=8 0:00 0 - +Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 S +Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - +# From Carlos Raul Perasso (2010-02-18): +# By decree number 3958 issued yesterday ( +# <a href="http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf"> +# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf +# </a> +# ) +# Paraguay changes its DST schedule, postponing the March rule to April and +# modifying the October date. The decree reads: +# ... +# Art. 1. It is hereby established that from the second Sunday of the month of +# April of this year (2010), the official time is to be set back 60 minutes, +# and that on the first Sunday of the month of October, it is to be set +# forward 60 minutes, in all the territory of the Paraguayan Republic. +# ... +Rule Para 2010 max - Oct Sun<=7 0:00 1:00 S +Rule Para 2010 max - Apr Sun>=8 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Asuncion -3:50:40 - LMT 1890 Modified: user/jmallett/octeon/etc/mtree/BSD.usr.dist ============================================================================== --- user/jmallett/octeon/etc/mtree/BSD.usr.dist Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/etc/mtree/BSD.usr.dist Tue Mar 2 23:53:38 2010 (r204610) @@ -193,8 +193,6 @@ .. IPv6 .. - bc - .. bootforth .. cvs Modified: user/jmallett/octeon/etc/rc.d/rtsold ============================================================================== --- user/jmallett/octeon/etc/rc.d/rtsold Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/etc/rc.d/rtsold Tue Mar 2 23:53:38 2010 (r204610) @@ -6,7 +6,7 @@ # PROVIDE: rtsold # REQUIRE: netif # BEFORE: NETWORKING -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips ============================================================================== --- user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.mips Tue Mar 2 23:53:38 2010 (r204610) @@ -10,9 +10,8 @@ NATIVE_EMULATION=elf${_sz}btsmipn32_fbsd NATIVE_EMULATION=elf${_sz}ltsmipn32_fbsd .endif -MIPS_ABIS+=elf32btsmip_fbsd elf32ltsmip_fbsd -MIPS_ABIS+=elf32btsmipn32_fbsd elf32ltsmipn32_fbsd -MIPS_ABIS+=elf64btsmip_fbsd elf64ltsmip_fbsd +MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \ + elf32btsmipn32_fbsd elf32ltsmipn32_fbsd .for abi in ${MIPS_ABIS} #.if (${abi} != ${NATIVE_EMULATION}) EMS+= ${abi} Modified: user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh ============================================================================== --- user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/gnu/usr.bin/binutils/ld/genscripts.sh Tue Mar 2 23:53:38 2010 (r204610) @@ -50,6 +50,7 @@ fi if test -d ldscripts; then true else + rm -f ldscripts mkdir ldscripts fi Copied: user/jmallett/octeon/lib/libalias/Makefile.inc (from r204608, head/lib/libalias/Makefile.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/lib/libalias/Makefile.inc Tue Mar 2 23:53:38 2010 (r204610, copy of r204608, head/lib/libalias/Makefile.inc) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Modified: user/jmallett/octeon/lib/libalias/libalias/Makefile ============================================================================== --- user/jmallett/octeon/lib/libalias/libalias/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libalias/libalias/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -8,7 +8,6 @@ SHLIB_MAJOR= 7 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h -WARNS?= 6 NO_WERROR= .include <bsd.lib.mk> Modified: user/jmallett/octeon/lib/libarchive/test/Makefile ============================================================================== --- user/jmallett/octeon/lib/libarchive/test/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libarchive/test/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -137,7 +137,6 @@ CFLAGS+= -I${LA_SRCDIR} -I. # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -#WARNS=6 # Build libarchive_test and run it. check test: libarchive_test Modified: user/jmallett/octeon/lib/libbsnmp/Makefile.inc ============================================================================== --- user/jmallett/octeon/lib/libbsnmp/Makefile.inc Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libbsnmp/Makefile.inc Tue Mar 2 23:53:38 2010 (r204610) @@ -1,6 +1,6 @@ # $FreeBSD$ -SHLIB_MAJOR= 5 -WARNS?= 6 NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp + +.include "../Makefile.inc" Modified: user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile ============================================================================== --- user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libbsnmp/libbsnmp/Makefile Tue Mar 2 23:53:38 2010 (r204610) @@ -5,9 +5,8 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib .PATH: ${CONTRIB} -LIB = bsnmp -SHLIBDIR ?= /lib -WARNS ?= 6 +LIB= bsnmp +SHLIBDIR?= /lib CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' Modified: user/jmallett/octeon/lib/libc/arm/gen/makecontext.c ============================================================================== --- user/jmallett/octeon/lib/libc/arm/gen/makecontext.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/arm/gen/makecontext.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/arm/string/bzero.S ============================================================================== --- user/jmallett/octeon/lib/libc/arm/string/bzero.S Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/arm/string/bzero.S Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S ============================================================================== --- user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/arm/string/memcpy_arm.S Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/arm/string/memmove.S ============================================================================== --- user/jmallett/octeon/lib/libc/arm/string/memmove.S Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/arm/string/memmove.S Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/gen/fmtcheck.3 ============================================================================== --- user/jmallett/octeon/lib/libc/gen/fmtcheck.3 Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/gen/fmtcheck.3 Tue Mar 2 23:53:38 2010 (r204610) @@ -11,13 +11,6 @@ .\" 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 NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/gen/stringlist.3 ============================================================================== --- user/jmallett/octeon/lib/libc/gen/stringlist.3 Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/gen/stringlist.3 Tue Mar 2 23:53:38 2010 (r204610) @@ -13,13 +13,6 @@ .\" 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 NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/include/reentrant.h ============================================================================== --- user/jmallett/octeon/lib/libc/include/reentrant.h Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/include/reentrant.h Tue Mar 2 23:53:38 2010 (r204610) @@ -13,13 +13,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c ============================================================================== --- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetmask.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c ============================================================================== --- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetround.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c ============================================================================== --- user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/powerpc/gen/fpgetsticky.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c ============================================================================== --- user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/powerpc/gen/fpsetmask.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c ============================================================================== --- user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/powerpc/gen/fpsetround.c Tue Mar 2 23:53:38 2010 (r204610) @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/jmallett/octeon/lib/libc/stdio/mktemp.c ============================================================================== --- user/jmallett/octeon/lib/libc/stdio/mktemp.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/stdio/mktemp.c Tue Mar 2 23:53:38 2010 (r204610) @@ -116,6 +116,10 @@ _gettemp(path, doopen, domkdir, slen) for (trv = path; *trv != '\0'; ++trv) ; + if (trv - path >= MAXPATHLEN) { + errno = ENAMETOOLONG; + return (0); + } trv -= slen; suffp = trv; --trv; Modified: user/jmallett/octeon/lib/libc/stdlib/malloc.c ============================================================================== --- user/jmallett/octeon/lib/libc/stdlib/malloc.c Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/stdlib/malloc.c Tue Mar 2 23:53:38 2010 (r204610) @@ -194,6 +194,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" +#define RB_COMPACT #include "rb.h" #if (defined(MALLOC_TCACHE) && defined(MALLOC_STATS)) #include "qr.h" @@ -1746,7 +1747,7 @@ extent_szad_comp(extent_node_t *a, exten } /* Wrap red-black tree macros in functions. */ -rb_wrap(__unused static, extent_tree_szad_, extent_tree_t, extent_node_t, +rb_gen(__unused static, extent_tree_szad_, extent_tree_t, extent_node_t, link_szad, extent_szad_comp) #endif @@ -1760,7 +1761,7 @@ extent_ad_comp(extent_node_t *a, extent_ } /* Wrap red-black tree macros in functions. */ -rb_wrap(__unused static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad, +rb_gen(__unused static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad, extent_ad_comp) /* @@ -2346,7 +2347,7 @@ arena_chunk_comp(arena_chunk_t *a, arena } /* Wrap red-black tree macros in functions. */ -rb_wrap(__unused static, arena_chunk_tree_dirty_, arena_chunk_tree_t, +rb_gen(__unused static, arena_chunk_tree_dirty_, arena_chunk_tree_t, arena_chunk_t, link_dirty, arena_chunk_comp) static inline int @@ -2362,7 +2363,7 @@ arena_run_comp(arena_chunk_map_t *a, are } /* Wrap red-black tree macros in functions. */ -rb_wrap(__unused static, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t, +rb_gen(__unused static, arena_run_tree_, arena_run_tree_t, arena_chunk_map_t, link, arena_run_comp) static inline int @@ -2394,7 +2395,7 @@ arena_avail_comp(arena_chunk_map_t *a, a } /* Wrap red-black tree macros in functions. */ -rb_wrap(__unused static, arena_avail_tree_, arena_avail_tree_t, +rb_gen(__unused static, arena_avail_tree_, arena_avail_tree_t, arena_chunk_map_t, link, arena_avail_comp) static inline void @@ -2824,6 +2825,18 @@ arena_run_alloc(arena_t *arena, size_t s return (run); } +#ifdef MALLOC_DEBUG +static arena_chunk_t * +chunks_dirty_iter_cb(arena_chunk_tree_t *tree, arena_chunk_t *chunk, void *arg) +{ + size_t *ndirty = (size_t *)arg; + + assert(chunk->dirtied); + *ndirty += chunk->ndirty; + return (NULL); +} +#endif + static void arena_purge(arena_t *arena) { @@ -2832,11 +2845,8 @@ arena_purge(arena_t *arena) #ifdef MALLOC_DEBUG size_t ndirty = 0; - rb_foreach_begin(arena_chunk_t, link_dirty, &arena->chunks_dirty, - chunk) { - assert(chunk->dirtied); - ndirty += chunk->ndirty; - } rb_foreach_end(arena_chunk_t, link_dirty, &arena->chunks_dirty, chunk) + arena_chunk_tree_dirty_iter(&arena->chunks_dirty, NULL, + chunks_dirty_iter_cb, (void *)&ndirty); assert(ndirty == arena->ndirty); #endif assert((arena->nactive >> opt_lg_dirty_mult) < arena->ndirty); Modified: user/jmallett/octeon/lib/libc/stdlib/rb.h ============================================================================== --- user/jmallett/octeon/lib/libc/stdlib/rb.h Tue Mar 2 23:49:27 2010 (r204609) +++ user/jmallett/octeon/lib/libc/stdlib/rb.h Tue Mar 2 23:53:38 2010 (r204610) @@ -1,6 +1,7 @@ -/****************************************************************************** +/*- + ******************************************************************************* * - * Copyright (C) 2008 Jason Evans <jasone@FreeBSD.org>. + * Copyright (C) 2008-2010 Jason Evans <jasone@FreeBSD.org>. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,40 +30,23 @@ * ****************************************************************************** * - * cpp macro implementation of left-leaning red-black trees. + * cpp macro implementation of left-leaning 2-3 red-black trees. Parent + * pointers are not used, and color bits are stored in the least significant + * bit of right-child pointers (if RB_COMPACT is defined), thus making node + * linkage as compact as is possible for red-black trees. * * Usage: * - * (Optional, see assert(3).) - * #define NDEBUG - * - * (Required.) + * #include <stdint.h> + * #include <stdbool.h> + * #define NDEBUG // (Optional, see assert(3).) * #include <assert.h> + * #define RB_COMPACT // (Optional, embed color bits in right-child pointers.) * #include <rb.h> * ... * - * All operations are done non-recursively. Parent pointers are not used, and - * color bits are stored in the least significant bit of right-child pointers, - * thus making node linkage as compact as is possible for red-black trees. - * - * Some macros use a comparison function pointer, which is expected to have the - * following prototype: - * - * int (a_cmp *)(a_type *a_node, a_type *a_other); - * ^^^^^^ - * or a_key - * - * Interpretation of comparision function return values: - * - * -1 : a_node < a_other - * 0 : a_node == a_other - * 1 : a_node > a_other - * - * In all cases, the a_node or a_key macro argument is the first argument to the - * comparison function, which makes it possible to write comparison functions - * that treat the first argument specially. - * - ******************************************************************************/ + ******************************************************************************* + */ #ifndef RB_H_ #define RB_H_ @@ -70,12 +54,21 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifdef RB_COMPACT /* Node structure. */ #define rb_node(a_type) \ struct { \ a_type *rbn_left; \ a_type *rbn_right_red; \ } +#else +#define rb_node(a_type) \ +struct { \ + a_type *rbn_left; \ + a_type *rbn_right; \ + bool rbn_red; \ +} +#endif /* Root structure. */ #define rb_tree(a_type) \ @@ -85,863 +78,925 @@ struct { \ } /* Left accessors. */ -#define rbp_left_get(a_type, a_field, a_node) \ +#define rbtn_left_get(a_type, a_field, a_node) \ ((a_node)->a_field.rbn_left) -#define rbp_left_set(a_type, a_field, a_node, a_left) do { \ +#define rbtn_left_set(a_type, a_field, a_node, a_left) do { \ (a_node)->a_field.rbn_left = a_left; \ } while (0) +#ifdef RB_COMPACT /* Right accessors. */ -#define rbp_right_get(a_type, a_field, a_node) \ +#define rbtn_right_get(a_type, a_field, a_node) \ ((a_type *) (((intptr_t) (a_node)->a_field.rbn_right_red) \ & ((ssize_t)-2))) -#define rbp_right_set(a_type, a_field, a_node, a_right) do { \ +#define rbtn_right_set(a_type, a_field, a_node, a_right) do { \ (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t) a_right) \ | (((uintptr_t) (a_node)->a_field.rbn_right_red) & ((size_t)1))); \ } while (0) /* Color accessors. */ -#define rbp_red_get(a_type, a_field, a_node) \ +#define rbtn_red_get(a_type, a_field, a_node) \ ((bool) (((uintptr_t) (a_node)->a_field.rbn_right_red) \ & ((size_t)1))) -#define rbp_color_set(a_type, a_field, a_node, a_red) do { \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003022353.o22NrdQo080734>