svn commit: r232952 - in user/attilio/vmcontention: . bin/ps contrib/gdb/gdb contrib/llvm/tools/clang/lib/Basic contrib/ntp/ntpd contrib/tnftp/src contrib/top gnu/usr.bin/gdb/arch/mips include incl...

Florian Smeets flo at FreeBSD.org
Wed Mar 14 00:41:39 UTC 2012 

Author: flo (ports committer)
Date: Wed Mar 14 00:41:37 2012
New Revision: 232952
URL: http://svn.freebsd.org/changeset/base/232952

Log:
  IFC at r232948
  
  Approved by:	attilio

Added:
  user/attilio/vmcontention/lib/csu/common/ignore_init.c
     - copied unchanged from r232948, head/lib/csu/common/ignore_init.c
  user/attilio/vmcontention/lib/csu/common/notes.h
     - copied unchanged from r232948, head/lib/csu/common/notes.h
  user/attilio/vmcontention/lib/libc/locale/ctype_l.3
     - copied unchanged from r232948, head/lib/libc/locale/ctype_l.3
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-endor-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-endor-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-eoi-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-eoi-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-cfg.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-cfg.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-ilk.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-ilk.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-hfa.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-hfa.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-hfa.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-hfa.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-iob1-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-iob1-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ipd.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-malloc/
     - copied from r232948, head/sys/contrib/octeon-sdk/cvmx-malloc/
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-profiler.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-profiler.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-profiler.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-profiler.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm-tables.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm-tables.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-resources.config
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-resources.config
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux.ld
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux.ld
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sso-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-sso-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-trax-defs.h
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-trax-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-feature.c
     - copied unchanged from r232948, head/sys/contrib/octeon-sdk/octeon-feature.c
  user/attilio/vmcontention/sys/mips/cavium/octeon_irq.h
     - copied unchanged from r232948, head/sys/mips/cavium/octeon_irq.h
  user/attilio/vmcontention/sys/mips/mips/libkern_machdep.c
     - copied unchanged from r232948, head/sys/mips/mips/libkern_machdep.c
  user/attilio/vmcontention/sys/modules/acl_nfs4/
     - copied from r232948, head/sys/modules/acl_nfs4/
  user/attilio/vmcontention/sys/modules/acl_posix1e/
     - copied from r232948, head/sys/modules/acl_posix1e/
  user/attilio/vmcontention/sys/modules/ralfw/rt2860/
     - copied from r232948, head/sys/modules/ralfw/rt2860/
  user/attilio/vmcontention/sys/x86/x86/intr_machdep.c
     - copied unchanged from r232948, head/sys/x86/x86/intr_machdep.c
  user/attilio/vmcontention/tools/regression/bin/sh/expansion/arith12.0
     - copied unchanged from r232948, head/tools/regression/bin/sh/expansion/arith12.0
Deleted:
  user/attilio/vmcontention/Makefile.mips
  user/attilio/vmcontention/sys/amd64/amd64/intr_machdep.c
  user/attilio/vmcontention/sys/contrib/dev/ral/rt2661_ucode.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db-support.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-custom.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-custom.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error.h
  user/attilio/vmcontention/sys/fs/fifofs/fifo.h
  user/attilio/vmcontention/sys/i386/i386/intr_machdep.c
  user/attilio/vmcontention/sys/mips/include/bswap.h
  user/attilio/vmcontention/sys/mips/include/clockvar.h
  user/attilio/vmcontention/sys/mips/include/cputypes.h
  user/attilio/vmcontention/sys/mips/include/iodev.h
  user/attilio/vmcontention/sys/mips/include/mp_watchdog.h
  user/attilio/vmcontention/sys/mips/include/pci_cfgreg.h
  user/attilio/vmcontention/sys/mips/include/ppireg.h
  user/attilio/vmcontention/sys/mips/include/timerreg.h
  user/attilio/vmcontention/sys/mips/mips/mainbus.c
