svn commit: r251602 - in user/attilio/vmcontention: . etc etc/devd etc/mtree etc/rc.d gnu/usr.bin/cc/include gnu/usr.bin/gdb gnu/usr.bin/gdb/arch/amd64 gnu/usr.bin/gdb/arch/arm gnu/usr.bin/gdb/arch...

Attilio Rao attilio at FreeBSD.org
Mon Jun 10 14:17:13 UTC 2013 

Author: attilio
Date: Mon Jun 10 14:17:10 2013
New Revision: 251602
URL: http://svnweb.freebsd.org/changeset/base/251602

Log:
  MFC

Added:
  user/attilio/vmcontention/etc/mtree/BSD.debug.dist
     - copied unchanged from r251601, head/etc/mtree/BSD.debug.dist
  user/attilio/vmcontention/lib/libc/arm/gen/arm_initfini.c
     - copied unchanged from r251601, head/lib/libc/arm/gen/arm_initfini.c
  user/attilio/vmcontention/lib/libc/sys/aio_mlock.2
     - copied unchanged from r251601, head/lib/libc/sys/aio_mlock.2
  user/attilio/vmcontention/lib/msun/src/e_acoshl.c
     - copied unchanged from r251601, head/lib/msun/src/e_acoshl.c
  user/attilio/vmcontention/lib/msun/src/e_atanhl.c
     - copied unchanged from r251601, head/lib/msun/src/e_atanhl.c
  user/attilio/vmcontention/lib/msun/src/s_asinhl.c
     - copied unchanged from r251601, head/lib/msun/src/s_asinhl.c
  user/attilio/vmcontention/share/man/man4/urtwn.4
     - copied unchanged from r251601, head/share/man/man4/urtwn.4
  user/attilio/vmcontention/sys/dev/ath/if_ath_btcoex.c
     - copied unchanged from r251601, head/sys/dev/ath/if_ath_btcoex.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_btcoex.h
     - copied unchanged from r251601, head/sys/dev/ath/if_ath_btcoex.h
  user/attilio/vmcontention/sys/dev/usb/wlan/if_urtwn.c
     - copied unchanged from r251601, head/sys/dev/usb/wlan/if_urtwn.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_urtwnreg.h
     - copied unchanged from r251601, head/sys/dev/usb/wlan/if_urtwnreg.h
  user/attilio/vmcontention/sys/mips/conf/CARAMBOLA2
     - copied unchanged from r251601, head/sys/mips/conf/CARAMBOLA2
  user/attilio/vmcontention/sys/mips/conf/CARAMBOLA2.hints
     - copied unchanged from r251601, head/sys/mips/conf/CARAMBOLA2.hints
  user/attilio/vmcontention/sys/mips/mips/stdatomic.c
     - copied unchanged from r251601, head/sys/mips/mips/stdatomic.c
  user/attilio/vmcontention/sys/modules/usb/urtwn/
     - copied from r251601, head/sys/modules/usb/urtwn/
  user/attilio/vmcontention/tools/build/options/WITH_DEBUG_FILES
     - copied unchanged from r251601, head/tools/build/options/WITH_DEBUG_FILES
  user/attilio/vmcontention/tools/regression/include/stdatomic/
     - copied from r251601, head/tools/regression/include/stdatomic/
  user/attilio/vmcontention/usr.sbin/mfiutil/mfi_foreign.c
     - copied unchanged from r251601, head/usr.sbin/mfiutil/mfi_foreign.c
Deleted:
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_add_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_and_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_or_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
  user/attilio/vmcontention/lib/libstand/arm/
