svn commit: r283615 - in projects/ifnet: . bin/ps cddl/contrib/opensolaris/cmd/lockstat contrib/ipfilter/tools contrib/llvm/include/llvm/Target contrib/llvm/lib/Analysis contrib/llvm/lib/CodeGen co...

Gleb Smirnoff glebius at FreeBSD.org
Wed May 27 14:16:48 UTC 2015 

Author: glebius
Date: Wed May 27 14:16:42 2015
New Revision: 283615
URL: https://svnweb.freebsd.org/changeset/base/283615

Log:
  Merge head r257698 through r283614.

Added:
  projects/ifnet/contrib/llvm/patches/patch-08-llvm-r230348-arm-fix-bad-ha.diff
     - copied unchanged from r283614, head/contrib/llvm/patches/patch-08-llvm-r230348-arm-fix-bad-ha.diff
  projects/ifnet/contrib/llvm/patches/patch-09-clang-r227115-constantarraytype.diff
     - copied unchanged from r283614, head/contrib/llvm/patches/patch-09-clang-r227115-constantarraytype.diff
  projects/ifnet/sys/amd64/linux/
     - copied from r283614, head/sys/amd64/linux/
  projects/ifnet/sys/amd64/linux32/linux32_vdso.lds.s
     - copied unchanged from r283614, head/sys/amd64/linux32/linux32_vdso.lds.s
  projects/ifnet/sys/arm/conf/YYHD18
     - copied unchanged from r283614, head/sys/arm/conf/YYHD18
  projects/ifnet/sys/arm/qemu/virt_mp.c
     - copied unchanged from r283614, head/sys/arm/qemu/virt_mp.c
  projects/ifnet/sys/boot/fdt/dts/arm/meson3.dtsi
     - copied unchanged from r283614, head/sys/boot/fdt/dts/arm/meson3.dtsi
  projects/ifnet/sys/boot/fdt/dts/arm/yyhd18-m3.dts
     - copied unchanged from r283614, head/sys/boot/fdt/dts/arm/yyhd18-m3.dts
  projects/ifnet/sys/compat/linux/linux.c
     - copied unchanged from r283614, head/sys/compat/linux/linux.c
  projects/ifnet/sys/compat/linux/linux.h
     - copied unchanged from r283614, head/sys/compat/linux/linux.h
  projects/ifnet/sys/compat/linux/linux_common.c
     - copied unchanged from r283614, head/sys/compat/linux/linux_common.c
  projects/ifnet/sys/compat/linux/linux_event.c
     - copied unchanged from r283614, head/sys/compat/linux/linux_event.c
  projects/ifnet/sys/compat/linux/linux_event.h
     - copied unchanged from r283614, head/sys/compat/linux/linux_event.h
  projects/ifnet/sys/compat/linux/linux_vdso.c
     - copied unchanged from r283614, head/sys/compat/linux/linux_vdso.c
  projects/ifnet/sys/compat/linux/linux_vdso.h
     - copied unchanged from r283614, head/sys/compat/linux/linux_vdso.h
  projects/ifnet/sys/dev/sfxge/common/ef10_tlv_layout.h
     - copied unchanged from r283614, head/sys/dev/sfxge/common/ef10_tlv_layout.h
  projects/ifnet/sys/dev/sfxge/common/efx_check.h
     - copied unchanged from r283614, head/sys/dev/sfxge/common/efx_check.h
  projects/ifnet/sys/dev/sfxge/common/efx_crc32.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/efx_crc32.c
  projects/ifnet/sys/dev/sfxge/common/efx_hash.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/efx_hash.c
  projects/ifnet/sys/dev/sfxge/common/efx_phy_ids.h
     - copied unchanged from r283614, head/sys/dev/sfxge/common/efx_phy_ids.h
  projects/ifnet/sys/dev/sfxge/common/hunt_ev.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_ev.c
  projects/ifnet/sys/dev/sfxge/common/hunt_filter.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_filter.c
  projects/ifnet/sys/dev/sfxge/common/hunt_impl.h
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_impl.h
  projects/ifnet/sys/dev/sfxge/common/hunt_intr.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_intr.c
  projects/ifnet/sys/dev/sfxge/common/hunt_mac.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_mac.c
  projects/ifnet/sys/dev/sfxge/common/hunt_mcdi.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_mcdi.c
  projects/ifnet/sys/dev/sfxge/common/hunt_nic.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_nic.c
  projects/ifnet/sys/dev/sfxge/common/hunt_nvram.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_nvram.c
  projects/ifnet/sys/dev/sfxge/common/hunt_phy.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_phy.c
  projects/ifnet/sys/dev/sfxge/common/hunt_rx.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_rx.c
  projects/ifnet/sys/dev/sfxge/common/hunt_sram.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_sram.c
  projects/ifnet/sys/dev/sfxge/common/hunt_tx.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_tx.c
  projects/ifnet/sys/dev/sfxge/common/hunt_vpd.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/hunt_vpd.c
  projects/ifnet/sys/dev/sfxge/common/mcdi_mon.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/mcdi_mon.c
  projects/ifnet/sys/dev/sfxge/common/mcdi_mon.h
     - copied unchanged from r283614, head/sys/dev/sfxge/common/mcdi_mon.h
  projects/ifnet/sys/dev/sfxge/common/siena_mcdi.c
     - copied unchanged from r283614, head/sys/dev/sfxge/common/siena_mcdi.c
  projects/ifnet/sys/dev/sfxge/sfxge_ioc.h
     - copied unchanged from r283614, head/sys/dev/sfxge/sfxge_ioc.h
  projects/ifnet/sys/dev/sfxge/sfxge_nvram.c
     - copied unchanged from r283614, head/sys/dev/sfxge/sfxge_nvram.c
  projects/ifnet/sys/i386/linux/linux_vdso.lds.s
     - copied unchanged from r283614, head/sys/i386/linux/linux_vdso.lds.s
  projects/ifnet/sys/modules/linux64/
     - copied from r283614, head/sys/modules/linux64/
  projects/ifnet/sys/modules/linux_common/
     - copied from r283614, head/sys/modules/linux_common/
  projects/ifnet/usr.bin/kdump/linux32_syscalls.conf
     - copied unchanged from r283614, head/usr.bin/kdump/linux32_syscalls.conf
Deleted:
  projects/ifnet/contrib/llvm/patches/patch-08-llvm-r227089-fix-mips-i128.diff
  projects/ifnet/contrib/llvm/patches/patch-09-llvm-r230058-indirectbrs-assert.diff
  projects/ifnet/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff
  projects/ifnet/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff
  projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff
  projects/ifnet/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
  projects/ifnet/sys/arm/ti/omap4/omap4var.h
  projects/ifnet/sys/dev/sfxge/common/siena_mon.c
  projects/ifnet/tools/regression/file/