Modified:
  user/attilio/vmcontention/Makefile
  user/attilio/vmcontention/ObsoleteFiles.inc
  user/attilio/vmcontention/bin/ps/ps.1
  user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c
  user/attilio/vmcontention/contrib/gdb/gdb/target.c
  user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c
  user/attilio/vmcontention/contrib/tnftp/src/main.c
  user/attilio/vmcontention/contrib/tnftp/src/util.c
  user/attilio/vmcontention/contrib/top/top.c
  user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile
  user/attilio/vmcontention/include/Makefile
  user/attilio/vmcontention/include/xlocale/_ctype.h
  user/attilio/vmcontention/lib/csu/Makefile.inc
  user/attilio/vmcontention/lib/csu/amd64/Makefile
  user/attilio/vmcontention/lib/csu/amd64/crt1.c
  user/attilio/vmcontention/lib/csu/arm/Makefile
  user/attilio/vmcontention/lib/csu/arm/crt1.c
  user/attilio/vmcontention/lib/csu/common/crtbrand.c
  user/attilio/vmcontention/lib/csu/i386-elf/Makefile
  user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c
  user/attilio/vmcontention/lib/csu/mips/Makefile
  user/attilio/vmcontention/lib/csu/mips/crt1.c
  user/attilio/vmcontention/lib/csu/powerpc/Makefile
  user/attilio/vmcontention/lib/csu/powerpc/crt1.c
  user/attilio/vmcontention/lib/csu/powerpc64/Makefile
  user/attilio/vmcontention/lib/csu/powerpc64/crt1.c
  user/attilio/vmcontention/lib/csu/sparc64/crt1.c
  user/attilio/vmcontention/lib/libc/locale/Makefile.inc
  user/attilio/vmcontention/lib/libc/locale/Symbol.map
  user/attilio/vmcontention/lib/libc/locale/btowc.3
  user/attilio/vmcontention/lib/libc/locale/ctype.3
  user/attilio/vmcontention/lib/libc/locale/digittoint.3
  user/attilio/vmcontention/lib/libc/locale/isalnum.3
  user/attilio/vmcontention/lib/libc/locale/isalpha.3
  user/attilio/vmcontention/lib/libc/locale/isblank.3
  user/attilio/vmcontention/lib/libc/locale/iscntrl.3
  user/attilio/vmcontention/lib/libc/locale/isdigit.3
  user/attilio/vmcontention/lib/libc/sys/kill.2
  user/attilio/vmcontention/lib/libc/sys/sigqueue.2
  user/attilio/vmcontention/libexec/rtld-elf/Makefile
  user/attilio/vmcontention/libexec/rtld-elf/amd64/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/arm/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/i386/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/ia64/reloc.c
  user/attilio/vmcontention/libexec/rtld-elf/ia64/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/libmap.c
  user/attilio/vmcontention/libexec/rtld-elf/map_object.c
  user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_start.S
  user/attilio/vmcontention/libexec/rtld-elf/powerpc/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/powerpc64/rtld_machdep.h
  user/attilio/vmcontention/libexec/rtld-elf/rtld.c
  user/attilio/vmcontention/libexec/rtld-elf/rtld.h
  user/attilio/vmcontention/libexec/rtld-elf/rtld_printf.c
  user/attilio/vmcontention/libexec/rtld-elf/sparc64/rtld_machdep.h
  user/attilio/vmcontention/release/Makefile
  user/attilio/vmcontention/sbin/adjkerntz/adjkerntz.8
  user/attilio/vmcontention/sbin/fsdb/Makefile
  user/attilio/vmcontention/sbin/fsdb/fsdbutil.c
  user/attilio/vmcontention/sbin/growfs/growfs.c
  user/attilio/vmcontention/sbin/init/init.c
  user/attilio/vmcontention/sbin/ipfw/ipfw.8
  user/attilio/vmcontention/sbin/ipfw/ipfw2.c
  user/attilio/vmcontention/share/man/man4/eventtimers.4
  user/attilio/vmcontention/share/man/man4/tcp.4
  user/attilio/vmcontention/share/man/man4/u3g.4
  user/attilio/vmcontention/share/man/man9/LOCK_PROFILING.9
  user/attilio/vmcontention/share/man/man9/ifnet.9
  user/attilio/vmcontention/share/mk/bsd.sys.mk
  user/attilio/vmcontention/sys/amd64/amd64/trap.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_dummy.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_proto.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_syscall.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_syscalls.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_sysent.c
  user/attilio/vmcontention/sys/amd64/linux32/linux32_systrace_args.c
  user/attilio/vmcontention/sys/amd64/linux32/syscalls.master
  user/attilio/vmcontention/sys/boot/common/ufsread.c
  user/attilio/vmcontention/sys/boot/i386/boot2/boot2.c
  user/attilio/vmcontention/sys/boot/pc98/boot2/boot2.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/attilio/vmcontention/sys/conf/Makefile.mips
  user/attilio/vmcontention/sys/conf/files
  user/attilio/vmcontention/sys/conf/files.amd64
  user/attilio/vmcontention/sys/conf/files.i386
  user/attilio/vmcontention/sys/conf/files.mips
  user/attilio/vmcontention/sys/conf/files.pc98
  user/attilio/vmcontention/sys/conf/kern.mk
  user/attilio/vmcontention/sys/conf/options.mips
  user/attilio/vmcontention/sys/contrib/dev/ral/rt2860.fw.uu
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmip.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-abi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-access-native.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-access.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-address.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-agl-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-hotplug.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-hotplug.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init-linux.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asm.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asx0-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-atomic.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootloader.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootmem.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootmem.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ciu-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-clock.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-clock.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cmd-queue.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cmd-queue.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-compactflash.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-compactflash.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-core.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-core.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-coremask.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-coremask.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-crypto.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-crypto.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-enums.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dbg-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-handler.S
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-remote.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-uart.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfm-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dma-engine.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dma-engine.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dpi-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ebt3000.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ebt3000.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fau.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-flash.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-flash.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gmx.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gpio-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gpio.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-board.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-board.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-errata.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-errata.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-fpa.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-fpa.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-jtag.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-jtag.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-loop.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-loop.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-npi.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-npi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-spi.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-spi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-srio.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-srio.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-util.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-util.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-xaui.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-xaui.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-higig.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-iob-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ixf18201.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ixf18201.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-key-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-key.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2d-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2t-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-led-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-llm.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-llm.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log-arc.S
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-malloc.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mdio.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mio-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mixx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mpi-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-nand.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-nand.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ndf-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npei-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npi-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-packet.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pci-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pci.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcie.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcie.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcm-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pemx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pescx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pexp-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pip-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pip.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-platform.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-power-throttle.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-power-throttle.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rad-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-raid.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-raid.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rng.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rnm-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rtc.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rwlock.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-scratch.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shmem.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shmem.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sim-magic.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sli-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-smi-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-smix-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi4000.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spinlock.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spx0-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srio.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srio.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sriox-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-stxx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-swap.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sysinfo.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sysinfo.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-thunder.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-thunder.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tlb.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tlb.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-twsi.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-twsi.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uart.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uart.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usb.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usb.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbd.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbd.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-utils.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-version.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-warn.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-warn.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-wqe.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip-defs.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zone.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-boot-info.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-feature.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-model.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-model.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-pci-console.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-pci-console.h
  user/attilio/vmcontention/sys/contrib/pf/net/if_pfsync.c
  user/attilio/vmcontention/sys/dev/aac/aac_pci.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c
  user/attilio/vmcontention/sys/dev/advansys/adv_eisa.c
  user/attilio/vmcontention/sys/dev/advansys/adv_isa.c
  user/attilio/vmcontention/sys/dev/advansys/adv_pci.c
  user/attilio/vmcontention/sys/dev/advansys/adw_pci.c
  user/attilio/vmcontention/sys/dev/ahb/ahb.c
  user/attilio/vmcontention/sys/dev/aic7xxx/ahc_eisa.c
  user/attilio/vmcontention/sys/dev/aic7xxx/ahc_isa.c
  user/attilio/vmcontention/sys/dev/aic7xxx/ahc_pci.c
  user/attilio/vmcontention/sys/dev/aic7xxx/ahd_pci.c
  user/attilio/vmcontention/sys/dev/amr/amr_pci.c
  user/attilio/vmcontention/sys/dev/an/if_an_pci.c
  user/attilio/vmcontention/sys/dev/arcmsr/arcmsr.c
  user/attilio/vmcontention/sys/dev/asr/asr.c
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c
  user/attilio/vmcontention/sys/dev/ath/if_athioctl.h
  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/buslogic/bt_pci.c
  user/attilio/vmcontention/sys/dev/bxe/if_bxe.c
  user/attilio/vmcontention/sys/dev/cesa/cesa.c
  user/attilio/vmcontention/sys/dev/ciss/ciss.c
  user/attilio/vmcontention/sys/dev/cxgb/cxgb_sge.c
  user/attilio/vmcontention/sys/dev/de/if_de.c
  user/attilio/vmcontention/sys/dev/dpt/dpt_pci.c
  user/attilio/vmcontention/sys/dev/en/midway.c
  user/attilio/vmcontention/sys/dev/glxsb/glxsb.c
  user/attilio/vmcontention/sys/dev/hatm/if_hatm.c
  user/attilio/vmcontention/sys/dev/hifn/hifn7751.c
  user/attilio/vmcontention/sys/dev/hptiop/hptiop.c
  user/attilio/vmcontention/sys/dev/hptmv/entry.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips24k.c
  user/attilio/vmcontention/sys/dev/ida/ida_pci.c
  user/attilio/vmcontention/sys/dev/if_ndis/if_ndis_pci.c
  user/attilio/vmcontention/sys/dev/iir/iir_pci.c
  user/attilio/vmcontention/sys/dev/ips/ips_pci.c
  user/attilio/vmcontention/sys/dev/ipw/if_ipw.c
  user/attilio/vmcontention/sys/dev/ipw/if_ipwvar.h
  user/attilio/vmcontention/sys/dev/iwi/if_iwi.c
  user/attilio/vmcontention/sys/dev/ixgb/if_ixgb.c
  user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c
  user/attilio/vmcontention/sys/dev/ixgbe/ixv.c
  user/attilio/vmcontention/sys/dev/lmc/if_lmc.c
  user/attilio/vmcontention/sys/dev/mfi/mfi_pci.c
  user/attilio/vmcontention/sys/dev/mge/if_mge.c
  user/attilio/vmcontention/sys/dev/mlx/mlx_pci.c
  user/attilio/vmcontention/sys/dev/mly/mly.c
  user/attilio/vmcontention/sys/dev/mps/mps_pci.c
  user/attilio/vmcontention/sys/dev/mxge/if_mxge.c
  user/attilio/vmcontention/sys/dev/nve/if_nve.c
  user/attilio/vmcontention/sys/dev/patm/if_patm_attach.c
  user/attilio/vmcontention/sys/dev/pci/pci.c
  user/attilio/vmcontention/sys/dev/pci/pci_private.h
  user/attilio/vmcontention/sys/dev/pci/pcireg.h
  user/attilio/vmcontention/sys/dev/pci/pcivar.h
  user/attilio/vmcontention/sys/dev/safe/safe.c
  user/attilio/vmcontention/sys/dev/trm/trm.c
  user/attilio/vmcontention/sys/dev/twa/tw_osl.h
  user/attilio/vmcontention/sys/dev/twa/tw_osl_freebsd.c
  user/attilio/vmcontention/sys/dev/twe/twe_freebsd.c
  user/attilio/vmcontention/sys/dev/tws/tws.c
  user/attilio/vmcontention/sys/dev/ubsec/ubsec.c
  user/attilio/vmcontention/sys/dev/usb/serial/u3g.c
  user/attilio/vmcontention/sys/dev/usb/usbdevs
  user/attilio/vmcontention/sys/dev/wds/wd7000.c
  user/attilio/vmcontention/sys/dev/wtap/if_wtap.c
  user/attilio/vmcontention/sys/dev/xen/blkfront/blkfront.c
  user/attilio/vmcontention/sys/fs/cd9660/cd9660_vnops.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_alloc.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_dinode.h
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_inode_cnv.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_vfsops.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_vnops.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2fs.h
  user/attilio/vmcontention/sys/fs/ext2fs/inode.h
  user/attilio/vmcontention/sys/fs/fdescfs/fdesc_vfsops.c
  user/attilio/vmcontention/sys/fs/fifofs/fifo_vnops.c
  user/attilio/vmcontention/sys/fs/nfs/nfsport.h
  user/attilio/vmcontention/sys/fs/nullfs/null_vfsops.c
  user/attilio/vmcontention/sys/fs/portalfs/portal_vfsops.c
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c
  user/attilio/vmcontention/sys/fs/udf/udf_vnops.c
  user/attilio/vmcontention/sys/fs/unionfs/union_subr.c
  user/attilio/vmcontention/sys/fs/unionfs/union_vfsops.c
  user/attilio/vmcontention/sys/geom/part/g_part_bsd.c
  user/attilio/vmcontention/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  user/attilio/vmcontention/sys/i386/acpica/acpi_wakeup.c
  user/attilio/vmcontention/sys/i386/i386/exception.s
  user/attilio/vmcontention/sys/i386/i386/machdep.c
  user/attilio/vmcontention/sys/i386/i386/trap.c
  user/attilio/vmcontention/sys/i386/include/intr_machdep.h
  user/attilio/vmcontention/sys/i386/linux/linux_dummy.c
  user/attilio/vmcontention/sys/i386/linux/linux_proto.h
  user/attilio/vmcontention/sys/i386/linux/linux_syscall.h
  user/attilio/vmcontention/sys/i386/linux/linux_syscalls.c
  user/attilio/vmcontention/sys/i386/linux/linux_sysent.c
  user/attilio/vmcontention/sys/i386/linux/linux_systrace_args.c
  user/attilio/vmcontention/sys/i386/linux/syscalls.master
  user/attilio/vmcontention/sys/kern/imgact_elf.c
  user/attilio/vmcontention/sys/kern/kern_clock.c
  user/attilio/vmcontention/sys/kern/kern_clocksource.c
  user/attilio/vmcontention/sys/kern/kern_cpu.c
  user/attilio/vmcontention/sys/kern/kern_descrip.c
  user/attilio/vmcontention/sys/kern/kern_exec.c
  user/attilio/vmcontention/sys/kern/kern_exit.c
  user/attilio/vmcontention/sys/kern/kern_intr.c
  user/attilio/vmcontention/sys/kern/kern_kthread.c
  user/attilio/vmcontention/sys/kern/kern_racct.c
  user/attilio/vmcontention/sys/kern/kern_thr.c
  user/attilio/vmcontention/sys/kern/sched_4bsd.c
  user/attilio/vmcontention/sys/kern/sched_ule.c
  user/attilio/vmcontention/sys/kern/subr_acl_nfs4.c
  user/attilio/vmcontention/sys/kern/subr_acl_posix1e.c
  user/attilio/vmcontention/sys/kern/sys_capability.c
  user/attilio/vmcontention/sys/kern/sys_pipe.c
  user/attilio/vmcontention/sys/kern/vfs_mount.c
  user/attilio/vmcontention/sys/kern/vfs_subr.c
  user/attilio/vmcontention/sys/kern/vfs_syscalls.c
  user/attilio/vmcontention/sys/kern/vfs_vnops.c
  user/attilio/vmcontention/sys/mips/adm5120/adm5120_machdep.c
  user/attilio/vmcontention/sys/mips/adm5120/std.adm5120
  user/attilio/vmcontention/sys/mips/alchemy/alchemy_machdep.c
  user/attilio/vmcontention/sys/mips/alchemy/std.alchemy
  user/attilio/vmcontention/sys/mips/atheros/apb.c
  user/attilio/vmcontention/sys/mips/atheros/ar71xx_machdep.c
  user/attilio/vmcontention/sys/mips/atheros/if_arge.c
  user/attilio/vmcontention/sys/mips/atheros/std.ar71xx
  user/attilio/vmcontention/sys/mips/cavium/ciu.c
  user/attilio/vmcontention/sys/mips/cavium/files.octeon1
  user/attilio/vmcontention/sys/mips/cavium/if_octm.c
  user/attilio/vmcontention/sys/mips/cavium/obio.c
  user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-rgmii.c
  user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-rx.c
  user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-spi.c
  user/attilio/vmcontention/sys/mips/cavium/octe/ethernet.c
  user/attilio/vmcontention/sys/mips/cavium/octe/wrapper-cvmx-includes.h
  user/attilio/vmcontention/sys/mips/cavium/octeon_gpio.c
  user/attilio/vmcontention/sys/mips/cavium/octeon_machdep.c
  user/attilio/vmcontention/sys/mips/cavium/octeon_mp.c
  user/attilio/vmcontention/sys/mips/cavium/octeon_wdog.c
  user/attilio/vmcontention/sys/mips/cavium/octopci.c
  user/attilio/vmcontention/sys/mips/cavium/uart_dev_oct16550.c
  user/attilio/vmcontention/sys/mips/cavium/usb/octusb_octeon.c
  user/attilio/vmcontention/sys/mips/conf/AR71XX_BASE
  user/attilio/vmcontention/sys/mips/conf/AR91XX_BASE
  user/attilio/vmcontention/sys/mips/conf/MALTA
  user/attilio/vmcontention/sys/mips/conf/MALTA64
  user/attilio/vmcontention/sys/mips/conf/OCTEON1
  user/attilio/vmcontention/sys/mips/conf/PB92
  user/attilio/vmcontention/sys/mips/conf/SWARM
  user/attilio/vmcontention/sys/mips/conf/SWARM64
  user/attilio/vmcontention/sys/mips/conf/SWARM64_SMP
  user/attilio/vmcontention/sys/mips/conf/SWARM_SMP
  user/attilio/vmcontention/sys/mips/conf/XLP
  user/attilio/vmcontention/sys/mips/conf/XLP64
  user/attilio/vmcontention/sys/mips/conf/XLPN32
  user/attilio/vmcontention/sys/mips/conf/XLR
  user/attilio/vmcontention/sys/mips/conf/XLR64
  user/attilio/vmcontention/sys/mips/conf/XLRN32
  user/attilio/vmcontention/sys/mips/idt/idt_machdep.c
  user/attilio/vmcontention/sys/mips/idt/std.idt
  user/attilio/vmcontention/sys/mips/include/_bus.h
  user/attilio/vmcontention/sys/mips/include/bus.h
  user/attilio/vmcontention/sys/mips/include/cache.h
  user/attilio/vmcontention/sys/mips/include/cpufunc.h
  user/attilio/vmcontention/sys/mips/include/frame.h
  user/attilio/vmcontention/sys/mips/include/hwfunc.h
  user/attilio/vmcontention/sys/mips/include/md_var.h
  user/attilio/vmcontention/sys/mips/include/pmap.h
  user/attilio/vmcontention/sys/mips/include/proc.h
  user/attilio/vmcontention/sys/mips/include/trap.h
  user/attilio/vmcontention/sys/mips/malta/malta_machdep.c
  user/attilio/vmcontention/sys/mips/malta/std.malta
  user/attilio/vmcontention/sys/mips/mips/bus_space_generic.c
  user/attilio/vmcontention/sys/mips/mips/cache.c
  user/attilio/vmcontention/sys/mips/mips/cache_mipsNN.c
  user/attilio/vmcontention/sys/mips/mips/cpu.c
  user/attilio/vmcontention/sys/mips/mips/exception.S
  user/attilio/vmcontention/sys/mips/mips/freebsd32_machdep.c
  user/attilio/vmcontention/sys/mips/mips/machdep.c
  user/attilio/vmcontention/sys/mips/mips/nexus.c
  user/attilio/vmcontention/sys/mips/mips/pm_machdep.c
  user/attilio/vmcontention/sys/mips/mips/support.S
  user/attilio/vmcontention/sys/mips/mips/swtch.S
  user/attilio/vmcontention/sys/mips/mips/sys_machdep.c
  user/attilio/vmcontention/sys/mips/mips/tick.c
  user/attilio/vmcontention/sys/mips/mips/vm_machdep.c
  user/attilio/vmcontention/sys/mips/nlm/tick.c
  user/attilio/vmcontention/sys/mips/nlm/xlp_machdep.c
  user/attilio/vmcontention/sys/mips/rmi/tick.c
  user/attilio/vmcontention/sys/mips/rmi/xlr_machdep.c
  user/attilio/vmcontention/sys/mips/rt305x/rt305x_machdep.c
  user/attilio/vmcontention/sys/mips/rt305x/std.rt305x
  user/attilio/vmcontention/sys/mips/sentry5/s5_machdep.c
  user/attilio/vmcontention/sys/mips/sentry5/std.sentry5
  user/attilio/vmcontention/sys/mips/sibyte/sb_machdep.c
  user/attilio/vmcontention/sys/modules/Makefile
  user/attilio/vmcontention/sys/modules/netgraph/netflow/Makefile
  user/attilio/vmcontention/sys/modules/ralfw/Makefile
  user/attilio/vmcontention/sys/net/netmap_user.h
  user/attilio/vmcontention/sys/net80211/ieee80211_radiotap.c
  user/attilio/vmcontention/sys/netgraph/netflow/netflow.c
  user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.c
  user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.h
  user/attilio/vmcontention/sys/netgraph/ng_vlan.c
  user/attilio/vmcontention/sys/netgraph/ng_vlan.h
  user/attilio/vmcontention/sys/netinet/ip_fw.h
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw2.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_private.h
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_sockopt.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_table.c
  user/attilio/vmcontention/sys/netinet/sctp_bsd_addr.c
  user/attilio/vmcontention/sys/netinet/sctp_peeloff.c
  user/attilio/vmcontention/sys/nfsclient/nfs_vnops.c
  user/attilio/vmcontention/sys/powerpc/include/endian.h
  user/attilio/vmcontention/sys/sparc64/include/endian.h
  user/attilio/vmcontention/sys/sys/cpuset.h
  user/attilio/vmcontention/sys/sys/mount.h
  user/attilio/vmcontention/sys/sys/sched.h
  user/attilio/vmcontention/sys/sys/systm.h
  user/attilio/vmcontention/sys/sys/unistd.h
  user/attilio/vmcontention/sys/sys/vnode.h
  user/attilio/vmcontention/sys/ufs/ffs/ffs_inode.c
  user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c
  user/attilio/vmcontention/sys/ufs/ffs/ffs_vnops.c
  user/attilio/vmcontention/sys/ufs/ufs/ufs_extattr.c
  user/attilio/vmcontention/sys/ufs/ufs/ufs_vnops.c
  user/attilio/vmcontention/sys/vm/vnode_pager.c
  user/attilio/vmcontention/sys/x86/include/endian.h
  user/attilio/vmcontention/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c
  user/attilio/vmcontention/tools/tools/wtap/vis_map/Makefile
  user/attilio/vmcontention/tools/tools/wtap/wtap/Makefile
  user/attilio/vmcontention/usr.bin/netstat/Makefile
  user/attilio/vmcontention/usr.sbin/Makefile.arm
  user/attilio/vmcontention/usr.sbin/Makefile.mips
  user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile
  user/attilio/vmcontention/usr.sbin/crashinfo/crashinfo.sh
  user/attilio/vmcontention/usr.sbin/crunch/crunchide/Makefile
  user/attilio/vmcontention/usr.sbin/diskinfo/diskinfo.c
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-networking.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/startautoinstall.sh
  user/attilio/vmcontention/usr.sbin/watch/watch.c
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/contrib/gdb/   (props changed)
  user/attilio/vmcontention/contrib/llvm/   (props changed)
  user/attilio/vmcontention/contrib/llvm/tools/clang/   (props changed)
  user/attilio/vmcontention/contrib/ntp/   (props changed)
  user/attilio/vmcontention/contrib/tnftp/   (props changed)
  user/attilio/vmcontention/contrib/top/   (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/sbin/ipfw/   (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)
  user/attilio/vmcontention/sys/contrib/octeon-sdk/   (props changed)
  user/attilio/vmcontention/sys/contrib/pf/   (props changed)

Modified: user/attilio/vmcontention/Makefile
==============================================================================
--- user/attilio/vmcontention/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -18,6 +18,7 @@
 # reinstallkernel.debug
 # kernel              - buildkernel + installkernel.
 # kernel-toolchain    - Builds the subset of world necessary to build a kernel
+# kernel-toolchains   - Build kernel-toolchain for all universe targets.
 # doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree(s).
 # check-old           - List obsolete directories/files/libraries.
@@ -317,6 +318,9 @@ tinderbox:
 toolchains:
 	@cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
 
+kernel-toolchains:
+	@cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+
 #
 # universe
 #

Modified: user/attilio/vmcontention/ObsoleteFiles.inc
==============================================================================
--- user/attilio/vmcontention/ObsoleteFiles.inc	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/ObsoleteFiles.inc	Wed Mar 14 00:41:37 2012	(r232952)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120309: Remove fifofs header files.
+OLD_FILES+=usr/include/fs/fifofs/fifo.h
+OLD_DIRS+=usr/include/fs/fifofs
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
@@ -417,6 +420,9 @@ OLD_FILES+=usr/share/man/man5/lastlog.5.
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
+.if ${TARGET_ARCH} == "amd64"
+OLB_LIBS+=usr/lib32/libutil.so.8
+.endif
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed

Modified: user/attilio/vmcontention/bin/ps/ps.1
==============================================================================
--- user/attilio/vmcontention/bin/ps/ps.1	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/bin/ps/ps.1	Wed Mar 14 00:41:37 2012	(r232952)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2011
+.Dd March 8, 2012
 .Dt PS 1
 .Os
 .Sh NAME
@@ -317,6 +317,7 @@ the include file
 .It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000	Threads should suspend at user boundary"
 .It Dv "P_HWPMC" Ta No "0x800000	Process is using HWPMCs"
 .It Dv "P_JAILED" Ta No "0x1000000	Process is in jail"
+.It Dv "P_ORPHAN" Ta No "0x2000000	Orphaned by original parent, reparented to debugger"
 .It Dv "P_INEXEC" Ta No "0x4000000	Process is in execve()"
 .It Dv "P_STATCHILD" Ta No "0x8000000	Child process stopped or exited"
 .It Dv "P_INMEM" Ta No "0x10000000	Loaded into memory"

Modified: user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -205,6 +205,8 @@ static struct core_fns mipsfbsd_elfcore_
  * 0x7ffeffec    sigcode       -> 44 bytes
  *
  * 0x7ffeffc4    sigcode end   env strings etc start
+ *
+ * XXX This is out-of-date and varies by ABI.
  */
 #define MIPS_FBSD_SIGTRAMP_START           (0x7ffeffc4)
 #define MIPS_FBSD_SIGTRAMP_END             (0x7ffeffec)

Modified: user/attilio/vmcontention/contrib/gdb/gdb/target.c
==============================================================================
--- user/attilio/vmcontention/contrib/gdb/gdb/target.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/gdb/gdb/target.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -1425,6 +1425,13 @@ target_resize_to_sections (struct target
 	      (*t)->to_sections_end = target->to_sections_end;
 	    }
 	}