Modified:
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/etc/Makefile
  user/attilio/vmcontention/etc/devd/usb.conf
  user/attilio/vmcontention/etc/mtree/Makefile
  user/attilio/vmcontention/etc/rc.d/netif
  user/attilio/vmcontention/etc/rc.d/routing
  user/attilio/vmcontention/gnu/usr.bin/cc/include/Makefile
  user/attilio/vmcontention/gnu/usr.bin/gdb/Makefile.inc
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/amd64/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/arm/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/i386/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/ia64/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/powerpc/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/powerpc64/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/sparc64/config.h
  user/attilio/vmcontention/gnu/usr.bin/gdb/gdb/Makefile
  user/attilio/vmcontention/lib/libc/arm/gen/Makefile.inc
  user/attilio/vmcontention/lib/libc/arm/gen/_setjmp.S
  user/attilio/vmcontention/lib/libc/arm/gen/setjmp.S
  user/attilio/vmcontention/lib/libc/arm/gen/sigsetjmp.S
  user/attilio/vmcontention/lib/libc/net/getifmaddrs.c
  user/attilio/vmcontention/lib/libc/net/recv.c
  user/attilio/vmcontention/lib/libc/net/send.c
  user/attilio/vmcontention/lib/libc/sys/Makefile.inc
  user/attilio/vmcontention/lib/libc/sys/Symbol.map
  user/attilio/vmcontention/lib/libc/sys/sigaction.2
  user/attilio/vmcontention/lib/libcompiler_rt/Makefile
  user/attilio/vmcontention/lib/libkvm/kvm_mips.c
  user/attilio/vmcontention/lib/libstand/ext2fs.c
  user/attilio/vmcontention/lib/libusb/libusb.3
  user/attilio/vmcontention/lib/libusb/libusb.h
  user/attilio/vmcontention/lib/libusb/libusb10.c
  user/attilio/vmcontention/lib/msun/Makefile
  user/attilio/vmcontention/lib/msun/Symbol.map
  user/attilio/vmcontention/lib/msun/man/acosh.3
  user/attilio/vmcontention/lib/msun/man/asinh.3
  user/attilio/vmcontention/lib/msun/man/atanh.3
  user/attilio/vmcontention/lib/msun/src/e_acosh.c
  user/attilio/vmcontention/lib/msun/src/e_atanh.c
  user/attilio/vmcontention/lib/msun/src/math.h
  user/attilio/vmcontention/lib/msun/src/s_asinh.c
  user/attilio/vmcontention/sbin/geom/class/part/geom_part.c
  user/attilio/vmcontention/sbin/mount/mount.8
  user/attilio/vmcontention/sbin/route/route.c
  user/attilio/vmcontention/share/man/man4/Makefile
  user/attilio/vmcontention/share/man/man5/rc.conf.5
  user/attilio/vmcontention/share/man/man5/src.conf.5
  user/attilio/vmcontention/share/man/man9/signal.9
  user/attilio/vmcontention/share/misc/bsd-family-tree
  user/attilio/vmcontention/share/mk/bsd.crunchgen.mk
  user/attilio/vmcontention/share/mk/bsd.lib.mk
  user/attilio/vmcontention/share/mk/bsd.own.mk
  user/attilio/vmcontention/share/mk/bsd.prog.mk
  user/attilio/vmcontention/share/mk/sys.mk
  user/attilio/vmcontention/sys/arm/include/asm.h
  user/attilio/vmcontention/sys/arm/include/setjmp.h
  user/attilio/vmcontention/sys/arm/ti/ti_machdep.c
  user/attilio/vmcontention/sys/boot/sparc64/loader/main.c
  user/attilio/vmcontention/sys/cam/cam_periph.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_pass.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_sg.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_target.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmcontention/sys/compat/freebsd32/syscalls.master
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/files
  user/attilio/vmcontention/sys/conf/files.mips
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_athvar.h
  user/attilio/vmcontention/sys/dev/bge/if_bge.c
  user/attilio/vmcontention/sys/dev/bge/if_bgereg.h
  user/attilio/vmcontention/sys/dev/cxgbe/offload.h
  user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_listen.c
  user/attilio/vmcontention/sys/dev/flash/mx25l.c
  user/attilio/vmcontention/sys/dev/fxp/if_fxp.c
  user/attilio/vmcontention/sys/dev/mfi/mfireg.h
  user/attilio/vmcontention/sys/dev/usb/controller/xhci.c
  user/attilio/vmcontention/sys/dev/usb/controller/xhci.h
  user/attilio/vmcontention/sys/dev/usb/controller/xhci_pci.c
  user/attilio/vmcontention/sys/dev/usb/usbdevs
  user/attilio/vmcontention/sys/fs/ext2fs/ext2fs.h
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c
  user/attilio/vmcontention/sys/geom/part/g_part.c
  user/attilio/vmcontention/sys/geom/part/g_part_ebr.c
  user/attilio/vmcontention/sys/geom/part/g_part_gpt.c
  user/attilio/vmcontention/sys/geom/part/g_part_ldm.c
  user/attilio/vmcontention/sys/geom/part/g_part_mbr.c
  user/attilio/vmcontention/sys/geom/part/g_part_pc98.c
  user/attilio/vmcontention/sys/kern/init_sysent.c
  user/attilio/vmcontention/sys/kern/syscalls.c
  user/attilio/vmcontention/sys/kern/syscalls.master
  user/attilio/vmcontention/sys/kern/systrace_args.c
  user/attilio/vmcontention/sys/kern/vfs_aio.c
  user/attilio/vmcontention/sys/kern/vfs_mount.c
  user/attilio/vmcontention/sys/modules/ath/Makefile
  user/attilio/vmcontention/sys/modules/usb/Makefile
  user/attilio/vmcontention/sys/net/if_lagg.c
  user/attilio/vmcontention/sys/net80211/ieee80211_ioctl.c
  user/attilio/vmcontention/sys/netinet/igmp.c
  user/attilio/vmcontention/sys/sys/aio.h
  user/attilio/vmcontention/sys/sys/mount.h
  user/attilio/vmcontention/sys/sys/param.h
  user/attilio/vmcontention/sys/sys/stdatomic.h
  user/attilio/vmcontention/sys/sys/syscall.h
  user/attilio/vmcontention/sys/sys/syscall.mk
  user/attilio/vmcontention/sys/sys/sysproto.h
  user/attilio/vmcontention/sys/vm/vm_extern.h
  user/attilio/vmcontention/sys/vm/vm_mmap.c
  user/attilio/vmcontention/sys/vm/vm_object.c
  user/attilio/vmcontention/sys/vm/vm_page.c
  user/attilio/vmcontention/sys/vm/vm_page.h
  user/attilio/vmcontention/tools/build/mk/OptionalObsoleteFiles.inc
  user/attilio/vmcontention/tools/build/options/makeman
  user/attilio/vmcontention/tools/regression/lib/msun/test-ctrig.c
  user/attilio/vmcontention/tools/tools/pciroms/pciroms.c
  user/attilio/vmcontention/usr.bin/kdump/kdump.c
  user/attilio/vmcontention/usr.bin/lsvfs/lsvfs.1
  user/attilio/vmcontention/usr.bin/lsvfs/lsvfs.c
  user/attilio/vmcontention/usr.bin/nfsstat/nfsstat.c
  user/attilio/vmcontention/usr.bin/tail/extern.h
  user/attilio/vmcontention/usr.bin/tail/forward.c
  user/attilio/vmcontention/usr.bin/tail/misc.c
  user/attilio/vmcontention/usr.bin/tail/tail.c
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/ttys
  user/attilio/vmcontention/usr.sbin/bsdconfig/security/security
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/misc
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcadd
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcconf.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupinput
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/userinput
  user/attilio/vmcontention/usr.sbin/gssd/gssd.c
  user/attilio/vmcontention/usr.sbin/mfiutil/Makefile
  user/attilio/vmcontention/usr.sbin/mfiutil/mfi_config.c
  user/attilio/vmcontention/usr.sbin/mfiutil/mfi_show.c
  user/attilio/vmcontention/usr.sbin/mfiutil/mfiutil.8
  user/attilio/vmcontention/usr.sbin/mfiutil/mfiutil.c
  user/attilio/vmcontention/usr.sbin/mfiutil/mfiutil.h
  user/attilio/vmcontention/usr.sbin/pkg/dns_utils.c
  user/attilio/vmcontention/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/share/man/man4/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)

Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================
--- user/attilio/vmcontention/Makefile.inc1	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/Makefile.inc1	Mon Jun 10 14:17:10 2013	(r251602)
@@ -470,6 +470,13 @@ _worldtmp:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if ${MK_DEBUG_FILES} != "no"
+	# We could instead disable debug files for these build stages
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${WORLDTMP}/legacy/usr/lib >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${WORLDTMP}/usr/lib >/dev/null
+.endif
 .if ${MK_BIND_LIBS} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