Modified:
  projects/ifnet/Makefile.inc1
  projects/ifnet/ObsoleteFiles.inc
  projects/ifnet/UPDATING
  projects/ifnet/bin/ps/Makefile
  projects/ifnet/bin/ps/keyword.c
  projects/ifnet/bin/ps/print.c
  projects/ifnet/bin/ps/ps.1
  projects/ifnet/bin/ps/ps.c
  projects/ifnet/bin/ps/ps.h
  projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
  projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
  projects/ifnet/contrib/ipfilter/tools/ipf.c
  projects/ifnet/contrib/llvm/include/llvm/Target/TargetCallingConv.h
  projects/ifnet/contrib/llvm/include/llvm/Target/TargetLowering.h
  projects/ifnet/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/MachineCopyPropagation.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  projects/ifnet/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
  projects/ifnet/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
  projects/ifnet/contrib/llvm/lib/IR/ConstantFold.cpp
  projects/ifnet/contrib/llvm/lib/IR/GCOV.cpp
  projects/ifnet/contrib/llvm/lib/Support/Unix/Memory.inc
  projects/ifnet/contrib/llvm/lib/Support/Windows/explicit_symbols.inc
  projects/ifnet/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/Mips.td
  projects/ifnet/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/Mips32r6InstrInfo.td
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsCCState.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsCallingConv.td
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp
  projects/ifnet/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPU.td
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.h
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.td
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUInstructions.td
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUIntrinsics.td
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.h
  projects/ifnet/contrib/llvm/lib/Target/R600/CaymanInstructions.td
  projects/ifnet/contrib/llvm/lib/Target/R600/EvergreenInstructions.td
  projects/ifnet/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/Processors.td
  projects/ifnet/contrib/llvm/lib/Target/R600/R600ISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/R600Instructions.td
  projects/ifnet/contrib/llvm/lib/Target/R600/SIAnnotateControlFlow.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIDefines.h
  projects/ifnet/contrib/llvm/lib/Target/R600/SIFoldOperands.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInstrFormats.td
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInstrInfo.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInstrInfo.h
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInstrInfo.td
  projects/ifnet/contrib/llvm/lib/Target/R600/SIInstructions.td
  projects/ifnet/contrib/llvm/lib/Target/R600/SILowerControlFlow.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIRegisterInfo.cpp
  projects/ifnet/contrib/llvm/lib/Target/R600/SIRegisterInfo.h
  projects/ifnet/contrib/llvm/lib/Target/R600/SIRegisterInfo.td
  projects/ifnet/contrib/llvm/lib/Target/R600/VIInstrFormats.td
  projects/ifnet/contrib/llvm/lib/Target/R600/VIInstructions.td
  projects/ifnet/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/X86/X86FrameLowering.h
  projects/ifnet/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/ifnet/contrib/llvm/lib/Target/X86/X86InstrControl.td
  projects/ifnet/contrib/llvm/lib/Target/X86/X86IntrinsicsInfo.h
  projects/ifnet/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
  projects/ifnet/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  projects/ifnet/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
  projects/ifnet/contrib/llvm/patches/README.TXT
  projects/ifnet/contrib/llvm/patches/patch-01-freebsd-kprintf.diff
  projects/ifnet/contrib/llvm/patches/patch-07-llvm-r227752-boot2-shrink.diff
  projects/ifnet/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  projects/ifnet/contrib/llvm/tools/clang/include/clang/Basic/TargetCXXABI.h
  projects/ifnet/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
  projects/ifnet/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
  projects/ifnet/contrib/llvm/tools/clang/include/clang/Sema/Template.h
  projects/ifnet/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/AST/Decl.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  projects/ifnet/contrib/netbsd-tests/lib/libc/string/t_memmem.c
  projects/ifnet/crypto/openssh/moduli
  projects/ifnet/etc/mtree/BSD.debug.dist
  projects/ifnet/etc/mtree/BSD.usr.dist
  projects/ifnet/etc/rc.d/local_unbound
  projects/ifnet/lib/Makefile
  projects/ifnet/lib/clang/include/Makefile
  projects/ifnet/lib/clang/include/clang/Basic/Version.inc
  projects/ifnet/lib/clang/include/clang/Config/config.h
  projects/ifnet/lib/clang/include/llvm/Config/config.h
  projects/ifnet/lib/clang/include/llvm/Config/llvm-config.h
  projects/ifnet/lib/libc/string/memmem.3
  projects/ifnet/lib/libc/string/memmem.c
  projects/ifnet/lib/libclang_rt/Makefile.inc
  projects/ifnet/lib/libiconv_modules/UTF7/citrus_utf7.c
  projects/ifnet/release/Makefile.mirrors
  projects/ifnet/release/i386/make-memstick.sh
  projects/ifnet/sbin/dumpfs/dumpfs.c
  projects/ifnet/share/man/man4/sfxge.4   (contents, props changed)
  projects/ifnet/share/man/man9/sleep.9
  projects/ifnet/share/mk/src.libnames.mk
  projects/ifnet/sys/amd64/amd64/elf_machdep.c
  projects/ifnet/sys/amd64/amd64/machdep.c
  projects/ifnet/sys/amd64/amd64/pmap.c
  projects/ifnet/sys/amd64/ia32/ia32_signal.c
  projects/ifnet/sys/amd64/linux32/linux.h
  projects/ifnet/sys/amd64/linux32/linux32_dummy.c
  projects/ifnet/sys/amd64/linux32/linux32_genassym.c
  projects/ifnet/sys/amd64/linux32/linux32_locore.s
  projects/ifnet/sys/amd64/linux32/linux32_machdep.c
  projects/ifnet/sys/amd64/linux32/linux32_proto.h
  projects/ifnet/sys/amd64/linux32/linux32_syscall.h
  projects/ifnet/sys/amd64/linux32/linux32_syscalls.c
  projects/ifnet/sys/amd64/linux32/linux32_sysent.c
  projects/ifnet/sys/amd64/linux32/linux32_systrace_args.c
  projects/ifnet/sys/amd64/linux32/linux32_sysvec.c
  projects/ifnet/sys/amd64/linux32/syscalls.master
  projects/ifnet/sys/amd64/vmm/vmm.c
  projects/ifnet/sys/amd64/vmm/vmm_instruction_emul.c
  projects/ifnet/sys/arm/arm/autoconf.c
  projects/ifnet/sys/arm/arm/bcopyinout.S
  projects/ifnet/sys/arm/arm/bcopyinout_xscale.S
  projects/ifnet/sys/arm/arm/blockio.S
  projects/ifnet/sys/arm/arm/bus_space_base.c
  projects/ifnet/sys/arm/arm/busdma_machdep-v6.c
  projects/ifnet/sys/arm/arm/busdma_machdep.c
  projects/ifnet/sys/arm/arm/copystr.S
  projects/ifnet/sys/arm/arm/cpu_asm-v6.S
  projects/ifnet/sys/arm/arm/cpufunc.c
  projects/ifnet/sys/arm/arm/cpufunc_asm_arm11x6.S
  projects/ifnet/sys/arm/arm/cpufunc_asm_arm9.S
  projects/ifnet/sys/arm/arm/cpufunc_asm_armv6.S
  projects/ifnet/sys/arm/arm/cpufunc_asm_armv7.S
  projects/ifnet/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/ifnet/sys/arm/arm/cpuinfo.c
  projects/ifnet/sys/arm/arm/db_interface.c
  projects/ifnet/sys/arm/arm/elf_machdep.c
  projects/ifnet/sys/arm/arm/elf_trampoline.c
  projects/ifnet/sys/arm/arm/exception.S
  projects/ifnet/sys/arm/arm/fiq.c
  projects/ifnet/sys/arm/arm/fusu.S
  projects/ifnet/sys/arm/arm/gic.c
  projects/ifnet/sys/arm/arm/intr.c
  projects/ifnet/sys/arm/arm/machdep.c
  projects/ifnet/sys/arm/arm/mp_machdep.c
  projects/ifnet/sys/arm/arm/mpcore_timer.c
  projects/ifnet/sys/arm/arm/nexus.c
  projects/ifnet/sys/arm/arm/physmem.c
  projects/ifnet/sys/arm/arm/pl190.c
  projects/ifnet/sys/arm/arm/pl310.c
  projects/ifnet/sys/arm/arm/pmap-v6-new.c
  projects/ifnet/sys/arm/arm/pmap-v6.c
  projects/ifnet/sys/arm/arm/pmap.c
  projects/ifnet/sys/arm/arm/support.S
  projects/ifnet/sys/arm/arm/swtch.S
  projects/ifnet/sys/arm/arm/trap.c
  projects/ifnet/sys/arm/arm/vfp.c
  projects/ifnet/sys/arm/arm/vm_machdep.c
  projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/ifnet/sys/arm/conf/ALPINE
  projects/ifnet/sys/arm/conf/BEAGLEBONE
  projects/ifnet/sys/arm/conf/CUBIEBOARD
  projects/ifnet/sys/arm/conf/CUBIEBOARD2
  projects/ifnet/sys/arm/conf/DOCKSTAR
  projects/ifnet/sys/arm/conf/DREAMPLUG-1001
  projects/ifnet/sys/arm/conf/EFIKA_MX
  projects/ifnet/sys/arm/conf/EXYNOS5.common
  projects/ifnet/sys/arm/conf/PANDABOARD
  projects/ifnet/sys/arm/conf/RK3188
  projects/ifnet/sys/arm/conf/RPI-B
  projects/ifnet/sys/arm/conf/RPI2
  projects/ifnet/sys/arm/conf/SOCKIT.common
  projects/ifnet/sys/arm/conf/VIRT
  projects/ifnet/sys/arm/conf/VYBRID
  projects/ifnet/sys/arm/conf/ZEDBOARD
  projects/ifnet/sys/arm/include/cpu-v6.h
  projects/ifnet/sys/arm/include/elf.h
  projects/ifnet/sys/arm/include/sysreg.h
  projects/ifnet/sys/arm/qemu/files.qemu
  projects/ifnet/sys/arm/ti/am335x/am335x_lcd.c
  projects/ifnet/sys/arm/ti/omap4/pandaboard/pandaboard.c
  projects/ifnet/sys/boot/fdt/dts/arm/vsatv102-m6.dts
  projects/ifnet/sys/boot/uboot/lib/module.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
  projects/ifnet/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  projects/ifnet/sys/compat/ia32/ia32_sysvec.c
  projects/ifnet/sys/compat/linprocfs/linprocfs.c
  projects/ifnet/sys/compat/linsysfs/linsysfs.c
  projects/ifnet/sys/compat/linux/check_error.d
  projects/ifnet/sys/compat/linux/check_internal_locks.d
  projects/ifnet/sys/compat/linux/linux_emul.c
  projects/ifnet/sys/compat/linux/linux_emul.h
  projects/ifnet/sys/compat/linux/linux_file.c
  projects/ifnet/sys/compat/linux/linux_file.h
  projects/ifnet/sys/compat/linux/linux_fork.c
  projects/ifnet/sys/compat/linux/linux_futex.c
  projects/ifnet/sys/compat/linux/linux_futex.h
  projects/ifnet/sys/compat/linux/linux_getcwd.c
  projects/ifnet/sys/compat/linux/linux_ioctl.c
  projects/ifnet/sys/compat/linux/linux_ioctl.h
  projects/ifnet/sys/compat/linux/linux_ipc.c
  projects/ifnet/sys/compat/linux/linux_ipc.h
  projects/ifnet/sys/compat/linux/linux_mib.c
  projects/ifnet/sys/compat/linux/linux_mib.h
  projects/ifnet/sys/compat/linux/linux_misc.c
  projects/ifnet/sys/compat/linux/linux_misc.h
  projects/ifnet/sys/compat/linux/linux_signal.c
  projects/ifnet/sys/compat/linux/linux_signal.h
  projects/ifnet/sys/compat/linux/linux_socket.c
  projects/ifnet/sys/compat/linux/linux_socket.h
  projects/ifnet/sys/compat/linux/linux_stats.c
  projects/ifnet/sys/compat/linux/linux_sysctl.c
  projects/ifnet/sys/compat/linux/linux_time.c
  projects/ifnet/sys/compat/linux/linux_timer.c
  projects/ifnet/sys/compat/linux/linux_timer.h
  projects/ifnet/sys/compat/linux/linux_uid16.c
  projects/ifnet/sys/compat/linux/linux_util.c
  projects/ifnet/sys/compat/linux/linux_util.h
  projects/ifnet/sys/compat/linux/stats_timing.d
  projects/ifnet/sys/compat/svr4/svr4_sysvec.c
  projects/ifnet/sys/conf/files
  projects/ifnet/sys/conf/files.amd64
  projects/ifnet/sys/conf/files.i386
  projects/ifnet/sys/conf/files.pc98
  projects/ifnet/sys/conf/options.arm
  projects/ifnet/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
  projects/ifnet/sys/ddb/db_command.c
  projects/ifnet/sys/ddb/db_input.c
  projects/ifnet/sys/ddb/db_run.c
  projects/ifnet/sys/ddb/db_watch.c
  projects/ifnet/sys/ddb/db_write_cmd.c
  projects/ifnet/sys/dev/acpi_support/acpi_ibm.c
  projects/ifnet/sys/dev/ath/if_ath.c
  projects/ifnet/sys/dev/ath/if_ath_rx.c
  projects/ifnet/sys/dev/ath/if_ath_rx.h
  projects/ifnet/sys/dev/ath/if_athvar.h
  projects/ifnet/sys/dev/bwi/if_bwi.c
  projects/ifnet/sys/dev/bwn/if_bwn.c
  projects/ifnet/sys/dev/fdt/fdt_common.c
  projects/ifnet/sys/dev/fdt/fdt_common.h
  projects/ifnet/sys/dev/gpio/gpioled.c
  projects/ifnet/sys/dev/if_ndis/if_ndis.c
  projects/ifnet/sys/dev/ipw/if_ipw.c
  projects/ifnet/sys/dev/iwi/if_iwi.c
  projects/ifnet/sys/dev/iwn/if_iwn.c
  projects/ifnet/sys/dev/led/led.c
  projects/ifnet/sys/dev/malo/if_malo.c
  projects/ifnet/sys/dev/mwl/if_mwl.c
  projects/ifnet/sys/dev/ofw/ofw_bus_subr.c
  projects/ifnet/sys/dev/ofw/ofw_bus_subr.h
  projects/ifnet/sys/dev/psci/psci.c
  projects/ifnet/sys/dev/ral/rt2560.c
  projects/ifnet/sys/dev/ral/rt2661.c
  projects/ifnet/sys/dev/ral/rt2860.c
  projects/ifnet/sys/dev/sfxge/common/efsys.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_dma.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_ev.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_intr.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_mcdi.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_port.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_rx.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_rx.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_tx.c   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_tx.h   (contents, props changed)
  projects/ifnet/sys/dev/sfxge/sfxge_version.h
  projects/ifnet/sys/dev/usb/wlan/if_rsu.c
  projects/ifnet/sys/dev/usb/wlan/if_rum.c
  projects/ifnet/sys/dev/usb/wlan/if_run.c
  projects/ifnet/sys/dev/usb/wlan/if_uath.c
  projects/ifnet/sys/dev/usb/wlan/if_upgt.c
  projects/ifnet/sys/dev/usb/wlan/if_ural.c
  projects/ifnet/sys/dev/usb/wlan/if_urtw.c
  projects/ifnet/sys/dev/usb/wlan/if_urtwn.c
  projects/ifnet/sys/dev/usb/wlan/if_zyd.c
  projects/ifnet/sys/dev/wi/if_wi.c
  projects/ifnet/sys/dev/wi/if_wivar.h
  projects/ifnet/sys/dev/wpi/if_wpi.c
  projects/ifnet/sys/dev/wpi/if_wpivar.h
  projects/ifnet/sys/dev/wtap/if_wtap.c
  projects/ifnet/sys/dev/wtap/if_wtapvar.h
  projects/ifnet/sys/dev/wtap/wtap_hal/hal.c
  projects/ifnet/sys/fs/nfsclient/nfs_clrpcops.c
  projects/ifnet/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/ifnet/sys/fs/pseudofs/pseudofs.c
  projects/ifnet/sys/i386/i386/elf_machdep.c
  projects/ifnet/sys/i386/i386/machdep.c
  projects/ifnet/sys/i386/ibcs2/ibcs2_sysvec.c
  projects/ifnet/sys/i386/linux/linux.h
  projects/ifnet/sys/i386/linux/linux_dummy.c
  projects/ifnet/sys/i386/linux/linux_genassym.c
  projects/ifnet/sys/i386/linux/linux_locore.s
  projects/ifnet/sys/i386/linux/linux_machdep.c
  projects/ifnet/sys/i386/linux/linux_proto.h
  projects/ifnet/sys/i386/linux/linux_ptrace.c
  projects/ifnet/sys/i386/linux/linux_syscall.h
  projects/ifnet/sys/i386/linux/linux_syscalls.c
  projects/ifnet/sys/i386/linux/linux_sysent.c
  projects/ifnet/sys/i386/linux/linux_systrace_args.c
  projects/ifnet/sys/i386/linux/linux_sysvec.c
  projects/ifnet/sys/i386/linux/syscalls.master
  projects/ifnet/sys/kern/imgact_aout.c
  projects/ifnet/sys/kern/imgact_elf.c
  projects/ifnet/sys/kern/init_main.c
  projects/ifnet/sys/kern/kern_event.c
  projects/ifnet/sys/kern/kern_exit.c
  projects/ifnet/sys/kern/kern_fork.c
  projects/ifnet/sys/kern/kern_sig.c
  projects/ifnet/sys/kern/kern_thr.c
  projects/ifnet/sys/kern/kern_thread.c
  projects/ifnet/sys/kern/p1003_1b.c
  projects/ifnet/sys/kern/subr_taskqueue.c
  projects/ifnet/sys/kern/subr_trap.c
  projects/ifnet/sys/kern/sys_process.c
  projects/ifnet/sys/kern/vfs_mount.c
  projects/ifnet/sys/kern/vfs_subr.c
  projects/ifnet/sys/kern/vfs_vnops.c
  projects/ifnet/sys/mips/mips/elf_machdep.c
  projects/ifnet/sys/mips/mips/freebsd32_machdep.c
  projects/ifnet/sys/mips/mips/pm_machdep.c
  projects/ifnet/sys/mips/mips/pmap.c
  projects/ifnet/sys/modules/Makefile
  projects/ifnet/sys/modules/linprocfs/Makefile
  projects/ifnet/sys/modules/linsysfs/Makefile
  projects/ifnet/sys/modules/linux/Makefile
  projects/ifnet/sys/modules/pseudofs/Makefile
  projects/ifnet/sys/modules/sfxge/Makefile   (contents, props changed)
  projects/ifnet/sys/net80211/ieee80211.c
  projects/ifnet/sys/net80211/ieee80211.h
  projects/ifnet/sys/net80211/ieee80211_acl.c
  projects/ifnet/sys/net80211/ieee80211_adhoc.c
  projects/ifnet/sys/net80211/ieee80211_amrr.c
  projects/ifnet/sys/net80211/ieee80211_crypto_ccmp.c
  projects/ifnet/sys/net80211/ieee80211_crypto_tkip.c
  projects/ifnet/sys/net80211/ieee80211_crypto_wep.c
  projects/ifnet/sys/net80211/ieee80211_ddb.c
  projects/ifnet/sys/net80211/ieee80211_dfs.c
  projects/ifnet/sys/net80211/ieee80211_freebsd.c
  projects/ifnet/sys/net80211/ieee80211_freebsd.h
  projects/ifnet/sys/net80211/ieee80211_hostap.c
  projects/ifnet/sys/net80211/ieee80211_ht.c
  projects/ifnet/sys/net80211/ieee80211_hwmp.c
  projects/ifnet/sys/net80211/ieee80211_input.c
  projects/ifnet/sys/net80211/ieee80211_input.h
  projects/ifnet/sys/net80211/ieee80211_ioctl.c
  projects/ifnet/sys/net80211/ieee80211_mesh.c
  projects/ifnet/sys/net80211/ieee80211_mesh.h
  projects/ifnet/sys/net80211/ieee80211_monitor.c
  projects/ifnet/sys/net80211/ieee80211_node.c
  projects/ifnet/sys/net80211/ieee80211_output.c
  projects/ifnet/sys/net80211/ieee80211_power.c
  projects/ifnet/sys/net80211/ieee80211_proto.c
  projects/ifnet/sys/net80211/ieee80211_proto.h
  projects/ifnet/sys/net80211/ieee80211_radiotap.c
  projects/ifnet/sys/net80211/ieee80211_ratectl_none.c
  projects/ifnet/sys/net80211/ieee80211_regdomain.c
  projects/ifnet/sys/net80211/ieee80211_rssadapt.c
  projects/ifnet/sys/net80211/ieee80211_scan_sta.c
  projects/ifnet/sys/net80211/ieee80211_scan_sw.c
  projects/ifnet/sys/net80211/ieee80211_sta.c
  projects/ifnet/sys/net80211/ieee80211_superg.c
  projects/ifnet/sys/net80211/ieee80211_tdma.c
  projects/ifnet/sys/net80211/ieee80211_tdma.h
  projects/ifnet/sys/net80211/ieee80211_var.h
  projects/ifnet/sys/net80211/ieee80211_wds.c
  projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/ifnet/sys/ofed/drivers/net/mlx4/port.c
  projects/ifnet/sys/ofed/include/linux/mlx4/device.h
  projects/ifnet/sys/opencrypto/cryptodeflate.c
  projects/ifnet/sys/powerpc/powerpc/elf32_machdep.c
  projects/ifnet/sys/powerpc/powerpc/elf64_machdep.c
  projects/ifnet/sys/powerpc/powerpc/exec_machdep.c
  projects/ifnet/sys/sparc64/sparc64/elf_machdep.c
  projects/ifnet/sys/sparc64/sparc64/machdep.c
  projects/ifnet/sys/sys/file.h
  projects/ifnet/sys/sys/imgact_elf.h
  projects/ifnet/sys/sys/ktr_class.h
  projects/ifnet/sys/sys/param.h
  projects/ifnet/sys/sys/proc.h
  projects/ifnet/sys/sys/sockio.h
  projects/ifnet/sys/sys/syscallsubr.h
  projects/ifnet/sys/sys/sysent.h
  projects/ifnet/sys/sys/systm.h
  projects/ifnet/sys/sys/vnode.h
  projects/ifnet/sys/ufs/ffs/ffs_softdep.c
  projects/ifnet/sys/x86/xen/xenpv.c
  projects/ifnet/tests/sys/kern/ptrace_test.c
  projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/ifnet/usr.bin/kdump/Makefile
  projects/ifnet/usr.bin/kdump/kdump.c
  projects/ifnet/usr.sbin/ntp/Makefile.inc
  projects/ifnet/usr.sbin/ntp/config.h
  projects/ifnet/usr.sbin/ntp/ntp-keygen/Makefile
  projects/ifnet/usr.sbin/ntp/ntpd/Makefile
  projects/ifnet/usr.sbin/ntp/ntpdate/Makefile
  projects/ifnet/usr.sbin/ntp/ntpdc/Makefile
  projects/ifnet/usr.sbin/ntp/ntpq/Makefile
  projects/ifnet/usr.sbin/ntp/sntp/Makefile
  projects/ifnet/usr.sbin/pmcstat/pmcstat.8
  projects/ifnet/usr.sbin/pmcstat/pmcstat.c
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/cddl/   (props changed)
  projects/ifnet/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/contrib/ipfilter/   (props changed)
  projects/ifnet/contrib/llvm/   (props changed)
  projects/ifnet/contrib/llvm/tools/clang/   (props changed)
  projects/ifnet/crypto/openssh/   (props changed)
  projects/ifnet/etc/   (props changed)
  projects/ifnet/lib/libc/   (props changed)
  projects/ifnet/sbin/   (props changed)
  projects/ifnet/share/   (props changed)
  projects/ifnet/share/man/man4/   (props changed)
  projects/ifnet/sys/   (props changed)
  projects/ifnet/sys/amd64/vmm/   (props changed)
  projects/ifnet/sys/boot/   (props changed)
  projects/ifnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/sys/conf/   (props changed)