+      /* There is a flattened view of the target stack in current_target,
+	 so its to_sections pointer might also need updating. */
+      if (current_target.to_sections == old_value)
+	{
+	  current_target.to_sections = target->to_sections;
+	  current_target.to_sections_end = target->to_sections_end;
+	}
     }
   
   return old_count;

Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Mar 14 00:41:37 2012	(r232952)
@@ -1583,23 +1583,26 @@ bool X86TargetInfo::setFeatureEnabled(ll
       (Name != "sse4" && Name != "sse4.2" && Name != "sse4.1"))
     return false;
 
+  // FIXME: this should probably use a switch with fall through.
+
   if (Enabled) {
     if (Name == "mmx")
       Features["mmx"] = true;
     else if (Name == "sse")
-      Features["sse"] = true;
+      Features["mmx"] = Features["sse"] = true;
     else if (Name == "sse2")
-      Features["sse"] = Features["sse2"] = true;
+      Features["mmx"] = Features["sse"] = Features["sse2"] = true;
     else if (Name == "sse3")
-      Features["sse"] = Features["sse2"] = Features["sse3"] = true;
+      Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
+        true;
     else if (Name == "ssse3")
-      Features["sse"] = Features["sse2"] = Features["sse3"] =
+      Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
         Features["ssse3"] = true;
     else if (Name == "sse4" || Name == "sse4.2")
-      Features["sse"] = Features["sse2"] = Features["sse3"] =
+      Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
         Features["ssse3"] = Features["sse41"] = Features["sse42"] = true;
     else if (Name == "sse4.1")
-      Features["sse"] = Features["sse2"] = Features["sse3"] =
+      Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
         Features["ssse3"] = Features["sse41"] = true;
     else if (Name == "3dnow")
       Features["mmx"] = Features["3dnow"] = true;
@@ -1608,10 +1611,11 @@ bool X86TargetInfo::setFeatureEnabled(ll
     else if (Name == "aes")
       Features["aes"] = true;
     else if (Name == "avx")
-      Features["avx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
-        Features["ssse3"] = Features["sse41"] = Features["sse42"] = true;
+      Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =
+        Features["ssse3"] = Features["sse41"] = Features["sse42"] =
+        Features["avx"] = true;
     else if (Name == "sse4a")
-      Features["sse4a"] = true;
+      Features["mmx"] = Features["sse4a"] = true;
   } else {
     if (Name == "mmx")
       Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false;
@@ -3779,13 +3783,32 @@ TargetInfo *TargetInfo::CreateTargetInfo
   Target->getDefaultFeatures(Features);
 
   // Apply the user specified deltas.
+  // First the enables.
   for (std::vector<std::string>::const_iterator it = Opts.Features.begin(),
          ie = Opts.Features.end(); it != ie; ++it) {
     const char *Name = it->c_str();
 
+    if (Name[0] != '+')
+      continue;
+
+    // Apply the feature via the target.
+    if (!Target->setFeatureEnabled(Features, Name + 1, true)) {
+      Diags.Report(diag::err_target_invalid_feature) << Name;
+      return 0;
+    }
+  }
+
+  // Then the disables.
+  for (std::vector<std::string>::const_iterator it = Opts.Features.begin(),
+         ie = Opts.Features.end(); it != ie; ++it) {
+    const char *Name = it->c_str();
+
+    if (Name[0] == '+')
+      continue;
+
     // Apply the feature via the target.
-    if ((Name[0] != '-' && Name[0] != '+') ||
-        !Target->setFeatureEnabled(Features, Name + 1, (Name[0] == '+'))) {
+    if (Name[0] != '-' ||
+        !Target->setFeatureEnabled(Features, Name + 1, false)) {
       Diags.Report(diag::err_target_invalid_feature) << Name;
       return 0;
     }

Modified: user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c
==============================================================================
--- user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -646,12 +646,6 @@ local_clock(
 			    msyslog(LOG_NOTICE,
 			    "kernel time sync error %04x", ntv.status);
 			ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME);
-		} else {
-			if ((ntv.status ^ pll_status) & ~STA_FLL)
-				NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
-				    msyslog(LOG_NOTICE,
-				    "kernel time sync status change %04x",
-				    ntv.status);
 		}
 		pll_status = ntv.status;
 #ifdef STA_NANO

Modified: user/attilio/vmcontention/contrib/tnftp/src/main.c
==============================================================================
--- user/attilio/vmcontention/contrib/tnftp/src/main.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/tnftp/src/main.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -146,9 +146,8 @@ main(int volatile argc, char **volatile 
 	struct passwd *pw;
 	char *cp, *ep, *anonpass, *upload_path, *src_addr;
 	const char *anonuser;
-	int dumbterm, s, isupload;
+	int dumbterm, isupload;
 	size_t len;
-	socklen_t slen;
 
 	tzset();
 #if 0	/* tnftp */	/* XXX */
@@ -213,35 +212,6 @@ main(int volatile argc, char **volatile 
 	if (cp != NULL && strlcpy(netrc, cp, sizeof(netrc)) >= sizeof(netrc))
 		errx(1, "$NETRC `%s': %s", cp, strerror(ENAMETOOLONG));
 
-	/*
-	 * Get the default socket buffer sizes if we don't already have them.
-	 * It doesn't matter which socket we do this to, because on the first
-	 * call no socket buffer sizes will have been modified, so we are
-	 * guaranteed to get the system defaults.
-	 */
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s == -1)
-		err(1, "Can't create socket to determine default socket sizes");
-	slen = sizeof(rcvbuf_size);
-	if (getsockopt(s, SOL_SOCKET, SO_RCVBUF,
-	    (void *)&rcvbuf_size, &slen) == -1)
-		err(1, "Unable to get default rcvbuf size");
-	slen = sizeof(sndbuf_size);
-	if (getsockopt(s, SOL_SOCKET, SO_SNDBUF,
-	    (void *)&sndbuf_size, &slen) == -1)
-		err(1, "Unable to get default sndbuf size");
-	(void)close(s);
-					/* sanity check returned buffer sizes */
-	if (rcvbuf_size <= 0)
-		rcvbuf_size = 8 * 1024;
-	if (sndbuf_size <= 0)
-		sndbuf_size = 8 * 1024;
-
-	if (sndbuf_size > 8 * 1024 * 1024)
-		sndbuf_size = 8 * 1024 * 1024;
-	if (rcvbuf_size > 8 * 1024 * 1024)
-		rcvbuf_size = 8 * 1024 * 1024;
-
 	marg_sl = ftp_sl_init();
 	if ((tmpdir = getenv("TMPDIR")) == NULL)
 		tmpdir = _PATH_TMP;

Modified: user/attilio/vmcontention/contrib/tnftp/src/util.c
==============================================================================
--- user/attilio/vmcontention/contrib/tnftp/src/util.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/tnftp/src/util.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -1060,6 +1060,32 @@ strsuftoi(const char *arg)
 void
 setupsockbufsize(int sock)
 {
+	socklen_t slen;
+
+	if (0 == rcvbuf_size) {
+		slen = sizeof(rcvbuf_size);
+		if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF,
+		    (void *)&rcvbuf_size, &slen) == -1)
+			err(1, "Unable to determine rcvbuf size");
+		if (rcvbuf_size <= 0)
+			rcvbuf_size = 8 * 1024;
+		if (rcvbuf_size > 8 * 1024 * 1024)
+			rcvbuf_size = 8 * 1024 * 1024;
+		DPRINTF("setupsockbufsize: rcvbuf_size determined as %d\n",
+		    rcvbuf_size);
+	}
+	if (0 == sndbuf_size) {
+		slen = sizeof(sndbuf_size);
+		if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF,
+		    (void *)&sndbuf_size, &slen) == -1)
+			err(1, "Unable to determine sndbuf size");
+		if (sndbuf_size <= 0)
+			sndbuf_size = 8 * 1024;
+		if (sndbuf_size > 8 * 1024 * 1024)
+			sndbuf_size = 8 * 1024 * 1024;
+		DPRINTF("setupsockbufsize: sndbuf_size determined as %d\n",
+		    sndbuf_size);
+	}
 
 	if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF,
 	    (void *)&sndbuf_size, sizeof(sndbuf_size)) == -1)