@@ -555,6 +562,10 @@ build32:
 	    -p ${LIB32TMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${LIB32TMP}/usr/lib >/dev/null
+.endif
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .for _t in obj includes
@@ -779,6 +790,10 @@ distributeworld installworld: installche
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
+.endif
 .if defined(NO_ROOT)
 	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
 	    sed -e 's#^\./#./${dist}/#' >> ${METALOG}

Modified: user/attilio/vmcontention/etc/Makefile
==============================================================================
--- user/attilio/vmcontention/etc/Makefile	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/etc/Makefile	Mon Jun 10 14:17:10 2013	(r251602)
@@ -143,6 +143,9 @@ MTREE+=	BIND.chroot.dist
 MTREE+=	BIND.include.dist
 .endif
 .endif
+.if ${MK_DEBUG_FILES} != "no"
+MTREE+=	BSD.debug.dist
+.endif
 
 PPPCNF=	ppp.conf
 
@@ -312,6 +315,9 @@ MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
 		mtree/BSD.usr.dist		/usr		\
 		mtree/BSD.include.dist		/usr/include
+.if ${MK_DEBUG_FILES} != "no"
+MTREES+=	mtree/BSD.debug.dist		/usr/lib
+.endif
 .if ${MK_BIND_LIBS} != "no"
 MTREES+=	mtree/BIND.include.dist		/usr/include
 .endif

Modified: user/attilio/vmcontention/etc/devd/usb.conf
==============================================================================
--- user/attilio/vmcontention/etc/devd/usb.conf	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/etc/devd/usb.conf	Mon Jun 10 14:17:10 2013	(r251602)
@@ -53,6 +53,17 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
+	match "product" "0x12a0";
+	match "intclass" "0xff";
+	match "intsubclass" "0xfd";
+	match "intprotocol" "0x01";
+	action "kldload -n if_ipheth";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x05ac";
 	match "product" "0x12a8";
 	match "intclass" "0xff";
 	match "intsubclass" "0xfd";
@@ -679,6 +690,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x04f2";
+	match "product" "(0xaff7|0xaff8|0xaff9|0xaffa|0xaffa)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0502";
 	match "product" "(0x1631|0x1632|0x16e1|0x16e2|0x16e3)";
 	action "kldload -n uipaq";
@@ -744,6 +763,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
+	match "product" "0x1102";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
 	match "product" "0x1203";
 	action "kldload -n ubsa";
 };