Modified: projects/ifnet/Makefile.inc1
==============================================================================
--- projects/ifnet/Makefile.inc1	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/Makefile.inc1	Wed May 27 14:16:42 2015	(r283615)
@@ -1755,6 +1755,7 @@ _cddl_lib= cddl/lib
 cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
 cddl/lib/libzfs__L: lib/libgeom__L
 cddl/lib/libctf__L: lib/libz__L
+.endif
 # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
 # on select architectures though (see cddl/lib/Makefile)
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
@@ -1762,7 +1763,6 @@ cddl/lib/libctf__L: lib/libz__L
 	${MACHINE_CPUARCH} == "arm"
 _prebuild_libs+=	lib/libproc lib/librtld_db
 .endif
-.endif
 
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"

Modified: projects/ifnet/ObsoleteFiles.inc
==============================================================================
--- projects/ifnet/ObsoleteFiles.inc	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/ObsoleteFiles.inc	Wed May 27 14:16:42 2015	(r283615)
@@ -38,6 +38,67 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
+OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.6.0/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.0/include/xopintrin.h
+OLD_DIRS+=usr/lib/clang/3.6.0/include
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.6.0/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.6.0/lib
+OLD_DIRS+=usr/lib/clang/3.6.0
 # 20150521
 OLD_FILES+=usr/bin/demandoc
 OLD_FILES+=usr/share/man/man1/demandoc.1.gz