Modified: user/attilio/vmcontention/contrib/top/top.c
==============================================================================
--- user/attilio/vmcontention/contrib/top/top.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/contrib/top/top.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -723,6 +723,10 @@ restart:
 	    if (!interactive)
 	    {
 		sleep(delay);
+		if (leaveflag) {
+		    end_screen();
+		    exit(0);
+		}
 	    }
 	    else while (no_command)
 	    {

Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+#
+# XXX Should set DEFAULT_BFD_VEC based on target.
+#
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= mipsfbsd-nat.c fbsd-threads.c
 .endif

Modified: user/attilio/vmcontention/include/Makefile
==============================================================================
--- user/attilio/vmcontention/include/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/include/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -43,7 +43,7 @@ LSUBDIRS=	cam/ata cam/scsi \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
 	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
-	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \
+	fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/mountver geom/multipath geom/nop \

Modified: user/attilio/vmcontention/include/xlocale/_ctype.h
==============================================================================
--- user/attilio/vmcontention/include/xlocale/_ctype.h	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/include/xlocale/_ctype.h	Wed Mar 14 00:41:37 2012	(r232952)
@@ -68,19 +68,24 @@ _RuneLocale	*__runes_for_locale(locale_t
 #endif /* _XLOCALE_INLINE */
 
 #ifdef _XLOCALE_WCTYPES
-static __inline int
-__maskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale)
+_XLOCALE_INLINE int
+__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
+_XLOCALE_INLINE int
+__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
+
+_XLOCALE_INLINE int
+__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
 {
-	int mb_sb_limit;
-	_RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit);
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___runetype_l(_c, locale) :
-	       runes->__runetype[_c] & _f;
+	int __limit;
+	_RuneLocale *runes = __runes_for_locale(__loc, &__limit);
+	return (__c < 0 || __c >= _CACHED_RUNES) ? ___runetype_l(__c, __loc) :
+	       runes->__runetype[__c] & __f;
 }
 