@@ -752,6 +779,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
+	match "product" "(0x2102|0x2103)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x050d";
 	match "product" "0x4050";
 	action "kldload -n if_zyd";
 };
@@ -1039,6 +1074,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "0x341f";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x058f";
 	match "product" "0x9720";
 	action "kldload -n uplcom";
@@ -1271,6 +1314,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x06f8";
+	match "product" "0xe033";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0707";
 	match "product" "0x0100";
 	action "kldload -n if_kue";
@@ -1472,6 +1523,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07aa";
+	match "product" "0x0056";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07aa";
 	match "product" "0x9601";
 	action "kldload -n if_udav";
 };
@@ -1528,6 +1587,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07b8";
+	match "product" "(0x8178|0x8188|0x8189)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07b8";
 	match "product" "0xabc1";
 	action "kldload -n if_aue";
 };
@@ -1735,6 +1802,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "(0x9021|0x9041)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0856";
 	match "product" "(0xac01|0xac02|0xac03|0xac11|0xac12|0xac16|0xac17|0xac18|0xac19|0xac25|0xac26|0xac27|0xac33|0xac34|0xac49|0xac50|0xba02)";
 	action "kldload -n uftdi";
@@ -2136,6 +2211,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
+	match "product" "0x17ab";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b05";
 	match "product" "(0x4200|0x4201|0x4202|0x420f|0x9200|0x9202)";
 	action "kldload -n uipaq";
 };
@@ -2240,6 +2323,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
+	match "product" "(0x018a|0x317f)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
 	match "product" "0x8150";
 	action "kldload -n if_rue";
 };
@@ -2248,13 +2339,45 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x8187|0x8189|0x8197|0x8198)";
+	match "product" "(0x8170|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
+	match "product" "(0x8187|0x8189)";
+	action "kldload -n if_urtw";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
+	match "product" "0x818a";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
+	match "product" "(0x8197|0x8198)";
 	action "kldload -n if_urtw";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0bda";
+	match "product" "0x8754";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0bed";
 	match "product" "(0x1100|0x1101)";
 	action "kldload -n uslcom";
@@ -2560,6 +2683,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
+	match "product" "(0x0052|0x005c|0x0061)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0df6";
 	match "product" "0x061c";
 	action "kldload -n if_axe";
 };
@@ -2616,6 +2747,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
+	match "product" "0x0019";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0e66";
 	match "product" "0x400c";
 	action "kldload -n if_aue";
 };
@@ -2671,6 +2810,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0eb0";
+	match "product" "0x9071";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0eba";
 	match "product" "(0x1080|0x2080)";
 	action "kldload -n uplcom";
@@ -2807,6 +2954,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x103c";
+	match "product" "0x1629";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x103e";
 	match "product" "0x03e8";
 	action "kldload -n uftdi";
@@ -3304,6 +3459,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
+	match "product" "(0x3357|0x3358|0x3359)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x13d3";
 	match "product" "(0x3362|0x3375|0x3393)";
 	action "kldload -n ng_ubt";
 };
