Date: Wed, 23 Jan 2008 19:41:58 GMT From: Xin LI <delphij@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 133937 for review Message-ID: <200801231941.m0NJfwfN079579@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133937 Change 133937 by delphij@charlie on 2008/01/23 19:41:38 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile.inc1#8 integrate .. //depot/projects/delphij_fork/ObsoleteFiles.inc#17 integrate .. //depot/projects/delphij_fork/UPDATING#8 integrate .. //depot/projects/delphij_fork/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/delphij_fork/contrib/top/display.c#2 integrate .. //depot/projects/delphij_fork/contrib/top/layout.h#2 integrate .. //depot/projects/delphij_fork/contrib/top/machine.h#2 integrate .. //depot/projects/delphij_fork/contrib/top/top.c#3 integrate .. //depot/projects/delphij_fork/contrib/top/top.h#2 integrate .. //depot/projects/delphij_fork/etc/defaults/rc.conf#7 integrate .. //depot/projects/delphij_fork/etc/rc.firewall#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cvs/Makefile#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cvs/contrib/Makefile#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/delphij_fork/include/unistd.h#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/Makefile#6 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/ascii.c#1 branch .. //depot/projects/delphij_fork/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/delphij_fork/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/access.2#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/flock.2#2 integrate .. //depot/projects/delphij_fork/lib/libthr/Makefile#5 integrate .. //depot/projects/delphij_fork/lib/libutil/pty.3#2 integrate .. //depot/projects/delphij_fork/lib/libutil/pty.c#4 integrate .. //depot/projects/delphij_fork/lib/msun/Makefile#4 integrate .. //depot/projects/delphij_fork/lib/msun/Symbol.map#4 integrate .. //depot/projects/delphij_fork/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/delphij_fork/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/delphij_fork/lib/msun/man/exp.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/log.3#1 branch .. //depot/projects/delphij_fork/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/delphij_fork/lib/msun/src/math.h#4 integrate .. //depot/projects/delphij_fork/lib/msun/src/math_private.h#3 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/delphij_fork/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/delphij_fork/release/fixit.profile#3 integrate .. //depot/projects/delphij_fork/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/delphij_fork/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/delphij_fork/sbin/natd/natd.8#3 integrate .. //depot/projects/delphij_fork/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/delphij_fork/share/man/man4/Makefile#11 integrate .. //depot/projects/delphij_fork/share/man/man4/axe.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/coda.4#1 branch .. //depot/projects/delphij_fork/share/man/man4/mfi.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/pcib.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/sf.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/syncache.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/vlan.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/delphij_fork/share/man/man5/src.conf.5#6 integrate .. //depot/projects/delphij_fork/share/man/man7/clocks.7#2 integrate .. //depot/projects/delphij_fork/share/man/man7/ports.7#6 integrate .. //depot/projects/delphij_fork/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/delphij_fork/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/delphij_fork/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/delphij_fork/share/man/man9/Makefile#8 integrate .. //depot/projects/delphij_fork/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/delphij_fork/share/man/man9/lock.9#4 integrate .. //depot/projects/delphij_fork/share/misc/bsd-family-tree#5 integrate .. //depot/projects/delphij_fork/share/misc/pci_vendors#3 integrate .. //depot/projects/delphij_fork/share/mk/bsd.own.mk#4 integrate .. //depot/projects/delphij_fork/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/delphij_fork/sys/Makefile#4 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/delphij_fork/sys/amd64/include/_types.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/include/float.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/delphij_fork/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/delphij_fork/sys/conf/files#17 integrate .. //depot/projects/delphij_fork/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/delphij_fork/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/delphij_fork/sys/dev/an/if_an.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/delphij_fork/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/delphij_fork/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/re/if_re.c#12 integrate .. //depot/projects/delphij_fork/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/delphij_fork/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/delphij_fork/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/delphij_fork/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/delphij_fork/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_namecache.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/delphij_fork/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/delphij_fork/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/delphij_fork/sys/i386/include/pmap.h#4 integrate .. //depot/projects/delphij_fork/sys/i386/isa/clock.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/genassym.sh#2 integrate .. //depot/projects/delphij_fork/sys/kern/init_sysent.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/kern_mib.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_time.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/sched_ule.c#12 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.master#6 integrate .. //depot/projects/delphij_fork/sys/kern/systrace_args.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/tty_pty.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/delphij_fork/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/sf/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/net/if_bridge.c#8 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/delphij_fork/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/delphij_fork/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/delphij_fork/sys/pci/amdsmb.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/delphij_fork/sys/pci/if_sf.c#3 delete .. //depot/projects/delphij_fork/sys/pci/if_sfreg.h#2 delete .. //depot/projects/delphij_fork/sys/pci/nfsmb.c#3 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/delphij_fork/sys/sys/buf.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/lockmgr.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/mbuf.h#6 integrate .. //depot/projects/delphij_fork/sys/sys/param.h#9 integrate .. //depot/projects/delphij_fork/sys/sys/signal.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.mk#5 integrate .. //depot/projects/delphij_fork/sys/sys/sysproto.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/time.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/user.h#4 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/delphij_fork/tools/build/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_FORTRAN#2 delete .. //depot/projects/delphij_fork/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/delphij_fork/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/delphij_fork/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/delphij_fork/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/delphij_fork/tools/regression/posixshm/test.c#1 branch .. //depot/projects/delphij_fork/tools/regression/posixshm/test.h#1 branch .. //depot/projects/delphij_fork/tools/tools/aac/aac_checkq.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mklocale/mklocale.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/mklocale/yacc.y#3 integrate .. //depot/projects/delphij_fork/usr.bin/mt/mt.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/procstat/procstat_files.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/systat/cmds.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/devs.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/fetch.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/icmp.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/ip.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/keyboard.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/main.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/netcmds.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/pigs.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/systat/swap.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/delphij_fork/usr.bin/top/machine.c#5 integrate .. //depot/projects/delphij_fork/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/wall/wall.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/iostat/iostat.c#5 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/menus.c#5 integrate Differences ... ==== //depot/projects/delphij_fork/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.595 2008/01/23 00:16:37 ache Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -227,7 +227,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -852,10 +852,6 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ - false -.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -882,26 +878,6 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo -.endif - -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 -_mklocale= usr.bin/mklocale -.endif - .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -911,28 +887,23 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale .endif bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/delphij_fork/ObsoleteFiles.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.126 2008/01/22 20:08:09 attilio Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080122: Removed from the tree +OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz # 20080108: Moved to section 2 OLD_FILES+=usr/share/man/man3/shm_open.3.gz OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz ==== //depot/projects/delphij_fork/UPDATING#8 (text+ko) ==== @@ -19,7 +19,16 @@ related kernel options, INVARIANTS, malloc debugging flags in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines - to maximize performance. + to maximize performance. (To disable malloc debugging, run + ln -s aj /etc/malloc.conf.) + +20080121: + To upgrade to -current after this date, you must be running + FreeBSD after the RELENG_6 branch point. This means any of the + 6.x releases are supported and should work. Upgrading to current + from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems. + FreeBSD_version must be 600029 or higher, although this isn't + enforced in the Makefile at this time. 20071128: The ADAPTIVE_GIANT kernel option has been retired because its @@ -949,4 +958,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $ +$FreeBSD: src/UPDATING,v 1.515 2008/01/22 15:05:22 trhodes Exp $ ==== //depot/projects/delphij_fork/contrib/top/display.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $ + * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -78,8 +78,10 @@ static int *lmemory; static int *lswap; +static int num_cpus; static int *cpustate_columns; static int cpustate_total_length; +static int cpustates_column; static enum { OFF, ON, ERASE } header_status = ON; @@ -87,6 +89,29 @@ static void summary_format(); static void line_update(); +int x_lastpid = 10; +int y_lastpid = 0; +int x_loadave = 33; +int x_loadave_nompid = 15; +int y_loadave = 0; +int x_procstate = 0; +int y_procstate = 1; +int x_brkdn = 15; +int y_brkdn = 1; +int x_mem = 5; +int y_mem = 3; +int x_swap = 6; +int y_swap = 4; +int y_message = 5; +int x_header = 0; +int y_header = 6; +int x_idlecursor = 0; +int y_idlecursor = 5; +int y_procs = 7; + +int y_cpustates = 2; +int Header_lines = 7; + int display_resize() { @@ -138,6 +163,12 @@ /* call resize to do the dirty work */ lines = display_resize(); + num_cpus = statics->ncpus; + cpustates_column = 5; /* CPU: */ + if (num_cpus != 1) + cpustates_column += 2; /* CPU 0: */ + for (i = num_cpus; i > 9; i /= 10) + cpustates_column++; /* only do the rest if we need to */ if (lines > -1) @@ -153,7 +184,7 @@ num_swap = string_count(swap_names); lswap = (int *)malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); - lcpustates = (int *)malloc(num_cpustates * sizeof(int)); + lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus); cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; @@ -365,14 +396,13 @@ } } +#ifdef no_more /* * *_cpustates(states, names) - print the cpu state percentages * * Assumptions: cursor is on the PREVIOUS line */ -static int cpustates_column; - /* cpustates_tag() calculates the correct tag to use to label the line */ char *cpustates_tag() @@ -398,6 +428,7 @@ cpustates_column = strlen(use); return(use); } +#endif i_cpustates(states) @@ -406,11 +437,18 @@ { register int i = 0; register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* print tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; /* now walk thru the names and print the line */ @@ -423,14 +461,15 @@ /* if percentage is >= 1000, print it as 100% */ printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"), - i++ == 0 ? "" : ", ", + (i++ % num_cpustates) == 0 ? "" : ", ", ((float)value)/10., thisname); } } +} /* copy over values into "last" array */ - memcpy(lcpustates, states, num_cpustates * sizeof(int)); + memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus); } u_cpustates(states) @@ -439,14 +478,18 @@ { register int value; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; register int *colp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; - Move_to(cpustates_column, y_cpustates); - lastline = y_cpustates; - lp = lcpustates; + Move_to(cpustates_column, y_cpustates + cpu); + lastline = y_cpustates + cpu; + lp = lcpustates + (cpu * num_cpustates); colp = cpustate_columns; /* we could be much more optimal about this */ @@ -458,8 +501,8 @@ if (*lp != *states) { /* yes, move and change */ - Move_to(cpustates_column + *colp, y_cpustates); - lastline = y_cpustates; + Move_to(cpustates_column + *colp, y_cpustates + cpu); + lastline = y_cpustates + cpu; /* retrieve value and remember it */ value = *states; @@ -479,30 +522,39 @@ colp++; } } +} z_cpustates() { register int i = 0; - register char **names = cpustate_names; + register char **names; register char *thisname; register int *lp; + int cpu; + +for (cpu = 0; cpu < num_cpus; cpu++) { + names = cpustate_names; /* show tag and bump lastline */ - printf("\n%s", cpustates_tag()); + if (num_cpus == 1) + printf("\nCPU: "); + else + printf("\nCPU %d: ", cpu); lastline++; while ((thisname = *names++) != NULL) { if (*thisname != '\0') { - printf("%s %% %s", i++ == 0 ? "" : ", ", thisname); + printf("%s %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname); } } +} /* fill the "last" array with all -1s, to insure correct updating */ lp = lcpustates; - i = num_cpustates; + i = num_cpustates * num_cpus; while (--i >= 0) { *lp++ = -1; ==== //depot/projects/delphij_fork/contrib/top/layout.h#2 (text+ko) ==== @@ -4,26 +4,28 @@ * This file defines the locations on tne screen for various parts of the * display. These definitions are used by the routines in "display.c" for * cursor addressing. + * + * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $ */ -#define x_lastpid 10 -#define y_lastpid 0 -#define x_loadave 33 -#define x_loadave_nompid 15 -#define y_loadave 0 -#define x_procstate 0 -#define y_procstate 1 -#define x_brkdn 15 -#define y_brkdn 1 -#define x_mem 5 -#define y_mem 3 -#define x_swap 6 -#define y_swap 4 -#define y_message 5 -#define x_header 0 -#define y_header 6 -#define x_idlecursor 0 -#define y_idlecursor 5 -#define y_procs 7 +extern int x_lastpid; /* 10 */ +extern int y_lastpid; /* 0 */ +extern int x_loadave; /* 33 */ +extern int x_loadave_nompid; /* 15 */ +extern int y_loadave; /* 0 */ +extern int x_procstate; /* 0 */ +extern int y_procstate; /* 1 */ +extern int x_brkdn; /* 15 */ +extern int y_brkdn; /* 1 */ +extern int x_mem; /* 5 */ +extern int y_mem; /* 3 */ +extern int x_swap; /* 6 */ +extern int y_swap; /* 4 */ +extern int y_message; /* 5 */ +extern int x_header; /* 0 */ +extern int y_header; /* 6 */ +extern int x_idlecursor; /* 0 */ +extern int y_idlecursor; /* 5 */ +extern int y_procs; /* 7 */ -#define y_cpustates 2 +extern int y_cpustates; /* 2 */ ==== //depot/projects/delphij_fork/contrib/top/machine.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ */ /* @@ -20,6 +20,7 @@ #ifdef ORDER char **order_names; #endif + int ncpus; }; /* @@ -43,6 +44,8 @@ int *memory; int *swap; struct timeval boottime; + unsigned long cpumask; /* bitfield of cpu states represented */ + int ncpus; }; /* cpu_states is an array of percentages * 10. For example, ==== //depot/projects/delphij_fork/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $ */ /* @@ -66,6 +66,7 @@ extern int overstrike; static int fmt_flags = 0; +int pcpu_stats = No; /* signal handling routines */ sigret_t leave(); @@ -282,7 +283,7 @@ optind = 1; } - while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -407,6 +408,14 @@ ps.jail = !ps.jail; break; + case 'P': + pcpu_stats = Yes; + break; + + case 'p': + pcpu_stats = No; + break; + default: fprintf(stderr, "Top version %s\n" ==== //depot/projects/delphij_fork/contrib/top/top.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $ + * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $ */ /* * Top - a top users display for Berkeley Unix @@ -11,7 +11,7 @@ #define VERSION 3 /* Number of lines of header information on the standard screen */ -#define Header_lines 7 +extern int Header_lines; /* 7 */ /* Maximum number of columns allowed for display */ #define MAX_COLS 128 @@ -45,3 +45,5 @@ #define FMT_SHOWARGS 0x00000001 extern enum displaymodes displaymode; + +extern int pcpu_stats; ==== //depot/projects/delphij_fork/etc/defaults/rc.conf#7 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.322 2008/01/12 20:52:30 maxim Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.323 2008/01/21 04:41:18 rafan Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -120,6 +120,9 @@ firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports # for which denied incoming packets are not # logged. +firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) +firewall_nat_interface="" # Public interface or IPaddress to use +firewall_nat_flags="" # Additional configuration parameters ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) ==== //depot/projects/delphij_fork/etc/rc.firewall#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.53 2008/01/12 19:02:09 maxim Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.54 2008/01/21 04:41:17 rafan Exp $ # # @@ -131,7 +131,13 @@ case ${firewall_nat_enable} in [Yy][Ee][Ss]) if [ -n "${firewall_nat_interface}" ]; then - ${fwcmd} nat 123 config if ${firewall_nat_interface} log + if echo "${firewall_nat_interface}" | \ + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + firewall_nat_flags="ip ${firewall_nat_interface} ${firewall_nat_flags}" + else + firewall_nat_flags="if ${firewall_nat_interface} ${firewall_nat_flags}" + fi + ${fwcmd} nat 123 config log ${firewall_nat_flags} ${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface} fi ;; ==== //depot/projects/delphij_fork/gnu/usr.bin/cvs/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.17 2008/01/13 08:58:25 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.18 2008/01/16 17:16:36 obrien Exp $ -SUBDIR = lib libdiff cvs cvsbug doc +SUBDIR = lib libdiff cvs contrib cvsbug doc .include <bsd.subdir.mk> ==== //depot/projects/delphij_fork/gnu/usr.bin/cvs/contrib/Makefile#3 (text+ko) ==== @@ -1,4 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.19 2008/01/13 09:45:53 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.20 2008/01/16 17:15:59 obrien Exp $ + +.POSIX: .include "../Makefile.inc" ==== //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.6 2007/11/16 22:17:37 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $ */ #ifndef _KGDB_H_ @@ -32,6 +32,7 @@ struct thread_info; extern kvm_t *kvm; +extern char *kernel; struct kthr { struct kthr *next; @@ -63,5 +64,6 @@ char *kgdb_thr_extra_thread_info(int); uintptr_t kgdb_lookup(const char *sym); +CORE_ADDR kgdb_parse(const char *exp); #endif /* _KGDB_H_ */ ==== //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.8 2007/11/16 22:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.9 2008/01/18 18:57:27 emaste Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -36,6 +36,7 @@ #include <kvm.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <defs.h> #include <frame-unwind.h> @@ -204,17 +205,26 @@ char * kgdb_thr_extra_thread_info(int tid) { + char comm[MAXCOMLEN + 1]; + char td_name[MAXCOMLEN + 1]; struct kthr *kt; struct proc *p; - static char comm[MAXCOMLEN + 1]; + struct thread *t; + static char info[MAXCOMLEN + 1 + MAXCOMLEN + 1]; kt = kgdb_thr_lookup_tid(tid); if (kt == NULL) return (NULL); p = (struct proc *)kt->paddr; + t = (struct thread *)kt->kaddr; if (kvm_read(kvm, (uintptr_t)&p->p_comm[0], &comm, sizeof(comm)) != sizeof(comm)) return (NULL); - - return (comm); + if (kvm_read(kvm, (uintptr_t)&t->td_name[0], &td_name, + sizeof(td_name)) == sizeof(td_name) && + strcmp(comm, td_name) != 0) + snprintf(info, sizeof(info), "%s/%s", comm, td_name); + else + strlcpy(info, comm, sizeof(info)); + return (info); } ==== //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11 2006/01/04 23:17:52 kan Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -75,7 +75,7 @@ static int verbose; static char crashdir[PATH_MAX]; -static char *kernel; +char *kernel; static char *remote; static char *vmcore; @@ -178,7 +178,7 @@ kgdb_new_objfile_chain(objfile); } -static CORE_ADDR +CORE_ADDR kgdb_parse(const char *exp) { struct cleanup *old_chain; ==== //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/trgt.c#2 (text+ko) ==== @@ -25,13 +25,16 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $"); #include <sys/param.h> #include <sys/proc.h> +#include <sys/stat.h> #include <sys/sysctl.h> #include <sys/user.h> +#include <libgen.h> #include <kvm.h> +#include <string.h> #include <defs.h> #include <command.h> @@ -40,6 +43,9 @@ #include <inferior.h> #include <regcache.h> #include <target.h> +#include <objfiles.h> +#include <gdbcore.h> +#include <language.h> #include "kgdb.h" @@ -199,6 +205,268 @@ kgdb_switch_to_thread(thr); } +static int +kld_ok (char *path) +{ + struct stat sb; + + if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) + return (1); + return (0); +} + +/* + * Look for a matching file in the following order: + * - filename + ".symbols" (e.g. foo.ko.symbols) + * - filename + ".debug" (e.g. foo.ko.debug) + * - filename (e.g. foo.ko) + * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) + * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) + * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) + * - iterate over each path in the module path looking for: + * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) + * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) + * - dir + filename (e.g. /boot/modules/foo.ko) + */ +static int >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801231941.m0NJfwfN079579>