-static __inline int
-__istype_l(__ct_rune_t _c, unsigned long _f, locale_t locale)
+_XLOCALE_INLINE int
+__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
 {
-	return (!!__maskrune_l(_c, _f, locale));
+	return (!!__maskrune_l(__c, __f, __loc));
 }
 
 #define XLOCALE_ISCTYPE(fname, cat) \
@@ -88,25 +93,30 @@ __istype_l(__ct_rune_t _c, unsigned long
 		_XLOCALE_INLINE int isw##fname##_l(int __c, locale_t __l)\
 		{ return __istype_l(__c, cat, __l); }
 #else
-static __inline int
-__sbmaskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale)
+_XLOCALE_INLINE int
+__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
+_XLOCALE_INLINE int
+__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
+
+_XLOCALE_INLINE int
+__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
 {
-	int mb_sb_limit;
-	_RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit);
-	return (_c < 0 || _c >= mb_sb_limit) ? 0 :
-	       runes->__runetype[_c] & _f;
+	int __limit;
+	_RuneLocale *runes = __runes_for_locale(__loc, &__limit);
+	return (__c < 0 || __c >= __limit) ? 0 :
+	       runes->__runetype[__c] & __f;
 }
 
-static __inline int
-__sbistype_l(__ct_rune_t _c, unsigned long _f, locale_t locale)
+_XLOCALE_INLINE int
+__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
 {
-	return (!!__sbmaskrune_l(_c, _f, locale));
+	return (!!__sbmaskrune_l(__c, __f, __loc));
 }
 