@@ -4136,6 +4299,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
+	match "product" "(0x3307|0x3308|0x3309|0x330a)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2001";
 	match "product" "(0x3a00|0x3a02|0x3a04)";
 	action "kldload -n if_uath";
 };
@@ -4200,6 +4371,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
+	match "product" "(0x1201|0x4902)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2019";
 	match "product" "0x5303";
 	action "kldload -n if_zyd";
 };
@@ -4224,6 +4403,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
+	match "product" "(0xab2a|0xab2b|0xab2e)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2019";
 	match "product" "0xab50";
 	action "kldload -n if_rum";
 };
@@ -4255,6 +4442,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x2019";
+	match "product" "0xed17";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x203d";
 	match "product" "(0x1480|0x14a1|0x14a9)";
 	action "kldload -n if_run";
@@ -4287,6 +4482,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x20f4";
+	match "product" "(0x624d|0x648b)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x2100";
 	match "product" "(0x9e52|0x9e54)";
 	action "kldload -n uftdi";
@@ -4431,6 +4634,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x4855";
+	match "product" "(0x0090|0x0091)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x5050";
 	match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0300|0x0301|0x0400|0x0500|0x0700|0x0800|0x0900|0x0a00|0x0b00|0x0c00|0x0d00|0x0e00|0x0f00|0x1000|0x8000|0x8001|0x8002|0x8003|0x8004|0x8005)";
 	action "kldload -n uftdi";
@@ -4527,6 +4738,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x7392";
+	match "product" "(0x7811|0x7822)";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x8516";
 	match "product" "(0x2070|0x2770|0x2870|0x3070|0x3071|0x3072|0x3572)";
 	action "kldload -n if_run";
@@ -4575,6 +4794,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x9846";
+	match "product" "0x9041";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x9e88";
 	match "product" "0x9e8f";
 	action "kldload -n uftdi";
@@ -4749,5 +4976,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2422 USB entries processed
+# 2479 USB entries processed
 

Copied: user/attilio/vmcontention/etc/mtree/BSD.debug.dist (from r251601, head/etc/mtree/BSD.debug.dist)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/etc/mtree/BSD.debug.dist	Mon Jun 10 14:17:10 2013	(r251602, copy of r251601, head/etc/mtree/BSD.debug.dist)
@@ -0,0 +1,48 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    debug
+        bin
+        ..
+        boot
+        ..
+        lib
+            geom
+            ..
+        ..
+        libexec
+        ..
+        sbin
+        ..
+        usr
+            bin
+            ..
+            games
+            ..
+            lib
+                engines
+                ..
+            ..
+            lib32
+            ..
+            libexec
+                bsdinstall
+                ..
+                lpr
+                    ru
+                    ..
+                ..
+                sendmail
+                ..
+                sm.bin
+                ..
+            ..
+            sbin
+            ..
+        ..
+    ..
+..

Modified: user/attilio/vmcontention/etc/mtree/Makefile
==============================================================================
--- user/attilio/vmcontention/etc/mtree/Makefile	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/etc/mtree/Makefile	Mon Jun 10 14:17:10 2013	(r251602)
@@ -4,6 +4,7 @@
 
 FILES=	${_BIND.chroot.dist} \
 	${_BIND.include.dist} \
+	${_BSD.debug.dist} \
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.sendmail.dist} \
@@ -16,6 +17,9 @@ _BIND.chroot.dist=	BIND.chroot.dist
 _BIND.include.dist=	BIND.include.dist
 .endif
 .endif
+.if ${MK_DEBUG_FILES} != "no"
+_BSD.debug.dist=	BSD.debug.dist
+.endif
 .if ${MK_GROFF} != "no"
 _BSD.groff.dist=	BSD.groff.dist
 .endif

Modified: user/attilio/vmcontention/etc/rc.d/netif
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/netif	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/etc/rc.d/netif	Mon Jun 10 14:17:10 2013	(r251602)
@@ -46,6 +46,8 @@ set_rcvar_obsolete ipv6_prefer
 
 network_start()
 {
+	local _if
+
 	# Set the list of interfaces to work on.
 	#
 	cmdifn=$*
@@ -81,16 +83,29 @@ network_start()
 	if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
 		/etc/rc.d/bridge start $cmdifn
 	fi
+	if [ -f /etc/rc.d/routing -a -n "$cmdifn" ] ; then
+		for _if in $cmdifn; do
+			/etc/rc.d/routing start any $_if
+		done
+	fi
 }
 
 network_stop()
 {
+	local _if
+
 	# Set the list of interfaces to work on.
 	#
 	cmdifn=$*
 
 	# Deconfigure the interface(s)
 	network_common ifn_stop
+
+	if [ -f /etc/rc.d/routing -a -n "$cmdifn" ] ; then
+		for _if in $cmdifn; do
+			/etc/rc.d/routing stop any $_if
+		done
+	fi
 }
 
 # network_common routine