Modified: projects/ifnet/UPDATING
==============================================================================
--- projects/ifnet/UPDATING	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/UPDATING	Wed May 27 14:16:42 2015	(r283615)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150525:
+	Clang and llvm have been upgraded to 3.6.1 release.  Please see the
+	20141231 entry below for information about prerequisites and upgrading,
+	if you are not already using 3.5.0 or higher.
+
 20150521:
 	TI platform code switched to using vendor DTS files and this update
 	may break existing systems running on Beaglebone, Beaglebone Black,

Modified: projects/ifnet/bin/ps/Makefile
==============================================================================
--- projects/ifnet/bin/ps/Makefile	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/Makefile	Wed May 27 14:16:42 2015	(r283615)
@@ -11,6 +11,6 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-LIBADD=	m kvm jail
+LIBADD=	m kvm jail xo
 
 .include <bsd.prog.mk>

Modified: projects/ifnet/bin/ps/keyword.c
==============================================================================
--- projects/ifnet/bin/ps/keyword.c	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/keyword.c	Wed May 27 14:16:42 2015	(r283615)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libxo/xo.h>
 
 #include "ps.h"
 
@@ -64,116 +65,170 @@ static int  vcmp(const void *, const voi
 
 /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
 static VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, 0, CHAR, NULL, 0},