-#define XLOCALE_ISCTYPE(fname, cat) \
-		_XLOCALE_INLINE int is##fname##_l(int c, locale_t l); \
-		_XLOCALE_INLINE int is##fname##_l(int c, locale_t l)\
-		{ return __sbistype_l(c, cat, l); }
+#define XLOCALE_ISCTYPE(__fname, __cat) \
+		_XLOCALE_INLINE int is##__fname##_l(int, locale_t); \
+		_XLOCALE_INLINE int is##__fname##_l(int __c, locale_t __l)\
+		{ return __sbistype_l(__c, __cat, __l); }
 #endif
 
 XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_D)
@@ -136,15 +146,15 @@ _XLOCALE_INLINE int towupper_l(int, loca
 
 _XLOCALE_INLINE int towlower_l(int __c, locale_t __l)
 {
-	int mb_sb_limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &mb_sb_limit);
+	int __limit;
+	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
 	return (__c < 0 || __c >= _CACHED_RUNES) ? ___tolower_l(__c, __l) :
 	       __runes->__maplower[__c];
 }
 _XLOCALE_INLINE int towupper_l(int __c, locale_t __l)
 {
-	int mb_sb_limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &mb_sb_limit);
+	int __limit;
+	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
 	return (__c < 0 || __c >= _CACHED_RUNES) ? ___toupper_l(__c, __l) :
 	       __runes->__mapupper[__c];
 }