Modified: user/attilio/vmcontention/etc/rc.d/routing
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/routing	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/etc/rc.d/routing	Mon Jun 10 14:17:10 2013	(r251602)
@@ -19,56 +19,73 @@ extra_commands="options static"
 static_cmd="routing_start static"
 options_cmd="routing_start options"
 
-afcheck()
-{
-	case $_af in
-	""|inet|inet6|ipx|atm)
-		;;
-	*)
-		err 1 "Unsupported address family: $_af."
-		;;
-	esac
-}
+ROUTE_CMD="/sbin/route"
 
 routing_start()
 {
-	local _cmd _af _a
+	local _cmd _af _if _a
 	_cmd=$1
 	_af=$2
+	_if=$3
 
-	afcheck
+	case $_if in
+	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])	_if="" ;;
+	esac
 
 	case $_af in
 	inet|inet6|ipx|atm)
-		setroutes $_cmd $_af
+		if afexists $_af; then
+			setroutes $_cmd $_af $_if
+		else
+			err 1 "Unsupported address family: $_af."
+		fi
 		;;
-	"")
+	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
 		for _a in inet inet6 ipx atm; do
-			afexists $_a && setroutes $_cmd $_a
+			afexists $_a && setroutes $_cmd $_a $_if
 		done
 		;;
+	*)
+		err 1 "Unsupported address family: $_af."
+		;;
 	esac
 }
 
 routing_stop()
 {
-	local _af _a
+	local _af _if _a
 	_af=$1
+	_if=$2
 
-	afcheck
+	case $_if in
+	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])	_if="" ;;
+	esac
 
 	case $_af in
 	inet|inet6|ipx|atm)
-		eval static_${_af} delete
-		eval routing_stop_${_af}
+		if afexists $_af; then
+			eval static_${_af} delete $_if 
+			# When $_if is specified, do not flush routes.
+			if ! [ -n "$_if" ]; then
+				eval routing_stop_${_af}
+			fi
+		else
+			err 1 "Unsupported address family: $_af."
+		fi
 		;;
-	"")
+	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
 		for _a in inet inet6 ipx atm; do
 			afexists $_a || continue
-			eval static_${_a} delete
-			eval routing_stop_${_a}
+			eval static_${_a} delete $_if
+			# When $_if is specified, do not flush routes.
+			if ! [ -n "$_if" ]; then
+				eval routing_stop_${_a}
+			fi
 		done
 		;;
+	*)
+		err 1 "Unsupported address family: $_af."
+		;;
 	esac
 }
 
@@ -76,13 +93,13 @@ setroutes()
 {
 	case $1 in
 	static)
-		static_$2 add
+		static_$2 add $3
 		;;
 	options)
 		options_$2
 		;;
 	doall)
-		static_$2 add
+		static_$2 add $3
 		options_$2
 		;;
 	esac
@@ -90,14 +107,14 @@ setroutes()
 
 routing_stop_inet()
 {
-	route -n flush -inet
+	${ROUTE_CMD} -n flush -inet
 }
 
 routing_stop_inet6()
 {
 	local i
 
-	route -n flush -inet6
+	${ROUTE_CMD} -n flush -inet6
 	for i in `list_net_interfaces`; do
 		if ipv6if $i; then
 			ifconfig $i inet6 -defaultif
@@ -117,30 +134,47 @@ routing_stop_ipx()
 
 static_inet()
 {
-	local _action
+	local _action _if _skip
 	_action=$1
+	_if=$2
 
+	# Add default route.
 	case ${defaultrouter} in
 	[Nn][Oo] | '')
 		;;
 	*)
-		static_routes="default ${static_routes}"
-		route_default="default ${defaultrouter}"
+		static_routes="_default ${static_routes}"
+		route__default="default ${defaultrouter}"
 		;;
 	esac
 
+	# Install configured routes.
 	if [ -n "${static_routes}" ]; then
 		for i in ${static_routes}; do