-	{"%mem", "%MEM", NULL, 0, pmem, 0, CHAR, NULL, 0},
-	{"acflag", "ACFLG", NULL, 0, kvar, KOFF(ki_acflag), USHORT, "x", 0},
-	{"acflg", "", "acflag", 0, NULL, 0, CHAR, NULL, 0},
-	{"args", "COMMAND", NULL, COMM|LJUST|USER, arguments, 0,
-		CHAR, NULL, 0},
-	{"blocked", "", "sigmask", 0, NULL, 0, CHAR, NULL, 0},
-	{"caught", "", "sigcatch", 0, NULL, 0, CHAR, NULL, 0},
-	{"class", "CLASS", NULL, LJUST, loginclass, 0, CHAR, NULL, 0},
-	{"comm", "COMMAND", NULL, LJUST, ucomm, 0, CHAR, NULL, 0},
-	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 0,
-		CHAR, NULL, 0},
-	{"cow", "COW", NULL, 0, kvar, KOFF(ki_cow), UINT, "u", 0},
-	{"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0},
-	{"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0},
-	{"dsiz", "DSIZ", NULL, 0, kvar, KOFF(ki_dsize), PGTOK, "ld", 0},
-	{"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0},
-	{"egroup", "", "group", 0, NULL, 0, CHAR, NULL, 0},
-	{"emul", "EMUL", NULL, LJUST, emulname, 0, CHAR, NULL, 0},
-	{"etime", "ELAPSED", NULL, USER, elapsed, 0, CHAR, NULL, 0},
-	{"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0},
-	{"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0},
-	{"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0},
-	{"f2", "F2", NULL, 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
-	{"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
-	{"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0},
-	{"flags2", "", "f2", 0, NULL, 0, CHAR, NULL, 0},
-	{"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
-	{"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0},
-	{"ignored", "", "sigignore", 0, NULL, 0, CHAR, NULL, 0},
-	{"inblk", "INBLK", NULL, USER, rvar, ROFF(ru_inblock), LONG, "ld", 0},
-	{"inblock", "", "inblk", 0, NULL, 0, CHAR, NULL, 0},
-	{"jid", "JID", NULL, 0, kvar, KOFF(ki_jid), INT, "d", 0},
-	{"jobc", "JOBC", NULL, 0, kvar, KOFF(ki_jobc), SHORT, "d", 0},
-	{"ktrace", "KTRACE", NULL, 0, kvar, KOFF(ki_traceflag), INT, "x", 0},
-	{"label", "LABEL", NULL, LJUST, label, 0, CHAR, NULL, 0},
-	{"lim", "LIM", NULL, 0, maxrss, 0, CHAR, NULL, 0},
-	{"lockname", "LOCK", NULL, LJUST, lockname, 0, CHAR, NULL, 0},
-	{"login", "LOGIN", NULL, LJUST, logname, 0, CHAR, NULL, 0},
-	{"logname", "", "login", 0, NULL, 0, CHAR, NULL, 0},
-	{"lstart", "STARTED", NULL, LJUST|USER, lstarted, 0, CHAR, NULL, 0},
-	{"lwp", "LWP", NULL, 0, kvar, KOFF(ki_tid), UINT, LWPFMT, 0},
-	{"majflt", "MAJFLT", NULL, USER, rvar, ROFF(ru_majflt), LONG, "ld", 0},
-	{"minflt", "MINFLT", NULL, USER, rvar, ROFF(ru_minflt), LONG, "ld", 0},
-	{"msgrcv", "MSGRCV", NULL, USER, rvar, ROFF(ru_msgrcv), LONG, "ld", 0},
-	{"msgsnd", "MSGSND", NULL, USER, rvar, ROFF(ru_msgsnd), LONG, "ld", 0},
-	{"mwchan", "MWCHAN", NULL, LJUST, mwchan, 0, CHAR, NULL, 0},
-	{"ni", "", "nice", 0, NULL, 0, CHAR, NULL, 0},
-	{"nice", "NI", NULL, 0, kvar, KOFF(ki_nice), CHAR, "d", 0},
-	{"nivcsw", "NIVCSW", NULL, USER, rvar, ROFF(ru_nivcsw), LONG, "ld", 0},
-	{"nlwp", "NLWP", NULL, 0, kvar, KOFF(ki_numthreads), UINT, NLWPFMT, 0},
-	{"nsignals", "", "nsigs", 0, NULL, 0, CHAR, NULL, 0},
-	{"nsigs", "NSIGS", NULL, USER, rvar, ROFF(ru_nsignals), LONG, "ld", 0},
-	{"nswap", "NSWAP", NULL, USER, rvar, ROFF(ru_nswap), LONG, "ld", 0},
-	{"nvcsw", "NVCSW", NULL, USER, rvar, ROFF(ru_nvcsw), LONG, "ld", 0},
-	{"nwchan", "NWCHAN", NULL, LJUST, nwchan, 0, CHAR, NULL, 0},
-	{"oublk", "OUBLK", NULL, USER, rvar, ROFF(ru_oublock), LONG, "ld", 0},
-	{"oublock", "", "oublk", 0, NULL, 0, CHAR, NULL, 0},
-	{"paddr", "PADDR", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0},
-	{"pagein", "PAGEIN", NULL, USER, pagein, 0, CHAR, NULL, 0},
-	{"pcpu", "", "%cpu", 0, NULL, 0, CHAR, NULL, 0},
-	{"pending", "", "sig", 0, NULL, 0, CHAR, NULL, 0},
-	{"pgid", "PGID", NULL, 0, kvar, KOFF(ki_pgid), UINT, PIDFMT, 0},
-	{"pid", "PID", NULL, 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0},
-	{"pmem", "", "%mem", 0, NULL, 0, CHAR, NULL, 0},
-	{"ppid", "PPID", NULL, 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0},
-	{"pri", "PRI", NULL, 0, pri, 0, CHAR, NULL, 0},
-	{"re", "RE", NULL, INF127, kvar, KOFF(ki_swtime), UINT, "d", 0},
-	{"rgid", "RGID", NULL, 0, kvar, KOFF(ki_rgid), UINT, UIDFMT, 0},
-	{"rgroup", "RGROUP", NULL, LJUST, rgroupname, 0, CHAR, NULL, 0},
-	{"rss", "RSS", NULL, 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0},
-	{"rtprio", "RTPRIO", NULL, 0, priorityr, KOFF(ki_pri), CHAR, NULL, 0},
-	{"ruid", "RUID", NULL, 0, kvar, KOFF(ki_ruid), UINT, UIDFMT, 0},
-	{"ruser", "RUSER", NULL, LJUST, runame, 0, CHAR, NULL, 0},
-	{"sid", "SID", NULL, 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 0},
-	{"sig", "PENDING", NULL, 0, kvar, KOFF(ki_siglist), INT, "x", 0},
-	{"sigcatch", "CAUGHT", NULL, 0, kvar, KOFF(ki_sigcatch), UINT, "x", 0},
-	{"sigignore", "IGNORED", NULL, 0, kvar, KOFF(ki_sigignore),
-		UINT, "x", 0},
-	{"sigmask", "BLOCKED", NULL, 0, kvar, KOFF(ki_sigmask), UINT, "x", 0},
-	{"sl", "SL", NULL, INF127, kvar, KOFF(ki_slptime), UINT, "d", 0},
-	{"ssiz", "SSIZ", NULL, 0, kvar, KOFF(ki_ssize), PGTOK, "ld", 0},
-	{"start", "STARTED", NULL, LJUST|USER, started, 0, CHAR, NULL, 0},
-	{"stat", "", "state", 0, NULL, 0, CHAR, NULL, 0},
-	{"state", "STAT", NULL, LJUST, state, 0, CHAR, NULL, 0},
-	{"svgid", "SVGID", NULL, 0, kvar, KOFF(ki_svgid), UINT, UIDFMT, 0},
-	{"svuid", "SVUID", NULL, 0, kvar, KOFF(ki_svuid), UINT, UIDFMT, 0},
-	{"systime", "SYSTIME", NULL, USER, systime, 0, CHAR, NULL, 0},
-	{"tdaddr", "TDADDR", NULL, 0, kvar, KOFF(ki_tdaddr), KPTR, "lx", 0},
-	{"tdev", "TDEV", NULL, 0, tdev, 0, CHAR, NULL, 0},
-	{"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
-	{"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0},
-	{"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
-	{"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
-	{"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
-	{"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0},
-	{"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0},
-	{"tty", "TTY", NULL, LJUST, longtname, 0, CHAR, NULL, 0},
-	{"ucomm", "UCOMM", NULL, LJUST, ucomm, 0, CHAR, NULL, 0},
-	{"uid", "UID", NULL, 0, kvar, KOFF(ki_uid), UINT, UIDFMT, 0},
-	{"upr", "UPR", NULL, 0, upr, 0, CHAR, NULL, 0},
-	{"uprocp", "UPROCP", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0},
-	{"user", "USER", NULL, LJUST, uname, 0, CHAR, NULL, 0},
-	{"usertime", "USERTIME", NULL, USER, usertime, 0, CHAR, NULL, 0},
-	{"usrpri", "", "upr", 0, NULL, 0, CHAR, NULL, 0},
-	{"vsize", "", "vsz", 0, NULL, 0, CHAR, NULL, 0},
-	{"vsz", "VSZ", NULL, 0, vsize, 0, CHAR, NULL, 0},
-	{"wchan", "WCHAN", NULL, LJUST, wchan, 0, CHAR, NULL, 0},
-	{"xstat", "XSTAT", NULL, 0, kvar, KOFF(ki_xstat), USHORT, "x", 0},
-	{"", NULL, NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"%cpu", "%CPU", NULL, "percent-cpu", 0, pcpu, 0, CHAR, NULL, 0},
+	{"%mem", "%MEM", NULL, "percent-memory", 0, pmem, 0, CHAR, NULL, 0},
+	{"acflag", "ACFLG", NULL, "accounting-flag", 0, kvar, KOFF(ki_acflag),
+	    USHORT, "x", 0},
+	{"acflg", "", "acflag", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"args", "COMMAND", NULL, "arguments", COMM|LJUST|USER, arguments, 0,
+	    CHAR, NULL, 0},
+	{"blocked", "", "sigmask", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"caught", "", "sigcatch", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"class", "CLASS", NULL, "login-class", LJUST, loginclass, 0, CHAR,
+	    NULL, 0},
+	{"comm", "COMMAND", NULL, "command", LJUST, ucomm, 0, CHAR, NULL, 0},
+	{"command", "COMMAND", NULL, "command", COMM|LJUST|USER, command, 0,
+	    CHAR, NULL, 0},
+	{"cow", "COW", NULL, "copy-on-write-faults", 0, kvar, KOFF(ki_cow),
+	    UINT, "u", 0},
+	{"cpu", "CPU", NULL, "cpu-usage", 0, kvar, KOFF(ki_estcpu), UINT, "d",
+	    0},
+	{"cputime", "", "time", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"dsiz", "DSIZ", NULL, "data-size", 0, kvar, KOFF(ki_dsize), PGTOK,
+	    "ld", 0},
+	{"egid", "", "gid", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"egroup", "", "group", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"emul", "EMUL", NULL, "emulation-envirnment", LJUST, emulname, 0,
+	    CHAR, NULL, 0},
+	{"etime", "ELAPSED", NULL, "elapsed-time", USER, elapsed, 0, CHAR,
+	    NULL, 0},
+	{"etimes", "ELAPSED", NULL, "elapsed-times", USER, elapseds, 0, CHAR,
+	    NULL, 0},
+	{"euid", "", "uid", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"f", "F", NULL, "flags", 0, kvar, KOFF(ki_flag), INT, "x", 0},
+	{"f2", "F2", NULL, "flags2", 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
+	{"fib", "FIB", NULL, "fib", 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
+	{"flags", "", "f", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"flags2", "", "f2", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"gid", "GID", NULL, "gid", 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
+	{"group", "GROUP", NULL, "group", LJUST, egroupname, 0, CHAR, NULL, 0},
+	{"ignored", "", "sigignore", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"inblk", "INBLK", NULL, "read-blocks", USER, rvar, ROFF(ru_inblock),
+	    LONG, "ld", 0},
+	{"inblock", "", "inblk", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"jid", "JID", NULL, "jail-id", 0, kvar, KOFF(ki_jid), INT, "d", 0},
+	{"jobc", "JOBC", NULL, "job-control-count", 0, kvar, KOFF(ki_jobc),
+	    SHORT, "d", 0},
+	{"ktrace", "KTRACE", NULL, "ktrace", 0, kvar, KOFF(ki_traceflag), INT,
+	    "x", 0},
+	{"label", "LABEL", NULL, "label", LJUST, label, 0, CHAR, NULL, 0},
+	{"lim", "LIM", NULL, "memory-limit", 0, maxrss, 0, CHAR, NULL, 0},
+	{"lockname", "LOCK", NULL, "lock-name", LJUST, lockname, 0, CHAR, NULL,
+	    0},
+	{"login", "LOGIN", NULL, "login-name", LJUST, logname, 0, CHAR, NULL,
+	    0},
+	{"logname", "", "login", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"lstart", "STARTED", NULL, "start-time", LJUST|USER, lstarted, 0,
+	    CHAR, NULL, 0},
+	{"lwp", "LWP", NULL, "process-thread-id", 0, kvar, KOFF(ki_tid), UINT,
+	    LWPFMT, 0},
+	{"majflt", "MAJFLT", NULL, "major-faults", USER, rvar, ROFF(ru_majflt),
+	    LONG, "ld", 0},
+	{"minflt", "MINFLT", NULL, "minor-faults", USER, rvar, ROFF(ru_minflt),
+	    LONG, "ld", 0},
+	{"msgrcv", "MSGRCV", NULL, "received-messages", USER, rvar,
+	    ROFF(ru_msgrcv), LONG, "ld", 0},
+	{"msgsnd", "MSGSND", NULL, "sent-messages", USER, rvar,
+	    ROFF(ru_msgsnd), LONG, "ld", 0},
+	{"mwchan", "MWCHAN", NULL, "wait-channel", LJUST, mwchan, 0, CHAR,
+	    NULL, 0},
+	{"ni", "", "nice", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"nice", "NI", NULL, "nice", 0, kvar, KOFF(ki_nice), CHAR, "d", 0},
+	{"nivcsw", "NIVCSW", NULL, "involuntary-context-switches", USER, rvar,
+	    ROFF(ru_nivcsw), LONG, "ld", 0},
+	{"nlwp", "NLWP", NULL, "threads", 0, kvar, KOFF(ki_numthreads), UINT,
+	    NLWPFMT, 0},
+	{"nsignals", "", "nsigs", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"nsigs", "NSIGS", NULL, "signals-taken", USER, rvar,
+	    ROFF(ru_nsignals), LONG, "ld", 0},
+	{"nswap", "NSWAP", NULL, "swaps", USER, rvar, ROFF(ru_nswap), LONG,
+	    "ld", 0},
+	{"nvcsw", "NVCSW", NULL, "voluntary-context-switches", USER, rvar,
+	    ROFF(ru_nvcsw), LONG, "ld", 0},
+	{"nwchan", "NWCHAN", NULL, "wait-channel-address", LJUST, nwchan, 0,
+	    CHAR, NULL, 0},
+	{"oublk", "OUBLK", NULL, "written-blocks", USER, rvar,
+	    ROFF(ru_oublock), LONG, "ld", 0},
+	{"oublock", "", "oublk", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"paddr", "PADDR", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
+	    KPTR, "lx", 0},
+	{"pagein", "PAGEIN", NULL, "pageins", USER, pagein, 0, CHAR, NULL, 0},
+	{"pcpu", "", "%cpu", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"pending", "", "sig", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"pgid", "PGID", NULL, "process-group", 0, kvar, KOFF(ki_pgid), UINT,
+	    PIDFMT, 0},
+	{"pid", "PID", NULL, "pid", 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0},
+	{"pmem", "", "%mem", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"ppid", "PPID", NULL, "ppid", 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0},
+	{"pri", "PRI", NULL, "priority", 0, pri, 0, CHAR, NULL, 0},
+	{"re", "RE", NULL, "residency-time", INF127, kvar, KOFF(ki_swtime),
+	    UINT, "d", 0},
+	{"rgid", "RGID", NULL, "real-gid", 0, kvar, KOFF(ki_rgid), UINT,
+	    UIDFMT, 0},
+	{"rgroup", "RGROUP", NULL, "real-group", LJUST, rgroupname, 0, CHAR,
+	    NULL, 0},
+	{"rss", "RSS", NULL, "rss", 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0},
+	{"rtprio", "RTPRIO", NULL, "realtime-priority", 0, priorityr,
+	    KOFF(ki_pri), CHAR, NULL, 0},
+	{"ruid", "RUID", NULL, "real-uid", 0, kvar, KOFF(ki_ruid), UINT,
+	    UIDFMT, 0},
+	{"ruser", "RUSER", NULL, "real-user", LJUST, runame, 0, CHAR, NULL, 0},
+	{"sid", "SID", NULL, "sid", 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 0},
+	{"sig", "PENDING", NULL, "signals-pending", 0, kvar, KOFF(ki_siglist),
+	    INT, "x", 0},
+	{"sigcatch", "CAUGHT", NULL, "signals-caught", 0, kvar,
+	    KOFF(ki_sigcatch), UINT, "x", 0},
+	{"sigignore", "IGNORED", NULL, "signals-ignored", 0, kvar,
+	    KOFF(ki_sigignore), UINT, "x", 0},
+	{"sigmask", "BLOCKED", NULL, "signal-mask", 0, kvar, KOFF(ki_sigmask),
+	    UINT, "x", 0},
+	{"sl", "SL", NULL, "sleep-time", INF127, kvar, KOFF(ki_slptime), UINT,
+	    "d", 0},
+	{"ssiz", "SSIZ", NULL, "stack-size", 0, kvar, KOFF(ki_ssize), PGTOK,
+	    "ld", 0},
+	{"start", "STARTED", NULL, "start-time", LJUST|USER, started, 0, CHAR,
+	    NULL, 0},
+	{"stat", "", "state", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"state", "STAT", NULL, "state", LJUST, state, 0, CHAR, NULL, 0},
+	{"svgid", "SVGID", NULL, "saved-gid", 0, kvar, KOFF(ki_svgid), UINT,
+	    UIDFMT, 0},
+	{"svuid", "SVUID", NULL, "saved-uid", 0, kvar, KOFF(ki_svuid), UINT,
+	    UIDFMT, 0},
+	{"systime", "SYSTIME", NULL, "system-time", USER, systime, 0, CHAR,
+	    NULL, 0},
+	{"tdaddr", "TDADDR", NULL, "thread-address", 0, kvar, KOFF(ki_tdaddr),
+	    KPTR, "lx", 0},
+	{"tdev", "TDEV", NULL, "terminal-device", 0, tdev, 0, CHAR, NULL, 0},
+	{"tdnam", "TDNAM", NULL, "terminal-device-name", LJUST, tdnam, 0, CHAR,
+	    NULL, 0},
+	{"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0},
+	{"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar,
+	    KOFF(ki_tpgid), UINT, PIDFMT, 0},
+	{"tracer", "TRACER", NULL, "tracer", 0, kvar, KOFF(ki_tracer), UINT,
+	    PIDFMT, 0},
+	{"tsid", "TSID", NULL, "terminal-sid", 0, kvar, KOFF(ki_tsid), UINT,
+	    PIDFMT, 0},
+	{"tsiz", "TSIZ", NULL, "text-size", 0, kvar, KOFF(ki_tsize), PGTOK,
+	    "ld", 0},
+	{"tt", "TT ", NULL, "terminal-name", 0, tname, 0, CHAR, NULL, 0},
+	{"tty", "TTY", NULL, "tty", LJUST, longtname, 0, CHAR, NULL, 0},
+	{"ucomm", "UCOMM", NULL, "accounting-name", LJUST, ucomm, 0, CHAR,
+	    NULL, 0},
+	{"uid", "UID", NULL, "uid", 0, kvar, KOFF(ki_uid), UINT, UIDFMT, 0},
+	{"upr", "UPR", NULL, "user-priority", 0, upr, 0, CHAR, NULL, 0},
+	{"uprocp", "UPROCP", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
+	    KPTR, "lx", 0},
+	{"user", "USER", NULL, "user", LJUST, uname, 0, CHAR, NULL, 0},
+	{"usertime", "USERTIME", NULL, "user-time", USER, usertime, 0, CHAR,
+	    NULL, 0},
+	{"usrpri", "", "upr", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"vsize", "", "vsz", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, "virtual-size", 0, vsize, 0, CHAR, NULL, 0},
+	{"wchan", "WCHAN", NULL, "wait-channel", LJUST, wchan, 0, CHAR, NULL,
+	    0},
+	{"xstat", "XSTAT", NULL, "exit-status", 0, kvar, KOFF(ki_xstat),
+	    USHORT, "x", 0},
+	{"", NULL, NULL, NULL, 0, NULL, 0, CHAR, NULL, 0},
 };
 
 void
@@ -185,16 +240,19 @@ showkey(void)
 
 	i = 0;
 	sep = "";
+	xo_open_list("key");
 	for (v = var; *(p = v->name); ++v) {
 		int len = strlen(p);
 		if (termwidth && (i += len + 1) > termwidth) {
 			i = len;
 			sep = "\n";
 		}
-		(void) printf("%s%s", sep, p);
+		xo_emit("{P:/%s}{l:key/%s}", sep, p);
 		sep = " ";
 	}
-	(void) printf("\n");
+	xo_emit("\n");
+	xo_close_list("key");
+	xo_finish();
 }
 
 void

Modified: projects/ifnet/bin/ps/print.c
==============================================================================
--- projects/ifnet/bin/ps/print.c	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/print.c	Wed May 27 14:16:42 2015	(r283615)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 #include <vis.h>
+#include <libxo/xo.h>
 
 #include "ps.h"
 
@@ -85,15 +86,15 @@ printheader(void)
 		v = vent->var;
 		if (v->flag & LJUST) {
 			if (STAILQ_NEXT(vent, next_ve) == NULL)	/* last one */
-				(void)printf("%s", vent->header);
+				xo_emit("{T:/%s}", vent->header);
 			else
-				(void)printf("%-*s", v->width, vent->header);
+				xo_emit("{T:/%-*s}", v->width, vent->header);
 		} else
-			(void)printf("%*s", v->width, vent->header);
+			xo_emit("{T:/%*s}", v->width, vent->header);
 		if (STAILQ_NEXT(vent, next_ve) != NULL)
-			(void)putchar(' ');
+			xo_emit("{P: }");
 	}
-	(void)putchar('\n');
+	xo_emit("\n");
 }
 
 char *
@@ -102,7 +103,7 @@ arguments(KINFO *k, VARENT *ve)
 	char *vis_args;
 
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
 
 	if (STAILQ_NEXT(ve, next_ve) != NULL && strlen(vis_args) > ARGUMENTS_WIDTH)
@@ -130,7 +131,7 @@ command(KINFO *k, VARENT *ve)
 		return (str);
 	}
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
 
 	if (STAILQ_NEXT(ve, next_ve) == NULL) {
@@ -139,7 +140,7 @@ command(KINFO *k, VARENT *ve)
 		if (k->ki_env) {
 			if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1))
 			    == NULL)
-				errx(1, "malloc failed");
+				xo_errx(1, "malloc failed");
 			strvis(vis_env, k->ki_env,
 			    VIS_TAB | VIS_NL | VIS_NOSLASH);
 		} else
@@ -215,7 +216,7 @@ state(KINFO *k, VARENT *ve __unused)
 
 	buf = malloc(16);
 	if (buf == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 
 	flag = k->ki_p->ki_flag;
 	tdflags = k->ki_p->ki_tdflags;	/* XXXKSE */
@@ -391,7 +392,7 @@ started(KINFO *k, VARENT *ve __unused)
 
 	buf = malloc(buflen);
 	if (buf == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 
 	then = k->ki_p->ki_start.tv_sec;
 	tp = localtime(&then);
@@ -416,7 +417,7 @@ lstarted(KINFO *k, VARENT *ve __unused)
 
 	buf = malloc(buflen);
 	if (buf == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 
 	then = k->ki_p->ki_start.tv_sec;
 	(void)strftime(buf, buflen, "%c", localtime(&then));
@@ -762,7 +763,7 @@ printval(void *bp, VAR *v)
 		(void)asprintf(&str, ofmt, ps_pgtok(*(u_long *)bp));
 		break;
 	default:
-		errx(1, "unknown type %d", v->type);
+		xo_errx(1, "unknown type %d", v->type);
 	}
 
 	return (str);
@@ -804,7 +805,7 @@ label(KINFO *k, VARENT *ve __unused)
 
 	string = NULL;
 	if (mac_prepare_process_label(&proclabel) == -1) {
-		warn("mac_prepare_process_label");
+		xo_warn("mac_prepare_process_label");
 		goto out;
 	}
 	error = mac_get_pid(k->ki_p->ki_pid, proclabel);

Modified: projects/ifnet/bin/ps/ps.1
==============================================================================
--- projects/ifnet/bin/ps/ps.1	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/ps.1	Wed May 27 14:16:42 2015	(r283615)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd December 9, 2014
+.Dd May 27, 2015
 .Dt PS 1
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Nd process status
 .Sh SYNOPSIS
 .Nm
+.Op Fl -libxo
 .Op Fl aCcdefHhjlmrSTuvwXxZ
 .Op Fl O Ar fmt | Fl o Ar fmt
 .Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ...
@@ -47,6 +48,7 @@
 .Op Fl t Ar tty Ns Op , Ns Ar tty Ns Ar ...
 .Op Fl U Ar user Ns Op , Ns Ar user Ns Ar ...
 .Nm
+.Op Fl -libxo
 .Op Fl L
 .Sh DESCRIPTION
 The
@@ -348,6 +350,9 @@ the include file
 .In sys/proc.h :
 .Bl -column P2_INHERIT_PROTECTED 0x00000001
 .It Dv "P2_INHERIT_PROTECTED" Ta No "0x00000001" Ta "New children get P_PROTECTED"
+.It Dv "P2_NOTRACE" Ta No "0x00000002" Ta "No ptrace(2) attach or coredumps"
+.It Dv "P2_NOTRACE_EXEC" Ta No "0x00000004" Ta "Keep P2_NOPTRACE on exec(2)"
+.It Dv "P2_AST_SU" Ta No "0x00000008" Ta "Handles SU ast for kthreads"
 .El
 .It Cm label
 The MAC label of the process.
@@ -733,7 +738,9 @@ Display information on all system proces
 .Xr procstat 1 ,
 .Xr w 1 ,
 .Xr kvm 3 ,
+.Xr libxo 3
 .Xr strftime 3 ,
+.Xr xo_parse_args 3
 .Xr mac 4 ,
 .Xr procfs 5 ,
 .Xr pstat 8 ,

Modified: projects/ifnet/bin/ps/ps.c
==============================================================================
--- projects/ifnet/bin/ps/ps.c	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/ps.c	Wed May 27 14:16:42 2015	(r283615)
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <libxo/xo.h>
 
 #include "ps.h"
 
@@ -184,7 +185,9 @@ main(int argc, char *argv[])
 	int all, ch, elem, flag, _fmt, i, lineno, linelen, left;
 	int descendancy, nentries, nkept, nselectors;
 	int prtheader, wflag, what, xkeep, xkeep_implied;
+	int fwidthmin, fwidthmax;
 	char errbuf[_POSIX2_LINE_MAX];
+	char fmtbuf[_POSIX2_LINE_MAX];
 
 	(void) setlocale(LC_ALL, "");
 	time(&now);			/* Used by routines in print.c. */
@@ -221,6 +224,11 @@ main(int argc, char *argv[])
 	init_list(&uidlist, addelem_uid, sizeof(uid_t), "user");
 	memf = _PATH_DEVNULL;
 	nlistf = NULL;
+
+	argc = xo_parse_args(argc, argv);
+	if (argc < 0)
+		exit(1);
+
 	while ((ch = getopt(argc, argv, PS_ARGS)) != -1)
 		switch (ch) {
 		case 'A':
@@ -363,7 +371,7 @@ main(int argc, char *argv[])
 #endif
 		case 'T':
 			if ((optarg = ttyname(STDIN_FILENO)) == NULL)
-				errx(1, "stdin: not a terminal");
+				xo_errx(1, "stdin: not a terminal");
 			/* FALLTHROUGH */
 		case 't':
 			add_list(&ttylist, optarg);
@@ -434,8 +442,7 @@ main(int argc, char *argv[])
 		argv++;
 	}
 	if (*argv) {
-		fprintf(stderr, "%s: illegal argument: %s\n",
-		    getprogname(), *argv);
+		xo_warnx("illegal argument: %s\n", *argv);
 		usage();
 	}
 	if (optfatal)
@@ -445,7 +452,7 @@ main(int argc, char *argv[])
 
 	kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf);
 	if (kd == 0)
-		errx(1, "%s", errbuf);
+		xo_errx(1, "%s", errbuf);
 
 	if (!_fmt)
 		parsefmt(dfmt, 0);
@@ -453,7 +460,7 @@ main(int argc, char *argv[])
 	if (nselectors == 0) {
 		uidlist.l.ptr = malloc(sizeof(uid_t));
 		if (uidlist.l.ptr == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 		nselectors = 1;
 		uidlist.count = uidlist.maxcount = 1;
 		*uidlist.l.uids = getuid();
@@ -515,11 +522,11 @@ main(int argc, char *argv[])
 	nentries = -1;
 	kp = kvm_getprocs(kd, what, flag, &nentries);
 	if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0))
-		errx(1, "%s", kvm_geterr(kd));
+		xo_errx(1, "%s", kvm_geterr(kd));
 	nkept = 0;
 	if (nentries > 0) {
 		if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 		for (i = nentries; --i >= 0; ++kp) {
 			/*
 			 * If the user specified multiple selection-criteria,
@@ -629,13 +636,18 @@ main(int argc, char *argv[])
 	/*
 	 * Print header.
 	 */
+	xo_open_container("process-information");
 	printheader();
+	if (xo_get_style(NULL) != XO_STYLE_TEXT)
+		termwidth = UNLIMITED;
 
 	/*
 	 * Output formatted lines.
 	 */
+	xo_open_list("process");
 	for (i = lineno = 0; i < nkept; i++) {
 		linelen = 0;
+		xo_open_instance("process");
 		STAILQ_FOREACH(vent, &varlist, next_ve) {
 	        	if (vent->var->flag & LJUST)
 				fmtstr = "%-*s";
@@ -645,21 +657,27 @@ main(int argc, char *argv[])
 			ks = STAILQ_FIRST(&kinfo[i].ki_ks);
 			STAILQ_REMOVE_HEAD(&kinfo[i].ki_ks, ks_next);
 			/* Truncate rightmost column if necessary.  */
+			fwidthmax = _POSIX2_LINE_MAX;
 			if (STAILQ_NEXT(vent, next_ve) == NULL &&
 			   termwidth != UNLIMITED && ks->ks_str != NULL) {
 				left = termwidth - linelen;
 				if (left > 0 && left < (int)strlen(ks->ks_str))
-					ks->ks_str[left] = '\0';
+					fwidthmax = left;
 			}
+
 			str = ks->ks_str;
 			if (str == NULL)
 				str = "-";
 			/* No padding for the last column, if it's LJUST. */
-			if (STAILQ_NEXT(vent, next_ve) == NULL &&
-			    vent->var->flag & LJUST)
-				linelen += printf(fmtstr, 0, str);
-			else
-				linelen += printf(fmtstr, vent->var->width, str);
+			fwidthmin = (xo_get_style(NULL) != XO_STYLE_TEXT ||
+			    (STAILQ_NEXT(vent, next_ve) == NULL &&
+			    (vent->var->flag & LJUST))) ? 0 : vent->var->width;
+			snprintf(fmtbuf, sizeof(fmtbuf), "{:%s/%%%s%d..%ds}",
+			    vent->var->field ?: vent->var->name,
+			    (vent->var->flag & LJUST) ? "-" : "",
+			    fwidthmin, fwidthmax);
+			xo_emit(fmtbuf, str);
+			linelen += fwidthmin;
 
 			if (ks->ks_str != NULL) {
 				free(ks->ks_str);
@@ -669,17 +687,22 @@ main(int argc, char *argv[])
 			ks = NULL;
 
 			if (STAILQ_NEXT(vent, next_ve) != NULL) {
-				(void)putchar(' ');
+				xo_emit("{P: }");
 				linelen++;
 			}
 		}
-		(void)putchar('\n');
+	        xo_emit("\n");
+		xo_close_instance("process");
 		if (prtheader && lineno++ == prtheader - 4) {
-			(void)putchar('\n');
+			xo_emit("\n");
 			printheader();
 			lineno = 0;
 		}
 	}
+	xo_close_list("process");
+	xo_close_container("process-information");
+	xo_finish();
+
 	free_list(&gidlist);
 	free_list(&jidlist);
 	free_list(&pidlist);
@@ -705,9 +728,9 @@ addelem_gid(struct listinfo *inf, const 
 
 	if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) {
 		if (*elem == '\0')
-			warnx("Invalid (zero-length) %s name", inf->lname);
+			xo_warnx("Invalid (zero-length) %s name", inf->lname);
 		else
-			warnx("%s name too long: %s", inf->lname, elem);
+			xo_warnx("%s name too long: %s", inf->lname, elem);
 		optfatal = 1;
 		return (0);		/* Do not add this value. */
 	}
@@ -732,7 +755,7 @@ addelem_gid(struct listinfo *inf, const 
 	if (grp == NULL)
 		grp = getgrnam(elem);
 	if (grp == NULL) {
-		warnx("No %s %s '%s'", inf->lname, nameorID, elem);
+		xo_warnx("No %s %s '%s'", inf->lname, nameorID, elem);
 		optfatal = 1;
 		return (0);
 	}
@@ -773,7 +796,7 @@ addelem_pid(struct listinfo *inf, const 
 	long tempid;
 
 	if (*elem == '\0') {
-		warnx("Invalid (zero-length) process id");
+		xo_warnx("Invalid (zero-length) process id");
 		optfatal = 1;
 		return (0);		/* Do not add this value. */
 	}
@@ -781,10 +804,10 @@ addelem_pid(struct listinfo *inf, const 
 	errno = 0;
 	tempid = strtol(elem, &endp, 10);
 	if (*endp != '\0' || tempid < 0 || elem == endp) {
-		warnx("Invalid %s: %s", inf->lname, elem);
+		xo_warnx("Invalid %s: %s", inf->lname, elem);
 		errno = ERANGE;
 	} else if (errno != 0 || tempid > pid_max) {
-		warnx("%s too large: %s", inf->lname, elem);
+		xo_warnx("%s too large: %s", inf->lname, elem);
 		errno = ERANGE;
 	}
 	if (errno == ERANGE) {
@@ -855,19 +878,19 @@ addelem_tty(struct listinfo *inf, const 
 	if (ttypath) {
 		if (stat(ttypath, &sb) == -1) {
 			if (pathbuf3[0] != '\0')
-				warn("%s, %s, and %s", pathbuf3, pathbuf2,
+				xo_warn("%s, %s, and %s", pathbuf3, pathbuf2,
 				    ttypath);
 			else
-				warn("%s", ttypath);
+				xo_warn("%s", ttypath);
 			optfatal = 1;
 			return (0);
 		}
 		if (!S_ISCHR(sb.st_mode)) {
 			if (pathbuf3[0] != '\0')
-				warnx("%s, %s, and %s: Not a terminal",
+				xo_warnx("%s, %s, and %s: Not a terminal",
 				    pathbuf3, pathbuf2, ttypath);
 			else
-				warnx("%s: Not a terminal", ttypath);
+				xo_warnx("%s: Not a terminal", ttypath);
 			optfatal = 1;
 			return (0);
 		}
@@ -887,9 +910,9 @@ addelem_uid(struct listinfo *inf, const 
 
 	if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) {
 		if (*elem == '\0')
-			warnx("Invalid (zero-length) %s name", inf->lname);
+			xo_warnx("Invalid (zero-length) %s name", inf->lname);
 		else
-			warnx("%s name too long: %s", inf->lname, elem);
+			xo_warnx("%s name too long: %s", inf->lname, elem);
 		optfatal = 1;
 		return (0);		/* Do not add this value. */
 	}
@@ -899,12 +922,12 @@ addelem_uid(struct listinfo *inf, const 
 		errno = 0;
 		bigtemp = strtoul(elem, &endp, 10);
 		if (errno != 0 || *endp != '\0' || bigtemp > UID_MAX)
-			warnx("No %s named '%s'", inf->lname, elem);
+			xo_warnx("No %s named '%s'", inf->lname, elem);
 		else {
 			/* The string is all digits, so it might be a userID. */
 			pwd = getpwuid((uid_t)bigtemp);
 			if (pwd == NULL)
-				warnx("No %s name or ID matches '%s'",
+				xo_warnx("No %s name or ID matches '%s'",
 				    inf->lname, elem);
 		}
 	}
@@ -961,7 +984,7 @@ add_list(struct listinfo *inf, const cha
 			while (*argp != '\0' && strchr(W_SEP T_SEP,
 			    *argp) == NULL)
 				argp++;
-			warnx("Value too long: %.*s", (int)(argp - savep),
+			xo_warnx("Value too long: %.*s", (int)(argp - savep),
 			    savep);
 			optfatal = 1;
 		}
@@ -1062,7 +1085,7 @@ descendant_sort(KINFO *ki, int items)
 			continue;
 		}
 		if ((ki[src].ki_d.prefix = malloc(lvl * 2 + 1)) == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 		for (n = 0; n < lvl - 2; n++) {
 			ki[src].ki_d.prefix[n * 2] =
 			    path[n / 8] & 1 << (n % 8) ? '|' : ' ';
@@ -1100,7 +1123,7 @@ expand_list(struct listinfo *inf)
 	newlist = realloc(inf->l.ptr, newmax * inf->elemsize);
 	if (newlist == NULL) {
 		free(inf->l.ptr);
-		errx(1, "realloc to %d %ss failed", newmax, inf->lname);
+		xo_errx(1, "realloc to %d %ss failed", newmax, inf->lname);
 	}
 	inf->maxcount = newmax;
 	inf->l.ptr = newlist;
@@ -1174,7 +1197,7 @@ format_output(KINFO *ki)
 		str = (v->oproc)(ki, vent);
 		ks = malloc(sizeof(*ks));
 		if (ks == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 		ks->ks_str = str;
 		STAILQ_INSERT_TAIL(&ki->ki_ks, ks, ks_next);
 		if (str != NULL) {
@@ -1240,7 +1263,7 @@ saveuser(KINFO *ki)
 		else
 			asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm);
 		if (ki->ki_args == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 	} else {
 		ki->ki_args = NULL;
 	}
@@ -1251,7 +1274,7 @@ saveuser(KINFO *ki)
 		else
 			ki->ki_env = strdup("()");
 		if (ki->ki_env == NULL)
-			errx(1, "malloc failed");
+			xo_errx(1, "malloc failed");
 	} else {
 		ki->ki_env = NULL;
 	}
@@ -1372,7 +1395,7 @@ kludge_oldps_options(const char *optlist
 	 * original value.
 	 */
 	if ((newopts = ns = malloc(len + 3)) == NULL)
-		errx(1, "malloc failed");
+		xo_errx(1, "malloc failed");
 
 	if (*origval != '-')
 		*ns++ = '-';	/* add option flag */
@@ -1401,7 +1424,7 @@ pidmax_init(void)
 
 	intsize = sizeof(pid_max);
 	if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
-		warn("unable to read kern.pid_max");
+		xo_warn("unable to read kern.pid_max");
 		pid_max = 99999;
 	}
 }
@@ -1411,7 +1434,7 @@ usage(void)
 {
 #define	SINGLE_OPTS	"[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
 
-	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	(void)xo_error("%s\n%s\n%s\n%s\n",
 	    "usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]",
 	    "          [-J jid[,jid...]] [-M core] [-N system]",
 	    "          [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]",

Modified: projects/ifnet/bin/ps/ps.h
==============================================================================
--- projects/ifnet/bin/ps/ps.h	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/bin/ps/ps.h	Wed May 27 14:16:42 2015	(r283615)
@@ -65,6 +65,7 @@ typedef struct var {
 	const char *name;	/* name(s) of variable */
 	const char *header;	/* default header */
 	const char *alias;	/* aliases */
+	const char *field;	/* xo field name */
 #define	COMM	0x01		/* needs exec arguments and environment (XXX) */
 #define	LJUST	0x02		/* left adjust on output (trailing blanks) */
 #define	USER	0x04		/* needs user structure */

Modified: projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Wed May 27 14:16:42 2015	(r283615)
@@ -21,7 +21,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2014
+.Dd May 24, 2015
 .Dt LOCKSTAT 1
 .Os
 .Sh NAME
@@ -29,7 +29,7 @@
 .Nd report kernel lock and profiling statistics
 .Sh SYNOPSIS
 .Nm
-.Op Fl ACEHI
+.Op Fl ACEHIV
 .Op Fl e Ar event-list
 .Op Fl i Ar rate
 .Op Fl b | t | h | s Ar depth
@@ -90,6 +90,10 @@ to
 is restricted to super-user by default.
 .Sh OPTIONS
 The following options are supported:
+.Bl -tag -width indent
+.It Fl V
+Print the D program used to gather the requested data.
+.El
 .Ss Event Selection
 If no event selection options are specified, the default is
 .Fl C .

Modified: projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Wed May 27 14:16:42 2015	(r283615)
@@ -299,6 +299,8 @@ usage(void)
 {
 	(void) fprintf(stderr,
 	    "Usage: lockstat [options] command [args]\n"
+	    "\nGeneral options:\n\n"
+	    "  -V              print the corresponding D program\n"
 	    "\nEvent selection options:\n\n"
 	    "  -C              watch contention events [on by default]\n"
 	    "  -E              watch error events [off by default]\n"

Modified: projects/ifnet/contrib/ipfilter/tools/ipf.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ipf.c	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/contrib/ipfilter/tools/ipf.c	Wed May 27 14:16:42 2015	(r283615)
@@ -296,7 +296,7 @@ static void packetlogon(opt)
 			printf("set log flag: nomatch\n");
 		change = 1;
 	}
-	if (strstr(opt, "block") || index(opt, 'd')) {
+	if (strstr(opt, "block") || strchr(opt, 'd')) {
 		flag |= FF_LOGBLOCK;
 		if (opts & OPT_VERBOSE)
 			printf("set log flag: block\n");

Modified: projects/ifnet/contrib/llvm/include/llvm/Target/TargetCallingConv.h
==============================================================================
--- projects/ifnet/contrib/llvm/include/llvm/Target/TargetCallingConv.h	Wed May 27 14:05:46 2015	(r283614)
+++ projects/ifnet/contrib/llvm/include/llvm/Target/TargetCallingConv.h	Wed May 27 14:16:42 2015	(r283615)
@@ -134,6 +134,8 @@ namespace ISD {
 
     /// Index original Function's argument.
     unsigned OrigArgIndex;
+    /// Sentinel value for implicit machine-level input arguments.
+    static const unsigned NoArgIndex = UINT_MAX;
 
     /// Offset in bytes of current input value relative to the beginning of
     /// original argument. E.g. if argument was splitted into four 32 bit
@@ -147,6 +149,15 @@ namespace ISD {
       VT = vt.getSimpleVT();
       ArgVT = argvt;
     }
+
+    bool isOrigArg() const {
+      return OrigArgIndex != NoArgIndex;
+    }
+
+    unsigned getOrigArgIndex() const {
+      assert(OrigArgIndex != NoArgIndex && "Implicit machine-level argument");
+      return OrigArgIndex;
+    }
   };

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

More information about the svn-src-projects mailing list