Modified: user/attilio/vmcontention/lib/csu/Makefile.inc
==============================================================================
--- user/attilio/vmcontention/lib/csu/Makefile.inc	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/Makefile.inc	Wed Mar 14 00:41:37 2012	(r232952)
@@ -2,4 +2,6 @@
 
 SSP_CFLAGS=
 
+SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/'
+
 .include "../Makefile.inc"

Modified: user/attilio/vmcontention/lib/csu/amd64/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/csu/amd64/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/amd64/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -19,21 +19,21 @@ CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 crt1.s: crt1.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1.o: crt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s
 
 gcrt1.s: crt1.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 gcrt1.o: gcrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s
 
 Scrt1.s: crt1.c
 	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 Scrt1.o: Scrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s

Modified: user/attilio/vmcontention/lib/csu/amd64/crt1.c
==============================================================================
--- user/attilio/vmcontention/lib/csu/amd64/crt1.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/amd64/crt1.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -37,16 +37,10 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 #include "crtbrand.c"
-
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
+#include "ignore_init.c"
 
 typedef void (*fptr)(void);
 
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
-
 #ifdef GCRT
 extern void _mcleanup(void);
 extern void monstartup(void *, void *);
@@ -54,9 +48,6 @@ extern int eprol;
 extern int etext;
 #endif
 
-char **environ;
-const char *__progname = "";
-
 void _start(char **, void (*)(void));
 
 /* The entry function. */
@@ -66,18 +57,13 @@ _start(char **ap, void (*cleanup)(void))
 	int argc;
 	char **argv;
 	char **env;
-	const char *s;
 
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env = ap + 2 + argc;
 	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
+	if (argc > 0 && argv[0] != NULL)
+		handle_progname(argv[0]);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
@@ -86,12 +72,10 @@ _start(char **ap, void (*cleanup)(void))
 
 #ifdef GCRT
 	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
 	monstartup(&eprol, &etext);
 __asm__("eprol:");
 #endif
-	_init();
-	exit( main(argc, argv, env) );
+
+	handle_static_init(argc, argv, env);
+	exit(main(argc, argv, env));
 }

Modified: user/attilio/vmcontention/lib/csu/arm/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/csu/arm/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/arm/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -18,21 +18,21 @@ CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 crt1.s: crt1.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1.o: crt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s
 
 gcrt1.s: crt1.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 gcrt1.o: gcrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s
 
 Scrt1.s: crt1.c
 	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 Scrt1.o: Scrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s

Modified: user/attilio/vmcontention/lib/csu/arm/crt1.c
==============================================================================
--- user/attilio/vmcontention/lib/csu/arm/crt1.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/arm/crt1.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -52,16 +52,11 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 #include "crtbrand.c"
+#include "ignore_init.c"
 
 struct Struct_Obj_Entry;
 struct ps_strings;
 
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
 extern void _start(int, char **, char **, const struct Struct_Obj_Entry *,
     void (*)(void), struct ps_strings *);
 
@@ -72,8 +67,6 @@ extern int eprol;
 extern int etext;
 #endif
 