-			route_args=`get_if_var $i route_IF`
-			route ${_action} ${route_args}
+			_skip=0
+			if [ -n "$_if" ]; then
+				case $i in
+				*:$_if)	;;
+				*)	_skip=1 ;;
+				esac
+			fi
+			if [ $_skip = 0 ]; then
+				route_args=`get_if_var ${i%:*} route_IF`
+				if [ -n "$route_args" ]; then
+					${ROUTE_CMD} ${_action} ${route_args}
+				else
+					warn "route_${i%:*} not found."
+				fi
+			fi
 		done
 	fi
 }
 
 static_inet6()
 {
-	local _action fibmod fibs
+	local _action _if _skip fibmod fibs
 	_action=$1
+	_if=$2
 
 	# get the number of FIBs supported.
 	fibs=$((`${SYSCTL_N} net.fibs` - 1))
@@ -150,58 +184,74 @@ static_inet6()
 		fibmod=
 	fi
 
+	# Add pre-defined static routes first.
+	ipv6_static_routes="_v4mapped _v4compat ${ipv6_static_routes}"
+	ipv6_static_routes="_lla _llma ${ipv6_static_routes}"
+
 	# disallow "internal" addresses to appear on the wire
-	route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}
-	route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}
+	ipv6_route__v4mapped="::ffff:0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}"
+	ipv6_route__v4compat="::0.0.0.0 -prefixlen 96 ::1 -reject ${fibmod}"
 
+	# Disallow link-local unicast packets without outgoing scope
+	# identifiers.  However, if you set "ipv6_default_interface",
+	# for the host case, you will allow to omit the identifiers.
+	# Under this configuration, the packets will go to the default
+	# interface.
+	ipv6_route__lla="fe80:: -prefixlen 10 ::1 -reject ${fibmod}"
+	ipv6_route__llma="ff02:: -prefixlen 16 ::1 -reject ${fibmod}"
+
+	# Add default route.
 	case ${ipv6_defaultrouter} in
 	[Nn][Oo] | '')
 		;;
 	*)
-		ipv6_static_routes="default ${ipv6_static_routes}"
-		ipv6_route_default="default ${ipv6_defaultrouter}"
+		ipv6_static_routes="_default ${ipv6_static_routes}"
+		ipv6_route__default="default ${ipv6_defaultrouter}"
 		;;
 	esac
 
+	# Install configured routes.
 	if [ -n "${ipv6_static_routes}" ]; then
 		for i in ${ipv6_static_routes}; do
-			ipv6_route_args=`get_if_var $i ipv6_route_IF`
-			route ${_action} -inet6 ${ipv6_route_args}
+			_skip=0
+			if [ -n "$_if" ]; then
+				case $i in
+				*:$_if)	;;
+				*)	_skip=1 ;;
+				esac
+			fi
+			if [ $_skip = 0 ]; then
+				ipv6_route_args=`get_if_var ${i%:*} ipv6_route_IF`
+				if [ -n "$ipv6_route_args" ]; then
+					${ROUTE_CMD} ${_action} \
+						-inet6 ${ipv6_route_args}
+				else
+					warn "route_${i%:*} not found"
+				fi
+			fi
 		done
 	fi
 
-	# Fixup $ipv6_network_interfaces
-	case ${ipv6_network_interfaces} in
-	[Nn][Oo][Nn][Ee])
-		ipv6_network_interfaces=''
-		;;
-	esac
+	# Install the "default interface" to kernel, which will be used
+	# as the default route when there's no router.
 
+	# Disable installing the default interface when we act
+	# as router to avoid conflict between the default
+	# router list and the manual configured default route.
 	if checkyesno ipv6_gateway_enable; then
-		for i in ${ipv6_network_interfaces}; do
-
-			laddr=`network6_getladdr $i exclude_tentative`
-			case ${laddr} in
-			'')
-				;;
-			*)
-				ipv6_working_interfaces="$i \
-				    ${ipv6_working_interfaces}"
-				;;
-			esac
-		done
-		ipv6_network_interfaces=${ipv6_working_interfaces}
+		return
 	fi
 
-	# Install the "default interface" to kernel, which will be used
-	# as the default route when there's no router.
 	case "${ipv6_default_interface}" in
 	[Nn][Oo] | [Nn][Oo][Nn][Ee])
-		ipv6_default_interface=""
+		return
 		;;
 	[Aa][Uu][Tt][Oo] | "")
 		for i in ${ipv6_network_interfaces}; do
 			case $i in
+			[Nn][Oo][Nn][Ee])
+				return
+				;;
 			lo0|faith[0-9]*)
 				continue
 				;;
@@ -219,27 +269,8 @@ static_inet6()
 		;;
 	esac
 
-	# Disallow link-local unicast packets without outgoing scope
-	# identifiers.  However, if you set "ipv6_default_interface",
-	# for the host case, you will allow to omit the identifiers.
-	# Under this configuration, the packets will go to the default
-	# interface.
-	route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject ${fibmod}
-	route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject ${fibmod}
-
-	case ${ipv6_default_interface} in
-	'')
-		;;
-	*)
-		# Disable installing the default interface when we act
-		# as router to avoid conflict between the default
-		# router list and the manual configured default route.
-		if ! checkyesno ipv6_gateway_enable; then
-			ifconfig ${ipv6_default_interface} inet6 defaultif
-			sysctl net.inet6.ip6.use_defaultzone=1
-		fi
-		;;
-	esac
+	ifconfig ${ipv6_default_interface} inet6 defaultif
+	sysctl net.inet6.ip6.use_defaultzone=1
 }
 
 static_atm()
@@ -250,7 +281,11 @@ static_atm()
 	if [ -n "${natm_static_routes}" ]; then
 		for i in ${natm_static_routes}; do
 			route_args=`get_if_var $i route_IF`
-			atmconfig natm ${_action} ${route_args}
+			if [ -n "$route_args" ]; then
+				atmconfig natm ${_action} ${route_args}
+			else
+				warn "route_${i} not found."
+			fi
 		done
 	fi
 }

Modified: user/attilio/vmcontention/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/cc/include/Makefile	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/cc/include/Makefile	Mon Jun 10 14:17:10 2013	(r251602)
@@ -9,8 +9,8 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
-INCS=	emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h tmmintrin.h xmmintrin.h \
-	mm_malloc.h
+INCS=	ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
+	tmmintrin.h xmmintrin.h mm_malloc.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/Makefile.inc	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/Makefile.inc	Mon Jun 10 14:17:10 2013	(r251602)
@@ -37,6 +37,7 @@ GDB_CROSS_DEBUGGER=
 	${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR}
 
 CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1
+CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"
 CFLAGS+= -I.
 CFLAGS+= -I${TARGET_SUBDIR}
 CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_CPUARCH}

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/amd64/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/amd64/config.h	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/amd64/config.h	Mon Jun 10 14:17:10 2013	(r251602)
@@ -439,9 +439,6 @@
 /* Name of this package.  */
 #define PACKAGE "gdb"
 
-/* Global directory for separate debug files.  */
-#define DEBUGDIR "/usr/local/lib/debug"
-
 /* Define to BFD's default architecture.  */
 #define DEFAULT_BFD_ARCH bfd_i386_arch
 

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/arm/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/arm/config.h	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/arm/config.h	Mon Jun 10 14:17:10 2013	(r251602)
@@ -451,9 +451,6 @@
 /* Name of this package.  */
 #define PACKAGE "gdb"
 
-/* Global directory for separate debug files.  */
-#define DEBUGDIR "/usr/local/lib/debug"
-
 /* Define to BFD's default architecture.  */
 #define DEFAULT_BFD_ARCH bfd_arm_arch
 

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/i386/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/i386/config.h	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/i386/config.h	Mon Jun 10 14:17:10 2013	(r251602)
@@ -439,9 +439,6 @@
 /* Name of this package.  */
 #define PACKAGE "gdb"
 
-/* Global directory for separate debug files.  */
-#define DEBUGDIR "/usr/local/lib/debug"
-
 /* Define to BFD's default architecture.  */
 #define DEFAULT_BFD_ARCH bfd_i386_arch
 

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/ia64/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/ia64/config.h	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/ia64/config.h	Mon Jun 10 14:17:10 2013	(r251602)
@@ -439,9 +439,6 @@
 /* Name of this package.  */
 #define PACKAGE "gdb"
 
-/* Global directory for separate debug files.  */
-#define DEBUGDIR "/usr/local/lib/debug"
-
 /* Define to BFD's default architecture.  */
 #define DEFAULT_BFD_ARCH bfd_ia64_arch
 

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/config.h	Mon Jun 10 13:55:03 2013	(r251601)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/config.h	Mon Jun 10 14:17:10 2013	(r251602)
@@ -439,9 +439,6 @@
 /* Name of this package.  */
 #define PACKAGE "gdb"
 
-/* Global directory for separate debug files.  */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list