-char **environ;
-const char *__progname = "";
 struct ps_strings *__ps_strings;
 
 void __start(int, char **, char **, struct ps_strings *,
@@ -104,16 +97,11 @@ void
 __start(int argc, char **argv, char **env, struct ps_strings *ps_strings,
     const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void))
 {
-	const char *s;
 
 	environ = env;
 
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
+	if (argc > 0 && argv[0] != NULL)
+		handle_progname(argv[0]);
 
 	if (ps_strings != (struct ps_strings *)0)
 		__ps_strings = ps_strings;
@@ -124,13 +112,10 @@ __start(int argc, char **argv, char **en
 		_init_tls();
 #ifdef GCRT
 	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
 	monstartup(&eprol, &etext);
 #endif
-	_init();
-	exit( main(argc, argv, env) );
+	handle_static_init(argc, argv, env);
+	exit(main(argc, argv, env));
 }
 
 #ifdef GCRT

Modified: user/attilio/vmcontention/lib/csu/common/crtbrand.c
==============================================================================
--- user/attilio/vmcontention/lib/csu/common/crtbrand.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/common/crtbrand.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -27,10 +27,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-
-#define ABI_VENDOR	"FreeBSD"
-#define ABI_SECTION	".note.ABI-tag"
-#define ABI_NOTETYPE	1
+#include "notes.h"
 
 /*
  * Special ".note" entry specifying the ABI version.  See
@@ -55,15 +52,15 @@ __FBSDID("$FreeBSD$");
  * These steps are done in the invididual Makefiles for each applicable arch.
  */
 static const struct {
-    int32_t	namesz;
-    int32_t	descsz;
-    int32_t	type;
-    char	name[sizeof ABI_VENDOR];
-    int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = {
-    sizeof ABI_VENDOR,
-    sizeof(int32_t),
-    ABI_NOTETYPE,
-    ABI_VENDOR,
-    __FreeBSD_version
+	int32_t	namesz;
+	int32_t	descsz;
+	int32_t	type;
+	char	name[sizeof(NOTE_FREEBSD_VENDOR)];
+	int32_t	desc;
+} abitag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
+	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
+	.descsz = sizeof(int32_t),
+	.type = ABI_NOTETYPE,
+	.name = NOTE_FREEBSD_VENDOR,
+	.desc = __FreeBSD_version
 };

Copied: user/attilio/vmcontention/lib/csu/common/ignore_init.c (from r232948, head/lib/csu/common/ignore_init.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/lib/csu/common/ignore_init.c	Wed Mar 14 00:41:37 2012	(r232952, copy of r232948, head/lib/csu/common/ignore_init.c)
@@ -0,0 +1,114 @@
+/*-
+ * Copyright 2012 Konstantin Belousov <kib at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "notes.h"
+
+extern int main(int, char **, char **);
+
+extern void (*__preinit_array_start[])(int, char **, char **) __hidden;
+extern void (*__preinit_array_end[])(int, char **, char **) __hidden;
+extern void (*__init_array_start[])(int, char **, char **) __hidden;
+extern void (*__init_array_end[])(int, char **, char **) __hidden;
+extern void (*__fini_array_start[])(void) __hidden;
+extern void (*__fini_array_end[])(void) __hidden;
+extern void _fini(void) __hidden;
+extern void _init(void) __hidden;
+
+extern int _DYNAMIC;
+#pragma weak _DYNAMIC
+
+char **environ;
+const char *__progname = "";
+
+static void
+finalizer(void)
+{
+	void (*fn)(void);
+	size_t array_size, n;
+
+	array_size = __fini_array_end - __fini_array_start;
+	for (n = array_size; n > 0; n--) {
+		fn = __fini_array_start[n - 1];
+		if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1)
+			(fn)();
+	}
+	_fini();
+}
+
+static inline void
+handle_static_init(int argc, char **argv, char **env)
+{
+	void (*fn)(int, char **, char **);
+	size_t array_size, n;
+
+	if (&_DYNAMIC != NULL)
+		return;
+
+	atexit(finalizer);
+
+	array_size = __preinit_array_end - __preinit_array_start;
+	for (n = 0; n < array_size; n++) {
+		fn = __preinit_array_start[n];
+		if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1)
+			fn(argc, argv, env);
+	}
+	_init();
+	array_size = __init_array_end - __init_array_start;
+	for (n = 0; n < array_size; n++) {
+		fn = __init_array_start[n];
+		if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1)
+			fn(argc, argv, env);
+	}
+}
+
+static inline void
+handle_progname(const char *v)
+{
+	const char *s;
+
+	__progname = v;
+	for (s = __progname; *s != '\0'; s++) {
+		if (*s == '/')
+			__progname = s + 1;
+	}
+}
+
+static const struct {
+	int32_t	namesz;
+	int32_t	descsz;
+	int32_t	type;
+	char	name[sizeof(NOTE_FREEBSD_VENDOR)];
+	uint32_t desc;
+} crt_noinit_tag __attribute__ ((section (NOTE_SECTION),
+    aligned(4))) __used = {
+	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
+	.descsz = sizeof(uint32_t),
+	.type = CRT_NOINIT_NOTETYPE,
+	.name = NOTE_FREEBSD_VENDOR,
+	.desc = 0
+};

Copied: user/attilio/vmcontention/lib/csu/common/notes.h (from r232948, head/lib/csu/common/notes.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/lib/csu/common/notes.h	Wed Mar 14 00:41:37 2012	(r232952, copy of r232948, head/lib/csu/common/notes.h)
@@ -0,0 +1,38 @@
+/*-
+ * Copyright 2012 Konstantin Belousov <kib at FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	CSU_COMMON_NOTES_H
+#define	CSU_COMMON_NOTES_H
+
+#define NOTE_FREEBSD_VENDOR	"FreeBSD"
+
+#define NOTE_SECTION		".note.tag"
+
+#define ABI_NOTETYPE		1
+#define	CRT_NOINIT_NOTETYPE	2
+
+#endif

Modified: user/attilio/vmcontention/lib/csu/i386-elf/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/csu/i386-elf/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/i386-elf/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -18,7 +18,7 @@ CLEANFILES+=	crt1_c.s gcrt1_c.s Scrt1_c.
 
 gcrt1_c.s: crt1_c.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1_c.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 gcrt1_c.o: gcrt1_c.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1_c.s
@@ -28,7 +28,7 @@ gcrt1.o: gcrt1_c.o crt1_s.o
 
 crt1_c.s: crt1_c.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1_c.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1_c.o: crt1_c.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} crt1_c.s
@@ -39,7 +39,7 @@ crt1.o:	crt1_c.o crt1_s.o
 
 Scrt1_c.s: crt1_c.c
 	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1_c.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 Scrt1_c.o: Scrt1_c.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1_c.s

Modified: user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c
==============================================================================
--- user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -39,15 +39,10 @@ __FBSDID("$FreeBSD$");
 
 #include "libc_private.h"
 #include "crtbrand.c"
-
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
+#include "ignore_init.c"
 
 typedef void (*fptr)(void);
 
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
 extern void _start(char *, ...);
 
 #ifdef GCRT
@@ -57,9 +52,6 @@ extern int eprol;
 extern int etext;
 #endif
 
-char **environ;
-const char *__progname = "";
-
 void _start1(fptr, int, char *[]) __dead2;
 
 /* The entry function, C part. */
@@ -67,16 +59,11 @@ void
 _start1(fptr cleanup, int argc, char *argv[])
 {
 	char **env;
-	const char *s;
 
 	env = argv + argc + 1;
 	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
+	if (argc > 0 && argv[0] != NULL)
+		handle_progname(argv[0]);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
@@ -85,14 +72,12 @@ _start1(fptr cleanup, int argc, char *ar
 
 #ifdef GCRT
 	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
 	monstartup(&eprol, &etext);
 __asm__("eprol:");
 #endif
-	_init();
-	exit( main(argc, argv, env) );
+
+	handle_static_init(argc, argv, env);
+	exit(main(argc, argv, env));
 }
 
 __asm(".hidden	_start1");

Modified: user/attilio/vmcontention/lib/csu/mips/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/csu/mips/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/mips/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -18,21 +18,21 @@ CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 crt1.s: crt1.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1.o: crt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s
 
 gcrt1.s: crt1.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 gcrt1.o: gcrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s
 
 Scrt1.s: crt1.c
 	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 Scrt1.o: Scrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s

Modified: user/attilio/vmcontention/lib/csu/mips/crt1.c
==============================================================================
--- user/attilio/vmcontention/lib/csu/mips/crt1.c	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/mips/crt1.c	Wed Mar 14 00:41:37 2012	(r232952)
@@ -43,17 +43,11 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include "libc_private.h"
 #include "crtbrand.c"
+#include "ignore_init.c"
 
 struct Struct_Obj_Entry;
 struct ps_strings;
 
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-extern void _init(void);
-extern void _fini(void);
-extern int main(int, char **, char **);
-
 #ifdef GCRT
 extern void _mcleanup(void);
 extern void monstartup(void *, void *);
@@ -61,9 +55,6 @@ extern int eprol;
 extern int etext;
 #endif
 
-char **environ;
-const char *__progname = "";
-
 void __start(char **, void (*)(void), struct Struct_Obj_Entry *, struct ps_strings *);
 
 /* The entry function. */
@@ -81,13 +72,8 @@ __start(char **ap,
 	argv = ap + 1;
 	env  = ap + 2 + argc;
 	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		const char *s;
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
+	if (argc > 0 && argv[0] != NULL)
+		handle_progname(argv[0]);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
@@ -96,13 +82,11 @@ __start(char **ap,
 
 #ifdef GCRT
 	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
 	monstartup(&eprol, &etext);
 #endif
-	_init();
-	exit( main(argc, argv, env) );
+
+	handle_static_init(argc, argv, env);
+	exit(main(argc, argv, env));
 }
 
 #ifdef GCRT

Modified: user/attilio/vmcontention/lib/csu/powerpc/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/csu/powerpc/Makefile	Wed Mar 14 00:26:36 2012	(r232951)
+++ user/attilio/vmcontention/lib/csu/powerpc/Makefile	Wed Mar 14 00:41:37 2012	(r232952)
@@ -18,21 +18,21 @@ CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 crt1.s: crt1.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+	sed ${SED_FIX_NOTE} ${.TARGET}
 
 crt1.o: crt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s
 
 gcrt1.s: crt1.c
 	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c

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

More information about the svn-src-user mailing list