svn commit: r283797 - in user/ngie/more-tests: . bin/ps cddl/contrib/opensolaris/cmd/lockstat contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/libdwarf contrib/elftoolc...

Garrett Cooper ngie at FreeBSD.org
Sun May 31 01:02:11 UTC 2015 

Author: ngie
Date: Sun May 31 01:02:05 2015
New Revision: 283797
URL: https://svnweb.freebsd.org/changeset/base/283797

Log:
  MF head @ r283796

Added:
  user/ngie/more-tests/contrib/llvm/patches/patch-08-llvm-r230348-arm-fix-bad-ha.diff
     - copied unchanged from r283796, head/contrib/llvm/patches/patch-08-llvm-r230348-arm-fix-bad-ha.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-09-clang-r227115-constantarraytype.diff
     - copied unchanged from r283796, head/contrib/llvm/patches/patch-09-clang-r227115-constantarraytype.diff
  user/ngie/more-tests/lib/libutil/kinfo_getvmobject.3
     - copied unchanged from r283796, head/lib/libutil/kinfo_getvmobject.3
  user/ngie/more-tests/lib/libutil/kinfo_getvmobject.c
     - copied unchanged from r283796, head/lib/libutil/kinfo_getvmobject.c
  user/ngie/more-tests/share/man/man4/ig4.4
     - copied unchanged from r283796, head/share/man/man4/ig4.4
  user/ngie/more-tests/share/man/man9/PCI_IOV_ADD_VF.9
     - copied unchanged from r283796, head/share/man/man9/PCI_IOV_ADD_VF.9
  user/ngie/more-tests/share/man/man9/PCI_IOV_INIT.9
     - copied unchanged from r283796, head/share/man/man9/PCI_IOV_INIT.9
  user/ngie/more-tests/share/man/man9/PCI_IOV_UNINIT.9
     - copied unchanged from r283796, head/share/man/man9/PCI_IOV_UNINIT.9
  user/ngie/more-tests/sys/amd64/linux/
     - copied from r283796, head/sys/amd64/linux/
  user/ngie/more-tests/sys/amd64/linux32/linux32_vdso.lds.s
     - copied unchanged from r283796, head/sys/amd64/linux32/linux32_vdso.lds.s
  user/ngie/more-tests/sys/arm/conf/YYHD18
     - copied unchanged from r283796, head/sys/arm/conf/YYHD18
  user/ngie/more-tests/sys/arm/qemu/virt_mp.c
     - copied unchanged from r283796, head/sys/arm/qemu/virt_mp.c
  user/ngie/more-tests/sys/boot/fdt/dts/arm/meson3.dtsi
     - copied unchanged from r283796, head/sys/boot/fdt/dts/arm/meson3.dtsi
  user/ngie/more-tests/sys/boot/fdt/dts/arm/yyhd18-m3.dts
     - copied unchanged from r283796, head/sys/boot/fdt/dts/arm/yyhd18-m3.dts
  user/ngie/more-tests/sys/compat/linux/linux.c
     - copied unchanged from r283796, head/sys/compat/linux/linux.c
  user/ngie/more-tests/sys/compat/linux/linux.h
     - copied unchanged from r283796, head/sys/compat/linux/linux.h
  user/ngie/more-tests/sys/compat/linux/linux_common.c
     - copied unchanged from r283796, head/sys/compat/linux/linux_common.c
  user/ngie/more-tests/sys/compat/linux/linux_event.c
     - copied unchanged from r283796, head/sys/compat/linux/linux_event.c
  user/ngie/more-tests/sys/compat/linux/linux_event.h
     - copied unchanged from r283796, head/sys/compat/linux/linux_event.h
  user/ngie/more-tests/sys/compat/linux/linux_vdso.c
     - copied unchanged from r283796, head/sys/compat/linux/linux_vdso.c
  user/ngie/more-tests/sys/compat/linux/linux_vdso.h
     - copied unchanged from r283796, head/sys/compat/linux/linux_vdso.h
  user/ngie/more-tests/sys/dev/ichiic/
     - copied from r283796, head/sys/dev/ichiic/
  user/ngie/more-tests/sys/dev/pci/pci_iov.h
     - copied unchanged from r283796, head/sys/dev/pci/pci_iov.h
  user/ngie/more-tests/sys/dev/pci/pci_iov_if.m
     - copied unchanged from r283796, head/sys/dev/pci/pci_iov_if.m
  user/ngie/more-tests/sys/dev/sfxge/common/ef10_tlv_layout.h
     - copied unchanged from r283796, head/sys/dev/sfxge/common/ef10_tlv_layout.h
  user/ngie/more-tests/sys/dev/sfxge/common/efx_check.h
     - copied unchanged from r283796, head/sys/dev/sfxge/common/efx_check.h
  user/ngie/more-tests/sys/dev/sfxge/common/efx_crc32.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/efx_crc32.c
  user/ngie/more-tests/sys/dev/sfxge/common/efx_hash.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/efx_hash.c
  user/ngie/more-tests/sys/dev/sfxge/common/efx_phy_ids.h
     - copied unchanged from r283796, head/sys/dev/sfxge/common/efx_phy_ids.h
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_ev.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_ev.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_filter.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_filter.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_impl.h
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_impl.h
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_intr.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_intr.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_mac.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_mac.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_mcdi.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_mcdi.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_nic.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_nic.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_nvram.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_nvram.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_phy.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_phy.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_rx.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_rx.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_sram.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_sram.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_tx.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_tx.c
  user/ngie/more-tests/sys/dev/sfxge/common/hunt_vpd.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/hunt_vpd.c
  user/ngie/more-tests/sys/dev/sfxge/common/mcdi_mon.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/mcdi_mon.c
  user/ngie/more-tests/sys/dev/sfxge/common/mcdi_mon.h
     - copied unchanged from r283796, head/sys/dev/sfxge/common/mcdi_mon.h
  user/ngie/more-tests/sys/dev/sfxge/common/siena_mcdi.c
     - copied unchanged from r283796, head/sys/dev/sfxge/common/siena_mcdi.c
  user/ngie/more-tests/sys/dev/sfxge/sfxge_ioc.h
     - copied unchanged from r283796, head/sys/dev/sfxge/sfxge_ioc.h
  user/ngie/more-tests/sys/dev/sfxge/sfxge_nvram.c
     - copied unchanged from r283796, head/sys/dev/sfxge/sfxge_nvram.c
  user/ngie/more-tests/sys/i386/linux/linux_vdso.lds.s
     - copied unchanged from r283796, head/sys/i386/linux/linux_vdso.lds.s
  user/ngie/more-tests/sys/modules/i2c/controllers/ichiic/
     - copied from r283796, head/sys/modules/i2c/controllers/ichiic/
  user/ngie/more-tests/sys/modules/linux64/
     - copied from r283796, head/sys/modules/linux64/
  user/ngie/more-tests/sys/modules/linux_common/
     - copied from r283796, head/sys/modules/linux_common/
  user/ngie/more-tests/tools/build/options/WITHOUT_MANDOCDB
     - copied unchanged from r283796, head/tools/build/options/WITHOUT_MANDOCDB
  user/ngie/more-tests/usr.bin/kdump/linux32_syscalls.conf
     - copied unchanged from r283796, head/usr.bin/kdump/linux32_syscalls.conf
Deleted:
  user/ngie/more-tests/contrib/llvm/patches/patch-08-llvm-r227089-fix-mips-i128.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-09-llvm-r230058-indirectbrs-assert.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-10-llvm-r230348-arm-fix-bad-ha.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff
  user/ngie/more-tests/lib/libc/arm/sys/fork.S
  user/ngie/more-tests/lib/libc/mips/sys/fork.S
  user/ngie/more-tests/share/man/man9/PCI_ADD_VF.9
  user/ngie/more-tests/share/man/man9/PCI_INIT_IOV.9
  user/ngie/more-tests/share/man/man9/PCI_UNINIT_IOV.9
  user/ngie/more-tests/sys/dev/sfxge/common/siena_mon.c
Modified:
  user/ngie/more-tests/Makefile.inc1
  user/ngie/more-tests/ObsoleteFiles.inc
  user/ngie/more-tests/UPDATING
  user/ngie/more-tests/bin/ps/ps.1
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
  user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
  user/ngie/more-tests/contrib/elftoolchain/common/_elftc.h
  user/ngie/more-tests/contrib/elftoolchain/common/elfdefinitions.h
  user/ngie/more-tests/contrib/elftoolchain/elfcopy/elfcopy.h
  user/ngie/more-tests/contrib/elftoolchain/elfcopy/main.c
  user/ngie/more-tests/contrib/elftoolchain/elfcopy/sections.c
  user/ngie/more-tests/contrib/elftoolchain/elfcopy/symbols.c
  user/ngie/more-tests/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
  user/ngie/more-tests/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  user/ngie/more-tests/contrib/elftoolchain/libelftc/os.Linux.mk
  user/ngie/more-tests/contrib/elftoolchain/readelf/readelf.1
  user/ngie/more-tests/contrib/elftoolchain/readelf/readelf.c
  user/ngie/more-tests/contrib/llvm/include/llvm/Target/TargetCallingConv.h
  user/ngie/more-tests/contrib/llvm/include/llvm/Target/TargetLowering.h
  user/ngie/more-tests/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/MachineCopyPropagation.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  user/ngie/more-tests/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
  user/ngie/more-tests/contrib/llvm/lib/IR/ConstantFold.cpp
  user/ngie/more-tests/contrib/llvm/lib/IR/GCOV.cpp
  user/ngie/more-tests/contrib/llvm/lib/Support/Unix/Memory.inc
  user/ngie/more-tests/contrib/llvm/lib/Support/Windows/explicit_symbols.inc
  user/ngie/more-tests/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/Mips.td
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/Mips32r6InstrInfo.td
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsCCState.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsCallingConv.td
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPU.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.h
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUInstrInfo.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUInstructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUIntrinsics.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.h
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/CaymanInstructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/EvergreenInstructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/Processors.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/R600ISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/R600Instructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIAnnotateControlFlow.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIDefines.h
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIFoldOperands.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInstrFormats.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInstrInfo.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInstrInfo.h
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInstrInfo.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIInstructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SILowerControlFlow.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIRegisterInfo.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIRegisterInfo.h
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/SIRegisterInfo.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/VIInstrFormats.td
  user/ngie/more-tests/contrib/llvm/lib/Target/R600/VIInstructions.td
  user/ngie/more-tests/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/X86/X86FrameLowering.h
  user/ngie/more-tests/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  user/ngie/more-tests/contrib/llvm/lib/Target/X86/X86InstrControl.td
  user/ngie/more-tests/contrib/llvm/lib/Target/X86/X86IntrinsicsInfo.h
  user/ngie/more-tests/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
  user/ngie/more-tests/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  user/ngie/more-tests/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
  user/ngie/more-tests/contrib/llvm/patches/README.TXT
  user/ngie/more-tests/contrib/llvm/patches/patch-01-freebsd-kprintf.diff
  user/ngie/more-tests/contrib/llvm/patches/patch-07-llvm-r227752-boot2-shrink.diff
  user/ngie/more-tests/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  user/ngie/more-tests/contrib/llvm/tools/clang/include/clang/Basic/TargetCXXABI.h
  user/ngie/more-tests/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
  user/ngie/more-tests/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
  user/ngie/more-tests/contrib/llvm/tools/clang/include/clang/Sema/Template.h
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/AST/Decl.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  user/ngie/more-tests/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  user/ngie/more-tests/contrib/netbsd-tests/lib/libc/string/t_memmem.c
  user/ngie/more-tests/contrib/traceroute/traceroute.c
  user/ngie/more-tests/crypto/openssh/moduli
  user/ngie/more-tests/etc/mtree/BSD.debug.dist
  user/ngie/more-tests/etc/mtree/BSD.usr.dist
  user/ngie/more-tests/lib/Makefile
  user/ngie/more-tests/lib/clang/include/Makefile
  user/ngie/more-tests/lib/clang/include/clang/Basic/Version.inc
  user/ngie/more-tests/lib/clang/include/clang/Config/config.h
  user/ngie/more-tests/lib/clang/include/llvm/Config/config.h
  user/ngie/more-tests/lib/clang/include/llvm/Config/llvm-config.h
  user/ngie/more-tests/lib/libc/gen/fpclassify.c
  user/ngie/more-tests/lib/libc/gen/isinf.c
  user/ngie/more-tests/lib/libc/mips/sys/Makefile.inc
  user/ngie/more-tests/lib/libc/string/memmem.3
  user/ngie/more-tests/lib/libc/string/memmem.c
  user/ngie/more-tests/lib/libclang_rt/Makefile.inc
  user/ngie/more-tests/lib/libelftc/elftc_version.c
  user/ngie/more-tests/lib/libiconv_modules/UTF7/citrus_utf7.c
  user/ngie/more-tests/lib/libutil/Makefile
  user/ngie/more-tests/lib/libutil/kinfo_getallproc.3
  user/ngie/more-tests/lib/libutil/kinfo_getfile.3
  user/ngie/more-tests/lib/libutil/kinfo_getproc.3
  user/ngie/more-tests/lib/libutil/kinfo_getvmmap.3
  user/ngie/more-tests/lib/libutil/libutil.h
  user/ngie/more-tests/release/Makefile.mirrors
  user/ngie/more-tests/release/arm/PANDABOARD.conf
  user/ngie/more-tests/release/arm/RPI2.conf
  user/ngie/more-tests/release/arm/WANDBOARD.conf
  user/ngie/more-tests/sbin/dhclient/dhclient.c
  user/ngie/more-tests/sbin/dumpfs/dumpfs.c
  user/ngie/more-tests/share/man/man3/pthread_setspecific.3
  user/ngie/more-tests/share/man/man4/Makefile
  user/ngie/more-tests/share/man/man4/sfxge.4   (contents, props changed)
  user/ngie/more-tests/share/man/man5/src.conf.5
  user/ngie/more-tests/share/man/man9/Makefile
  user/ngie/more-tests/share/man/man9/pci.9
  user/ngie/more-tests/share/man/man9/pci_iov_schema.9
  user/ngie/more-tests/share/man/man9/sleep.9
  user/ngie/more-tests/share/mk/src.libnames.mk
  user/ngie/more-tests/share/mk/src.opts.mk
  user/ngie/more-tests/share/mk/src.sys.mk
  user/ngie/more-tests/sys/Makefile
  user/ngie/more-tests/sys/amd64/amd64/elf_machdep.c
  user/ngie/more-tests/sys/amd64/amd64/machdep.c
  user/ngie/more-tests/sys/amd64/amd64/pmap.c
  user/ngie/more-tests/sys/amd64/amd64/vm_machdep.c
  user/ngie/more-tests/sys/amd64/ia32/ia32_reg.c
  user/ngie/more-tests/sys/amd64/ia32/ia32_signal.c
  user/ngie/more-tests/sys/amd64/include/vmm.h   (contents, props changed)
  user/ngie/more-tests/sys/amd64/linux32/linux.h
  user/ngie/more-tests/sys/amd64/linux32/linux32_dummy.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_genassym.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_locore.s
  user/ngie/more-tests/sys/amd64/linux32/linux32_machdep.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_proto.h
  user/ngie/more-tests/sys/amd64/linux32/linux32_syscall.h
  user/ngie/more-tests/sys/amd64/linux32/linux32_syscalls.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_sysent.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_systrace_args.c
  user/ngie/more-tests/sys/amd64/linux32/linux32_sysvec.c
  user/ngie/more-tests/sys/amd64/linux32/syscalls.master
  user/ngie/more-tests/sys/amd64/vmm/amd/svm.c
  user/ngie/more-tests/sys/amd64/vmm/intel/vmx.c
  user/ngie/more-tests/sys/amd64/vmm/vmm.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_stat.c
  user/ngie/more-tests/sys/amd64/vmm/vmm_stat.h
  user/ngie/more-tests/sys/arm/arm/bcopyinout.S
  user/ngie/more-tests/sys/arm/arm/bcopyinout_xscale.S
  user/ngie/more-tests/sys/arm/arm/blockio.S
  user/ngie/more-tests/sys/arm/arm/bus_space_base.c
  user/ngie/more-tests/sys/arm/arm/busdma_machdep-v6.c
  user/ngie/more-tests/sys/arm/arm/busdma_machdep.c
  user/ngie/more-tests/sys/arm/arm/copystr.S
  user/ngie/more-tests/sys/arm/arm/cpu_asm-v6.S
  user/ngie/more-tests/sys/arm/arm/cpufunc.c
  user/ngie/more-tests/sys/arm/arm/cpufunc_asm_arm11x6.S
  user/ngie/more-tests/sys/arm/arm/cpufunc_asm_arm9.S
  user/ngie/more-tests/sys/arm/arm/cpufunc_asm_armv6.S
  user/ngie/more-tests/sys/arm/arm/cpufunc_asm_armv7.S
  user/ngie/more-tests/sys/arm/arm/cpufunc_asm_xscale_c3.S
  user/ngie/more-tests/sys/arm/arm/cpuinfo.c
  user/ngie/more-tests/sys/arm/arm/db_interface.c
  user/ngie/more-tests/sys/arm/arm/elf_machdep.c
  user/ngie/more-tests/sys/arm/arm/elf_trampoline.c
  user/ngie/more-tests/sys/arm/arm/exception.S
  user/ngie/more-tests/sys/arm/arm/fiq.c
  user/ngie/more-tests/sys/arm/arm/fusu.S
  user/ngie/more-tests/sys/arm/arm/gic.c
  user/ngie/more-tests/sys/arm/arm/intr.c
  user/ngie/more-tests/sys/arm/arm/machdep.c
  user/ngie/more-tests/sys/arm/arm/mp_machdep.c
  user/ngie/more-tests/sys/arm/arm/mpcore_timer.c
  user/ngie/more-tests/sys/arm/arm/nexus.c
  user/ngie/more-tests/sys/arm/arm/physmem.c
  user/ngie/more-tests/sys/arm/arm/pl190.c
  user/ngie/more-tests/sys/arm/arm/pl310.c
  user/ngie/more-tests/sys/arm/arm/pmap-v6-new.c
  user/ngie/more-tests/sys/arm/arm/pmap-v6.c
  user/ngie/more-tests/sys/arm/arm/pmap.c
  user/ngie/more-tests/sys/arm/arm/support.S
  user/ngie/more-tests/sys/arm/arm/swtch.S
  user/ngie/more-tests/sys/arm/arm/trap.c
  user/ngie/more-tests/sys/arm/arm/vfp.c
  user/ngie/more-tests/sys/arm/arm/vm_machdep.c
  user/ngie/more-tests/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/ngie/more-tests/sys/arm/conf/ALPINE
  user/ngie/more-tests/sys/arm/conf/BEAGLEBONE
  user/ngie/more-tests/sys/arm/conf/CUBIEBOARD
  user/ngie/more-tests/sys/arm/conf/CUBIEBOARD2
  user/ngie/more-tests/sys/arm/conf/DOCKSTAR
  user/ngie/more-tests/sys/arm/conf/DREAMPLUG-1001
  user/ngie/more-tests/sys/arm/conf/EFIKA_MX
  user/ngie/more-tests/sys/arm/conf/EXYNOS5.common
  user/ngie/more-tests/sys/arm/conf/PANDABOARD
  user/ngie/more-tests/sys/arm/conf/RK3188
  user/ngie/more-tests/sys/arm/conf/RPI-B
  user/ngie/more-tests/sys/arm/conf/RPI2
  user/ngie/more-tests/sys/arm/conf/SOCKIT.common
  user/ngie/more-tests/sys/arm/conf/VIRT
  user/ngie/more-tests/sys/arm/conf/VYBRID
  user/ngie/more-tests/sys/arm/conf/ZEDBOARD
  user/ngie/more-tests/sys/arm/include/cpu-v6.h
  user/ngie/more-tests/sys/arm/include/sysreg.h
  user/ngie/more-tests/sys/arm/qemu/files.qemu
  user/ngie/more-tests/sys/arm/ti/am335x/am335x_lcd.c
  user/ngie/more-tests/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  user/ngie/more-tests/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  user/ngie/more-tests/sys/boot/fdt/dts/arm/vsatv102-m6.dts
  user/ngie/more-tests/sys/boot/uboot/lib/module.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/ngie/more-tests/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
  user/ngie/more-tests/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  user/ngie/more-tests/sys/compat/ia32/ia32_sysvec.c
  user/ngie/more-tests/sys/compat/linprocfs/linprocfs.c
  user/ngie/more-tests/sys/compat/linsysfs/linsysfs.c
  user/ngie/more-tests/sys/compat/linux/check_error.d
  user/ngie/more-tests/sys/compat/linux/check_internal_locks.d
  user/ngie/more-tests/sys/compat/linux/linux_emul.c
  user/ngie/more-tests/sys/compat/linux/linux_emul.h
  user/ngie/more-tests/sys/compat/linux/linux_file.c
  user/ngie/more-tests/sys/compat/linux/linux_file.h
  user/ngie/more-tests/sys/compat/linux/linux_fork.c
  user/ngie/more-tests/sys/compat/linux/linux_futex.c
  user/ngie/more-tests/sys/compat/linux/linux_futex.h
  user/ngie/more-tests/sys/compat/linux/linux_getcwd.c
  user/ngie/more-tests/sys/compat/linux/linux_ioctl.c
  user/ngie/more-tests/sys/compat/linux/linux_ioctl.h
  user/ngie/more-tests/sys/compat/linux/linux_ipc.c
  user/ngie/more-tests/sys/compat/linux/linux_ipc.h
  user/ngie/more-tests/sys/compat/linux/linux_mib.c
  user/ngie/more-tests/sys/compat/linux/linux_mib.h
  user/ngie/more-tests/sys/compat/linux/linux_misc.c
  user/ngie/more-tests/sys/compat/linux/linux_misc.h
  user/ngie/more-tests/sys/compat/linux/linux_signal.c
  user/ngie/more-tests/sys/compat/linux/linux_signal.h
  user/ngie/more-tests/sys/compat/linux/linux_socket.c
  user/ngie/more-tests/sys/compat/linux/linux_socket.h
  user/ngie/more-tests/sys/compat/linux/linux_stats.c
  user/ngie/more-tests/sys/compat/linux/linux_sysctl.c
  user/ngie/more-tests/sys/compat/linux/linux_time.c
  user/ngie/more-tests/sys/compat/linux/linux_timer.c
  user/ngie/more-tests/sys/compat/linux/linux_timer.h
  user/ngie/more-tests/sys/compat/linux/linux_uid16.c
  user/ngie/more-tests/sys/compat/linux/linux_util.c
  user/ngie/more-tests/sys/compat/linux/linux_util.h
  user/ngie/more-tests/sys/compat/linux/stats_timing.d
  user/ngie/more-tests/sys/compat/svr4/svr4_sysvec.c
  user/ngie/more-tests/sys/conf/files
  user/ngie/more-tests/sys/conf/files.amd64
  user/ngie/more-tests/sys/conf/files.i386
  user/ngie/more-tests/sys/conf/files.pc98
  user/ngie/more-tests/sys/conf/kmod.mk
  user/ngie/more-tests/sys/conf/options.arm
  user/ngie/more-tests/sys/dev/acpi_support/acpi_ibm.c
  user/ngie/more-tests/sys/dev/ath/ath_rate/sample/sample.c
  user/ngie/more-tests/sys/dev/ath/if_ath.c
  user/ngie/more-tests/sys/dev/ath/if_ath_rx.c
  user/ngie/more-tests/sys/dev/ath/if_ath_rx.h
  user/ngie/more-tests/sys/dev/ath/if_ath_tdma.c
  user/ngie/more-tests/sys/dev/ath/if_ath_tx.c
  user/ngie/more-tests/sys/dev/ath/if_athvar.h
  user/ngie/more-tests/sys/dev/bwi/bwimac.c
  user/ngie/more-tests/sys/dev/bwi/bwimac.h
  user/ngie/more-tests/sys/dev/bwi/if_bwi.c
  user/ngie/more-tests/sys/dev/bwi/if_bwi_pci.c
  user/ngie/more-tests/sys/dev/bwn/if_bwn.c
  user/ngie/more-tests/sys/dev/fdt/fdt_common.c
  user/ngie/more-tests/sys/dev/fdt/fdt_common.h
  user/ngie/more-tests/sys/dev/gpio/gpioled.c
  user/ngie/more-tests/sys/dev/if_ndis/if_ndis.c
  user/ngie/more-tests/sys/dev/ipw/if_ipw.c
  user/ngie/more-tests/sys/dev/iwi/if_iwi.c
  user/ngie/more-tests/sys/dev/iwn/if_iwn.c
  user/ngie/more-tests/sys/dev/ixl/if_ixl.c
  user/ngie/more-tests/sys/dev/ixl/ixl.h
  user/ngie/more-tests/sys/dev/led/led.c
  user/ngie/more-tests/sys/dev/malo/if_malo.c
  user/ngie/more-tests/sys/dev/mmc/mmcsd.c
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_cnfg.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_hbd.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_history.txt
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_init.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_ioc.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_ra.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_raid.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_sas.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_targ.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_tool.h
  user/ngie/more-tests/sys/dev/mpr/mpi/mpi2_type.h
  user/ngie/more-tests/sys/dev/mpr/mpr.c
  user/ngie/more-tests/sys/dev/mpr/mpr_config.c
  user/ngie/more-tests/sys/dev/mpr/mpr_ioctl.h
  user/ngie/more-tests/sys/dev/mpr/mpr_mapping.c
  user/ngie/more-tests/sys/dev/mpr/mpr_mapping.h
  user/ngie/more-tests/sys/dev/mpr/mpr_pci.c
  user/ngie/more-tests/sys/dev/mpr/mpr_sas.c
  user/ngie/more-tests/sys/dev/mpr/mpr_sas.h
  user/ngie/more-tests/sys/dev/mpr/mpr_sas_lsi.c
  user/ngie/more-tests/sys/dev/mpr/mpr_user.c
  user/ngie/more-tests/sys/dev/mpr/mprvar.h
  user/ngie/more-tests/sys/dev/mwl/if_mwl.c
  user/ngie/more-tests/sys/dev/ofw/ofw_bus_subr.c
  user/ngie/more-tests/sys/dev/ofw/ofw_bus_subr.h
  user/ngie/more-tests/sys/dev/pci/pci.c
  user/ngie/more-tests/sys/dev/pci/pci_if.m
  user/ngie/more-tests/sys/dev/pci/pci_iov.c
  user/ngie/more-tests/sys/dev/pci/pcivar.h
  user/ngie/more-tests/sys/dev/psci/psci.c
  user/ngie/more-tests/sys/dev/ral/rt2560.c
  user/ngie/more-tests/sys/dev/ral/rt2661.c
  user/ngie/more-tests/sys/dev/ral/rt2860.c
  user/ngie/more-tests/sys/dev/sfxge/common/efsys.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_dma.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_ev.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_intr.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_mcdi.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_port.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_rx.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_rx.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_tx.c   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_tx.h   (contents, props changed)
  user/ngie/more-tests/sys/dev/sfxge/sfxge_version.h
  user/ngie/more-tests/sys/dev/uart/uart_dev_ns8250.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_rsu.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_rum.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_run.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_uath.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_upgt.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_ural.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_urtw.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c
  user/ngie/more-tests/sys/dev/usb/wlan/if_zyd.c
  user/ngie/more-tests/sys/dev/wi/if_wi.c
  user/ngie/more-tests/sys/dev/wi/if_wivar.h
  user/ngie/more-tests/sys/dev/wpi/if_wpi.c
  user/ngie/more-tests/sys/dev/wpi/if_wpivar.h
  user/ngie/more-tests/sys/dev/wtap/if_wtap.c
  user/ngie/more-tests/sys/dev/wtap/if_wtapvar.h
  user/ngie/more-tests/sys/dev/wtap/wtap_hal/hal.c
  user/ngie/more-tests/sys/fs/ext2fs/ext2_vnops.c
  user/ngie/more-tests/sys/fs/nfs/nfs.h
  user/ngie/more-tests/sys/fs/nfs/nfsdport.h
  user/ngie/more-tests/sys/fs/nfs/nfsrvstate.h
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdkrpc.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdport.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdserv.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdsocket.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdstate.c
  user/ngie/more-tests/sys/fs/nfsserver/nfs_nfsdsubs.c
  user/ngie/more-tests/sys/fs/pseudofs/pseudofs.c
  user/ngie/more-tests/sys/i386/i386/elf_machdep.c
  user/ngie/more-tests/sys/i386/i386/machdep.c
  user/ngie/more-tests/sys/i386/ibcs2/ibcs2_sysvec.c
  user/ngie/more-tests/sys/i386/linux/linux.h
  user/ngie/more-tests/sys/i386/linux/linux_dummy.c
  user/ngie/more-tests/sys/i386/linux/linux_genassym.c
  user/ngie/more-tests/sys/i386/linux/linux_locore.s
  user/ngie/more-tests/sys/i386/linux/linux_machdep.c
  user/ngie/more-tests/sys/i386/linux/linux_proto.h
  user/ngie/more-tests/sys/i386/linux/linux_ptrace.c
  user/ngie/more-tests/sys/i386/linux/linux_syscall.h
  user/ngie/more-tests/sys/i386/linux/linux_syscalls.c
  user/ngie/more-tests/sys/i386/linux/linux_sysent.c
  user/ngie/more-tests/sys/i386/linux/linux_systrace_args.c
  user/ngie/more-tests/sys/i386/linux/linux_sysvec.c
  user/ngie/more-tests/sys/i386/linux/syscalls.master
  user/ngie/more-tests/sys/kern/imgact_aout.c
  user/ngie/more-tests/sys/kern/init_main.c
  user/ngie/more-tests/sys/kern/kern_event.c
  user/ngie/more-tests/sys/kern/kern_exit.c
  user/ngie/more-tests/sys/kern/kern_fork.c
  user/ngie/more-tests/sys/kern/kern_sig.c
  user/ngie/more-tests/sys/kern/kern_synch.c
  user/ngie/more-tests/sys/kern/kern_thr.c
  user/ngie/more-tests/sys/kern/kern_thread.c
  user/ngie/more-tests/sys/kern/p1003_1b.c
  user/ngie/more-tests/sys/kern/subr_taskqueue.c
  user/ngie/more-tests/sys/kern/subr_trap.c
  user/ngie/more-tests/sys/kern/sys_process.c
  user/ngie/more-tests/sys/kern/vfs_cluster.c
  user/ngie/more-tests/sys/kern/vfs_init.c
  user/ngie/more-tests/sys/kern/vfs_mount.c
  user/ngie/more-tests/sys/kern/vfs_subr.c
  user/ngie/more-tests/sys/kern/vfs_vnops.c
  user/ngie/more-tests/sys/mips/include/pcpu.h
  user/ngie/more-tests/sys/mips/mips/elf_machdep.c
  user/ngie/more-tests/sys/mips/mips/freebsd32_machdep.c
  user/ngie/more-tests/sys/mips/mips/pm_machdep.c
  user/ngie/more-tests/sys/modules/Makefile
  user/ngie/more-tests/sys/modules/i2c/controllers/Makefile
  user/ngie/more-tests/sys/modules/ixl/Makefile   (contents, props changed)
  user/ngie/more-tests/sys/modules/linprocfs/Makefile
  user/ngie/more-tests/sys/modules/linsysfs/Makefile
  user/ngie/more-tests/sys/modules/linux/Makefile
  user/ngie/more-tests/sys/modules/pseudofs/Makefile
  user/ngie/more-tests/sys/modules/sfxge/Makefile   (contents, props changed)
  user/ngie/more-tests/sys/net80211/ieee80211.c
  user/ngie/more-tests/sys/net80211/ieee80211.h
  user/ngie/more-tests/sys/net80211/ieee80211_acl.c
  user/ngie/more-tests/sys/net80211/ieee80211_adhoc.c
  user/ngie/more-tests/sys/net80211/ieee80211_amrr.c
  user/ngie/more-tests/sys/net80211/ieee80211_crypto_ccmp.c
  user/ngie/more-tests/sys/net80211/ieee80211_crypto_tkip.c
  user/ngie/more-tests/sys/net80211/ieee80211_crypto_wep.c
  user/ngie/more-tests/sys/net80211/ieee80211_ddb.c
  user/ngie/more-tests/sys/net80211/ieee80211_dfs.c
  user/ngie/more-tests/sys/net80211/ieee80211_freebsd.c
  user/ngie/more-tests/sys/net80211/ieee80211_freebsd.h
  user/ngie/more-tests/sys/net80211/ieee80211_hostap.c
  user/ngie/more-tests/sys/net80211/ieee80211_ht.c
  user/ngie/more-tests/sys/net80211/ieee80211_hwmp.c
  user/ngie/more-tests/sys/net80211/ieee80211_input.c
  user/ngie/more-tests/sys/net80211/ieee80211_input.h
  user/ngie/more-tests/sys/net80211/ieee80211_ioctl.c
  user/ngie/more-tests/sys/net80211/ieee80211_mesh.c
  user/ngie/more-tests/sys/net80211/ieee80211_mesh.h
  user/ngie/more-tests/sys/net80211/ieee80211_monitor.c
  user/ngie/more-tests/sys/net80211/ieee80211_node.c
  user/ngie/more-tests/sys/net80211/ieee80211_output.c
  user/ngie/more-tests/sys/net80211/ieee80211_power.c
  user/ngie/more-tests/sys/net80211/ieee80211_proto.c
  user/ngie/more-tests/sys/net80211/ieee80211_proto.h
  user/ngie/more-tests/sys/net80211/ieee80211_radiotap.c
  user/ngie/more-tests/sys/net80211/ieee80211_ratectl_none.c
  user/ngie/more-tests/sys/net80211/ieee80211_regdomain.c
  user/ngie/more-tests/sys/net80211/ieee80211_rssadapt.c
  user/ngie/more-tests/sys/net80211/ieee80211_scan_sta.c
  user/ngie/more-tests/sys/net80211/ieee80211_scan_sw.c
  user/ngie/more-tests/sys/net80211/ieee80211_sta.c
  user/ngie/more-tests/sys/net80211/ieee80211_superg.c
  user/ngie/more-tests/sys/net80211/ieee80211_tdma.c
  user/ngie/more-tests/sys/net80211/ieee80211_tdma.h
  user/ngie/more-tests/sys/net80211/ieee80211_var.h
  user/ngie/more-tests/sys/net80211/ieee80211_wds.c
  user/ngie/more-tests/sys/netinet/sctp_asconf.c
  user/ngie/more-tests/sys/netinet/sctp_cc_functions.c
  user/ngie/more-tests/sys/netinet/sctp_constants.h
  user/ngie/more-tests/sys/netinet/sctp_indata.c
  user/ngie/more-tests/sys/netinet/sctp_input.c
  user/ngie/more-tests/sys/netinet/sctp_output.c
  user/ngie/more-tests/sys/netinet/sctp_pcb.c
  user/ngie/more-tests/sys/netinet/sctp_timer.c
  user/ngie/more-tests/sys/netinet/sctp_usrreq.c
  user/ngie/more-tests/sys/netinet/sctputil.c
  user/ngie/more-tests/sys/netinet6/in6.c
  user/ngie/more-tests/sys/netinet6/nd6.c
  user/ngie/more-tests/sys/netinet6/sctp6_usrreq.c
  user/ngie/more-tests/sys/ofed/drivers/net/mlx4/en_netdev.c
  user/ngie/more-tests/sys/ofed/drivers/net/mlx4/port.c
  user/ngie/more-tests/sys/ofed/include/linux/mlx4/device.h
  user/ngie/more-tests/sys/opencrypto/cryptodeflate.c
  user/ngie/more-tests/sys/powerpc/powerpc/elf32_machdep.c
  user/ngie/more-tests/sys/powerpc/powerpc/elf64_machdep.c
  user/ngie/more-tests/sys/powerpc/powerpc/exec_machdep.c
  user/ngie/more-tests/sys/sparc64/sparc64/elf_machdep.c
  user/ngie/more-tests/sys/sparc64/sparc64/machdep.c
  user/ngie/more-tests/sys/sys/file.h
  user/ngie/more-tests/sys/sys/ktr_class.h
  user/ngie/more-tests/sys/sys/nlist_aout.h
  user/ngie/more-tests/sys/sys/param.h
  user/ngie/more-tests/sys/sys/proc.h
  user/ngie/more-tests/sys/sys/sockio.h
  user/ngie/more-tests/sys/sys/syscallsubr.h
  user/ngie/more-tests/sys/sys/sysent.h
  user/ngie/more-tests/sys/sys/systm.h
  user/ngie/more-tests/sys/sys/user.h
  user/ngie/more-tests/sys/sys/vnode.h
  user/ngie/more-tests/sys/ufs/ffs/ffs_softdep.c
  user/ngie/more-tests/sys/ufs/ffs/ffs_suspend.c
  user/ngie/more-tests/sys/ufs/ffs/ffs_vfsops.c
  user/ngie/more-tests/sys/ufs/ffs/ffs_vnops.c
  user/ngie/more-tests/sys/ufs/ufs/ufs_bmap.c
  user/ngie/more-tests/sys/ufs/ufs/ufs_dirhash.c
  user/ngie/more-tests/sys/vm/vm_object.c
  user/ngie/more-tests/sys/vm/vm_page.c
  user/ngie/more-tests/sys/x86/iommu/busdma_dmar.c
  user/ngie/more-tests/sys/x86/iommu/intel_idpgtbl.c
  user/ngie/more-tests/sys/x86/iommu/intel_qi.c
  user/ngie/more-tests/sys/x86/xen/xenpv.c
  user/ngie/more-tests/tests/sys/kern/ptrace_test.c
  user/ngie/more-tests/tools/build/mk/OptionalObsoleteFiles.inc
  user/ngie/more-tests/usr.bin/Makefile
  user/ngie/more-tests/usr.bin/kdump/Makefile
  user/ngie/more-tests/usr.bin/kdump/kdump.c
  user/ngie/more-tests/usr.bin/man/Makefile
  user/ngie/more-tests/usr.bin/mandoc/Makefile
  user/ngie/more-tests/usr.bin/vmstat/vmstat.8
  user/ngie/more-tests/usr.bin/vmstat/vmstat.c
  user/ngie/more-tests/usr.sbin/bhyve/bhyverun.c
  user/ngie/more-tests/usr.sbin/ntp/Makefile.inc
  user/ngie/more-tests/usr.sbin/ntp/config.h
  user/ngie/more-tests/usr.sbin/ntp/ntp-keygen/Makefile
  user/ngie/more-tests/usr.sbin/ntp/ntpd/Makefile
  user/ngie/more-tests/usr.sbin/ntp/ntpdate/Makefile
  user/ngie/more-tests/usr.sbin/ntp/ntpdc/Makefile
  user/ngie/more-tests/usr.sbin/ntp/ntpq/Makefile
  user/ngie/more-tests/usr.sbin/ntp/sntp/Makefile
  user/ngie/more-tests/usr.sbin/pmcstat/pmcstat.8
  user/ngie/more-tests/usr.sbin/pmcstat/pmcstat.c
  user/ngie/more-tests/usr.sbin/pw/pwupd.h
Directory Properties:
  user/ngie/more-tests/   (props changed)
  user/ngie/more-tests/cddl/   (props changed)
  user/ngie/more-tests/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests/contrib/elftoolchain/   (props changed)
  user/ngie/more-tests/contrib/llvm/   (props changed)
  user/ngie/more-tests/contrib/llvm/tools/clang/   (props changed)
  user/ngie/more-tests/crypto/openssh/   (props changed)
  user/ngie/more-tests/etc/   (props changed)
  user/ngie/more-tests/lib/libc/   (props changed)
  user/ngie/more-tests/lib/libutil/   (props changed)
  user/ngie/more-tests/sbin/   (props changed)
  user/ngie/more-tests/share/   (props changed)
  user/ngie/more-tests/share/man/man4/   (props changed)
  user/ngie/more-tests/sys/   (props changed)
  user/ngie/more-tests/sys/amd64/vmm/   (props changed)
  user/ngie/more-tests/sys/boot/   (props changed)
  user/ngie/more-tests/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/more-tests/sys/conf/   (props changed)
  user/ngie/more-tests/usr.sbin/bhyve/   (props changed)

Modified: user/ngie/more-tests/Makefile.inc1
==============================================================================
--- user/ngie/more-tests/Makefile.inc1	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/Makefile.inc1	Sun May 31 01:02:05 2015	(r283797)
@@ -1276,8 +1276,8 @@ _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 1000002
-_m4=		lib/libohash \
-		usr.bin/m4
+_libohash=	lib/libohash
+_m4=		usr.bin/m4
 
 ${_bt}-usr.bin/m4: ${_bt}-lib/libohash
 .endif
@@ -1363,6 +1363,15 @@ _kerberos5_bootstrap_tools= \
 .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
+.if ${MK_MANDOCDB} != "no"
+_libohash?=	lib/libohash
+_makewhatis=	lib/libsqlite3 \
+		usr.bin/mandoc
+${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
+.else
+_makewhatis=usr.bin/makewhatis
+.endif
+
 # Rebuild up-to-date libmd for xinstall
 ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
 
@@ -1383,7 +1392,8 @@ bootstrap-tools: .PHONY
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
-    usr.bin/makewhatis \
+    ${_libohash} \
+    ${_makewhatis} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
@@ -1755,6 +1765,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 +1773,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"
@@ -1806,9 +1816,10 @@ kerberos5/lib/libroken__L: lib/libcrypt_
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
-lib/libsqlite3__L: lib/libthr__L
 .endif
 
+lib/libsqlite3__L: lib/libthr__L
+
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif

Modified: user/ngie/more-tests/ObsoleteFiles.inc
==============================================================================
--- user/ngie/more-tests/ObsoleteFiles.inc	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/ObsoleteFiles.inc	Sun May 31 01:02:05 2015	(r283797)
@@ -38,6 +38,71 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150528: PCI IOV device driver methods moved to a separate kobj interface.
+OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9
+OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9
+OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9
+# 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: user/ngie/more-tests/UPDATING
==============================================================================
--- user/ngie/more-tests/UPDATING	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/UPDATING	Sun May 31 01:02:05 2015	(r283797)
@@ -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: user/ngie/more-tests/bin/ps/ps.1
==============================================================================
--- user/ngie/more-tests/bin/ps/ps.1	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/bin/ps/ps.1	Sun May 31 01:02:05 2015	(r283797)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd May 22, 2015
+.Dd May 27, 2015
 .Dt PS 1
 .Os
 .Sh NAME
@@ -350,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.

Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1	Sun May 31 01:02:05 2015	(r283797)
@@ -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: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Sun May 31 01:02:05 2015	(r283797)
@@ -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: user/ngie/more-tests/contrib/elftoolchain/common/_elftc.h
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/common/_elftc.h	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/common/_elftc.h	Sun May 31 01:02:05 2015	(r283797)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _elftc.h 3175 2015-03-27 17:21:24Z emaste $
+ * $Id: _elftc.h 3209 2015-05-17 13:40:46Z kaiwang27 $
  */
 
 /**
@@ -342,12 +342,13 @@ struct name {							\
 
 
 #if defined(__GLIBC__) || defined(__linux__)
-
+#ifndef _GNU_SOURCE
 /*
  * GLIBC based systems have a global 'char *' pointer referencing
  * the executable's name.
  */
 extern const char *program_invocation_short_name;
+#endif	/* !_GNU_SOURCE */
 
 #define	ELFTC_GETPROGNAME()	program_invocation_short_name
 

Modified: user/ngie/more-tests/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/common/elfdefinitions.h	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/common/elfdefinitions.h	Sun May 31 01:02:05 2015	(r283797)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: elfdefinitions.h 3178 2015-03-30 18:29:13Z emaste $
+ * $Id: elfdefinitions.h 3198 2015-05-14 18:36:19Z emaste $
  */
 
 /*
@@ -565,6 +565,7 @@ _ELF_DEFINE_EM(EM_SPARC,            2, "
 _ELF_DEFINE_EM(EM_386,              3, "Intel 80386")			\
 _ELF_DEFINE_EM(EM_68K,              4, "Motorola 68000")		\
 _ELF_DEFINE_EM(EM_88K,              5, "Motorola 88000")		\
+_ELF_DEFINE_EM(EM_IAMCU,            6, "Intel MCU")			\
 _ELF_DEFINE_EM(EM_860,              7, "Intel 80860")			\
 _ELF_DEFINE_EM(EM_MIPS,             8, "MIPS I Architecture")		\
 _ELF_DEFINE_EM(EM_S370,             9, "IBM System/370 Processor")	\

Modified: user/ngie/more-tests/contrib/elftoolchain/elfcopy/elfcopy.h
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/elfcopy/elfcopy.h	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/elfcopy/elfcopy.h	Sun May 31 01:02:05 2015	(r283797)
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: elfcopy.h 3173 2015-03-27 16:46:13Z emaste $
+ * $Id: elfcopy.h 3221 2015-05-24 23:42:43Z kaiwang27 $
  */
 
 #include <sys/queue.h>
@@ -237,6 +237,7 @@ struct elfcopy {
 	uint64_t	*secndx;	/* section index map. */
 	uint64_t	*symndx;	/* symbol index map. */
 	unsigned char	*v_rel;		/* symbols needed by relocation. */
+	unsigned char	*v_grp;		/* symbols refered by section group. */
 	unsigned char	*v_secsym;	/* sections with section symbol. */
 	STAILQ_HEAD(, segment) v_seg;	/* list of segments. */
 	STAILQ_HEAD(, sec_action) v_sac;/* list of section operations. */

Modified: user/ngie/more-tests/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/elfcopy/main.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/elfcopy/main.c	Sun May 31 01:02:05 2015	(r283797)
@@ -39,7 +39,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: main.c 3174 2015-03-27 17:13:41Z emaste $");
+ELFTC_VCSID("$Id: main.c 3216 2015-05-23 21:16:36Z kaiwang27 $");
 
 enum options
 {
@@ -404,8 +404,19 @@ create_elf(struct elfcopy *ecp)
 	 * Insert SHDR table into the internal section list as a "pseudo"
 	 * section, so later it will get sorted and resynced just as "normal"
 	 * sections.
+	 *
+	 * Under FreeBSD, Binutils objcopy always put the section header
+	 * at the end of all the sections. We want to do the same here.
+	 *
+	 * However, note that the behaviour is still different with Binutils:
+	 * elfcopy checks the FreeBSD OSABI tag to tell whether it needs to
+	 * move the section headers, while Binutils is probably configured
+	 * this way when it's compiled on FreeBSD.
 	 */
-	shtab = insert_shtab(ecp, 0);
+	if (oeh.e_ident[EI_OSABI] == ELFOSABI_FREEBSD)
+		shtab = insert_shtab(ecp, 1);
+	else
+		shtab = insert_shtab(ecp, 0);
 
 	/*
 	 * Resync section offsets in the output object. This is needed
@@ -485,6 +496,11 @@ free_elf(struct elfcopy *ecp)
 			free(sec);
 		}
 	}
+
+	if (ecp->secndx != NULL) {
+		free(ecp->secndx);
+		ecp->secndx = NULL;
+	}
 }
 
 /* Create a temporary file. */

Modified: user/ngie/more-tests/contrib/elftoolchain/elfcopy/sections.c
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/elfcopy/sections.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/elfcopy/sections.c	Sun May 31 01:02:05 2015	(r283797)
@@ -34,7 +34,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: sections.c 3185 2015-04-11 08:56:34Z kaiwang27 $");
+ELFTC_VCSID("$Id: sections.c 3220 2015-05-24 23:42:39Z kaiwang27 $");
 
 static void	add_gnu_debuglink(struct elfcopy *ecp);
 static uint32_t calc_crc32(const char *p, size_t len, uint32_t crc);
@@ -56,6 +56,7 @@ static void	print_data(const char *d, si
 static void	print_section(struct section *s);
 static void	*read_section(struct section *s, size_t *size);
 static void	update_reloc(struct elfcopy *ecp, struct section *s);
+static void	update_section_group(struct elfcopy *ecp, struct section *s);
 
 int
 is_remove_section(struct elfcopy *ecp, const char *name)
@@ -552,6 +553,14 @@ copy_content(struct elfcopy *ecp)
 		    (s->type == SHT_REL || s->type == SHT_RELA))
 			filter_reloc(ecp, s);
 
+		/*
+		 * The section indices in the SHT_GROUP section needs
+		 * to be updated since we might have stripped some
+		 * sections and changed section numbering.
+		 */
+		if (s->type == SHT_GROUP)
+			update_section_group(ecp, s);
+
 		if (is_modify_section(ecp, s->name))
 			modify_section(ecp, s);
 
@@ -571,6 +580,71 @@ copy_content(struct elfcopy *ecp)
 	}
 }
 
+
+/*
+ * Update section group section. The section indices in the SHT_GROUP
+ * section need update after section numbering changed.
+ */
+static void
+update_section_group(struct elfcopy *ecp, struct section *s)
+{
+	GElf_Shdr	 ish;
+	Elf_Data	*id;
+	uint32_t	*ws, *wd;
+	uint64_t	 n;
+	size_t		 ishnum;
+	int		 i, j;
+
+	if (!elf_getshnum(ecp->ein, &ishnum))
+		errx(EXIT_FAILURE, "elf_getshnum failed: %s",
+		    elf_errmsg(-1));
+
+	if (gelf_getshdr(s->is, &ish) == NULL)
+		errx(EXIT_FAILURE, "gelf_getehdr() failed: %s",
+		    elf_errmsg(-1));
+
+	if ((id = elf_getdata(s->is, NULL)) == NULL)
+		errx(EXIT_FAILURE, "elf_getdata() failed: %s",
+		    elf_errmsg(-1));
+
+	if (ish.sh_size == 0)
+		return;
+
+	if (ish.sh_entsize == 0)
+		ish.sh_entsize = 4;
+
+	ws = id->d_buf;
+
+	/* We only support COMDAT section. */
+#ifndef GRP_COMDAT
+#define	GRP_COMDAT 0x1
+#endif
+	if ((*ws & GRP_COMDAT) == 0)
+		return;
+
+	if ((s->buf = malloc(ish.sh_size)) == NULL)
+		err(EXIT_FAILURE, "malloc failed");
+
+	s->sz = ish.sh_size;
+
+	wd = s->buf;
+
+	/* Copy the flag word as-is. */
+	*wd = *ws;
+
+	/* Update the section indices. */
+	n = ish.sh_size / ish.sh_entsize;
+	for(i = 1, j = 1; (uint64_t)i < n; i++) {
+		if (ws[i] != SHN_UNDEF && ws[i] < ishnum &&
+		    ecp->secndx[ws[i]] != 0)
+			wd[j++] = ecp->secndx[ws[i]];
+		else
+			s->sz -= 4;
+	}
+
+	s->nocopy = 1;
+}
+
 /*
  * Filter relocation entries, only keep those entries whose
  * symbol is in the keep list.
@@ -1028,8 +1102,11 @@ copy_shdr(struct elfcopy *ecp, struct se
 				osh.sh_flags |= SHF_WRITE;
 			if (sec_flags & SF_CODE)
 				osh.sh_flags |= SHF_EXECINSTR;
-		} else
+		} else {
 			osh.sh_flags = ish.sh_flags;
+			if (ish.sh_type == SHT_REL || ish.sh_type == SHT_RELA)
+				osh.sh_flags |= SHF_INFO_LINK;
+		}
 	}
 
 	if (name == NULL)

Modified: user/ngie/more-tests/contrib/elftoolchain/elfcopy/symbols.c
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/elfcopy/symbols.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/elfcopy/symbols.c	Sun May 31 01:02:05 2015	(r283797)
@@ -33,7 +33,7 @@
 
 #include "elfcopy.h"
 
-ELFTC_VCSID("$Id: symbols.c 3191 2015-05-04 17:07:01Z jkoshy $");
+ELFTC_VCSID("$Id: symbols.c 3222 2015-05-24 23:47:23Z kaiwang27 $");
 
 /* Symbol table buffer structure. */
 struct symbuf {
@@ -77,7 +77,8 @@ static int	is_weak_symbol(unsigned char 
 static int	lookup_exact_string(hash_head *hash, const char *buf,
 		    const char *s);
 static int	generate_symbols(struct elfcopy *ecp);
-static void	mark_symbols(struct elfcopy *ecp, size_t sc);
+static void	mark_reloc_symbols(struct elfcopy *ecp, size_t sc);
+static void	mark_section_group_symbols(struct elfcopy *ecp, size_t sc);
 static int	match_wildcard(const char *name, const char *pattern);
 uint32_t	str_hash(const char *s);
 
@@ -160,6 +161,10 @@ is_needed_symbol(struct elfcopy *ecp, in
 	if (BIT_ISSET(ecp->v_rel, i))
 		return (1);
 
+	/* Symbols refered by COMDAT sections are needed. */
+	if (BIT_ISSET(ecp->v_grp, i))
+		return (1);
+
 	/*
 	 * For relocatable files (.o files), global and weak symbols
 	 * are needed.
@@ -207,7 +212,10 @@ is_remove_symbol(struct elfcopy *ecp, si
 		return (1);
 
 	if (ecp->v_rel == NULL)
-		mark_symbols(ecp, sc);
+		mark_reloc_symbols(ecp, sc);
+
+	if (ecp->v_grp == NULL)
+		mark_section_group_symbols(ecp, sc);
 
 	if (is_needed_symbol(ecp, i, s))
 		return (0);
@@ -233,7 +241,7 @@ is_remove_symbol(struct elfcopy *ecp, si
  * Mark symbols refered by relocation entries.
  */
 static void
-mark_symbols(struct elfcopy *ecp, size_t sc)
+mark_reloc_symbols(struct elfcopy *ecp, size_t sc)
 {
 	const char	*name;
 	Elf_Data	*d;
@@ -311,6 +319,49 @@ mark_symbols(struct elfcopy *ecp, size_t
 		    elf_errmsg(elferr));
 }
 
+static void
+mark_section_group_symbols(struct elfcopy *ecp, size_t sc)
+{
+	const char	*name;
+	Elf_Scn		*s;
+	GElf_Shdr	 sh;
+	size_t		 indx;
+	int		 elferr;
+
+	ecp->v_grp = calloc((sc + 7) / 8, 1);
+	if (ecp->v_grp == NULL)
+		err(EXIT_FAILURE, "calloc failed");
+
+	if (elf_getshstrndx(ecp->ein, &indx) == 0)
+		errx(EXIT_FAILURE, "elf_getshstrndx failed: %s",
+		    elf_errmsg(-1));
+
+	s = NULL;
+	while ((s = elf_nextscn(ecp->ein, s)) != NULL) {
+		if (gelf_getshdr(s, &sh) != &sh)
+			errx(EXIT_FAILURE, "elf_getshdr failed: %s",
+			    elf_errmsg(-1));
+
+		if (sh.sh_type != SHT_GROUP)
+			continue;
+
+		if ((name = elf_strptr(ecp->ein, indx, sh.sh_name)) == NULL)
+			errx(EXIT_FAILURE, "elf_strptr failed: %s",
+			    elf_errmsg(-1));
+		if (is_remove_section(ecp, name))
+			continue;
+
+		if (sh.sh_info > 0 && sh.sh_info < sc)
+			BIT_SET(ecp->v_grp, sh.sh_info);
+		else if (sh.sh_info != 0)
+			warnx("invalid symbox index");
+	}
+	elferr = elf_errno();
+	if (elferr != 0)
+		errx(EXIT_FAILURE, "elf_nextscn failed: %s",
+		    elf_errmsg(elferr));
+}
+
 static int
 generate_symbols(struct elfcopy *ecp)
 {
@@ -351,6 +402,8 @@ generate_symbols(struct elfcopy *ecp)
 	ecp->symtab->buf = sy_buf;
 	ecp->strtab->buf = st_buf;
 
+	gsym = NULL;
+
 	/*
 	 * Create bit vector v_secsym, which is used to mark sections
 	 * that already have corresponding STT_SECTION symbols.
@@ -384,7 +437,7 @@ generate_symbols(struct elfcopy *ecp)
 	/* Symbol table should exist if this function is called. */
 	if (symndx == 0) {
 		warnx("can't find .strtab section");
-		return (0);
+		goto clean;
 	}
 
 	/* Locate .symtab of input object. */
@@ -413,7 +466,6 @@ generate_symbols(struct elfcopy *ecp)
 	 * output object, it is used by update_reloc() later to update
 	 * relocation information.
 	 */
-	gsym = NULL;
 	sc = ish.sh_size / ish.sh_entsize;
 	if (sc > 0) {
 		ecp->symndx = calloc(sc, sizeof(*ecp->symndx));
@@ -427,7 +479,7 @@ generate_symbols(struct elfcopy *ecp)
 			if (elferr != 0)
 				errx(EXIT_FAILURE, "elf_getdata failed: %s",
 				    elf_errmsg(elferr));
-			return (0);
+			goto clean;
 		}
 	} else
 		return (0);
@@ -523,7 +575,7 @@ generate_symbols(struct elfcopy *ecp)
 	 * check if that only local symbol is the reserved symbol.
 	 */
 	if (sy_buf->nls <= 1 && sy_buf->ngs == 0)
-		return (0);
+		goto clean;
 
 	/*
 	 * Create STT_SECTION symbols for sections that do not already
@@ -550,6 +602,7 @@ generate_symbols(struct elfcopy *ecp)
 			sym.st_value = s->vma;
 			sym.st_size  = 0;
 			sym.st_info  = GELF_ST_INFO(STB_LOCAL, STT_SECTION);
+			sym.st_other = STV_DEFAULT;
 			/*
 			 * Don't let add_to_symtab() touch sym.st_shndx.
 			 * In this case, we know the index already.
@@ -583,6 +636,12 @@ generate_symbols(struct elfcopy *ecp)
 	}
 
 	return (1);
+
+clean:
+	free(gsym);
+	free_symtab(ecp);
+
+	return (0);
 }
 
 void
@@ -624,7 +683,9 @@ create_symtab(struct elfcopy *ecp)
 	if (((ecp->flags & SYMTAB_INTACT) == 0) && !generate_symbols(ecp)) {
 		TAILQ_REMOVE(&ecp->v_sec, ecp->symtab, sec_list);
 		TAILQ_REMOVE(&ecp->v_sec, ecp->strtab, sec_list);
+		free(ecp->symtab->buf);
 		free(ecp->symtab);
+		free(ecp->strtab->buf);
 		free(ecp->strtab);
 		ecp->symtab = NULL;
 		ecp->strtab = NULL;
@@ -697,6 +758,23 @@ free_symtab(struct elfcopy *ecp)
 			}
 		}
 	}
+
+	if (ecp->symndx != NULL) {
+		free(ecp->symndx);
+		ecp->symndx = NULL;
+	}
+	if (ecp->v_rel != NULL) {
+		free(ecp->v_rel);
+		ecp->v_rel = NULL;
+	}
+	if (ecp->v_grp != NULL) {
+		free(ecp->v_grp);
+		ecp->v_grp = NULL;
+	}
+	if (ecp->v_secsym != NULL) {
+		free(ecp->v_secsym);
+		ecp->v_secsym = NULL;
+	}
 }
 
 void

Modified: user/ngie/more-tests/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Sun May 31 01:02:05 2015	(r283797)
@@ -26,7 +26,7 @@
 
 #include "_libdwarf.h"
 
-ELFTC_VCSID("$Id: libdwarf_reloc.c 3149 2015-02-15 19:00:06Z emaste $");
+ELFTC_VCSID("$Id: libdwarf_reloc.c 3198 2015-05-14 18:36:19Z emaste $");
 
 Dwarf_Unsigned
 _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64)
@@ -75,6 +75,7 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
 			return (4);
 		break;
 	case EM_386:
+	case EM_IAMCU:
 		if (rel_type == R_386_32)
 			return (4);
 		break;

Modified: user/ngie/more-tests/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- user/ngie/more-tests/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Sun May 31 00:52:45 2015	(r283796)
+++ user/ngie/more-tests/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Sun May 31 01:02:05 2015	(r283797)
@@ -36,7 +36,7 @@
 
 #include "_libelftc.h"
 
-ELFTC_VCSID("$Id: libelftc_dem_gnu3.c 3194 2015-05-05 17:55:16Z emaste $");
+ELFTC_VCSID("$Id: libelftc_dem_gnu3.c 3212 2015-05-17 13:40:55Z kaiwang27 $");
 
 /**
  * @file cpp_demangle.c
@@ -50,7 +50,7 @@ ELFTC_VCSID("$Id: libelftc_dem_gnu3.c 31
 
 enum type_qualifier {
 	TYPE_PTR, TYPE_REF, TYPE_CMX, TYPE_IMG, TYPE_EXT, TYPE_RST, TYPE_VAT,
-	TYPE_CST
+	TYPE_CST, TYPE_VEC
 };
 
 struct vector_type_qualifier {
@@ -84,6 +84,7 @@ struct cpp_demangle_data {
 	int			 func_type;
 	const char		*cur;		/* current mangled name ptr */
 	const char		*last_sname;	/* last source name */
+	int			 push_head;
 };
 
 #define	CPP_DEMANGLE_TRY_LIMIT	128
@@ -112,6 +113,8 @@ static int	cpp_demangle_read_array(struc
 static int	cpp_demangle_read_encoding(struct cpp_demangle_data *);
 static int	cpp_demangle_read_expr_primary(struct cpp_demangle_data *);
 static int	cpp_demangle_read_expression(struct cpp_demangle_data *);
+static int	cpp_demangle_read_expression_flat(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_expression_binary(struct cpp_demangle_data *,
 		    const char *, size_t);
 static int	cpp_demangle_read_expression_unary(struct cpp_demangle_data *,
@@ -123,8 +126,12 @@ static int	cpp_demangle_read_function(st
 static int	cpp_demangle_local_source_name(struct cpp_demangle_data *ddata);
 static int	cpp_demangle_read_local_name(struct cpp_demangle_data *);
 static int	cpp_demangle_read_name(struct cpp_demangle_data *);
+static int	cpp_demangle_read_name_flat(struct cpp_demangle_data *,
+		    char**);
 static int	cpp_demangle_read_nested_name(struct cpp_demangle_data *);
 static int	cpp_demangle_read_number(struct cpp_demangle_data *, long *);
+static int	cpp_demangle_read_number_as_string(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_nv_offset(struct cpp_demangle_data *);
 static int	cpp_demangle_read_offset(struct cpp_demangle_data *);
 static int	cpp_demangle_read_offset_number(struct cpp_demangle_data *);
@@ -138,6 +145,8 @@ static int	cpp_demangle_read_tmpl_arg(st
 static int	cpp_demangle_read_tmpl_args(struct cpp_demangle_data *);
 static int	cpp_demangle_read_tmpl_param(struct cpp_demangle_data *);
 static int	cpp_demangle_read_type(struct cpp_demangle_data *, int);
+static int	cpp_demangle_read_type_flat(struct cpp_demangle_data *,
+		    char **);
 static int	cpp_demangle_read_uqname(struct cpp_demangle_data *);
 static int	cpp_demangle_read_v_offset(struct cpp_demangle_data *);
 static char	*decode_fp_to_double(const char *, size_t);
@@ -156,8 +165,6 @@ static int	vector_type_qualifier_init(st
 static int	vector_type_qualifier_push(struct vector_type_qualifier *,
 		    enum type_qualifier);
 
-static int cpp_demangle_gnu3_push_head;
-
 /**
  * @brief Decode the input string by IA-64 C++ ABI style.
  *
@@ -190,7 +197,6 @@ cpp_demangle_gnu3(const char *org)
 	if (!cpp_demangle_data_init(&ddata, org + 2))
 		return (NULL);
 
-	cpp_demangle_gnu3_push_head = 0;
 	rtn = NULL;
 
 	if (!cpp_demangle_read_encoding(&ddata))
@@ -277,6 +283,7 @@ cpp_demangle_data_init(struct cpp_demang
 	d->func_type = 0;
 	d->cur = cur;
 	d->last_sname = NULL;
+	d->push_head = 0;
 
 	return (1);
 
@@ -309,7 +316,6 @@ cpp_demangle_push_fp(struct cpp_demangle
 	fp = ddata->cur;
 	while (*ddata->cur != 'E')
 		++ddata->cur;
-	++ddata->cur;
 
 	if ((f = decoder(fp, ddata->cur - fp)) == NULL)
 		return (0);
@@ -320,6 +326,8 @@ cpp_demangle_push_fp(struct cpp_demangle
 
 	free(f);
 
+	++ddata->cur;
+
 	return (rtn);
 }
 
@@ -331,7 +339,7 @@ cpp_demangle_push_str(struct cpp_demangl
 	if (ddata == NULL || str == NULL || len == 0)
 		return (0);
 
-	if (cpp_demangle_gnu3_push_head > 0)
+	if (ddata->push_head > 0)
 		return (vector_str_push(&ddata->output_tmp, str, len));
 
 	return (vector_str_push(&ddata->output, str, len));
@@ -403,7 +411,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, "*", 1))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -414,7 +423,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, "&", 1))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -425,7 +435,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " complex", 8))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -434,23 +445,26 @@ cpp_demangle_push_type_qualifier(struct 
 			if (!cpp_demangle_push_str(ddata, " imaginary", 10))
 				goto clean;
 			if (type_str != NULL) {
-				if (!vector_str_push(&subst_v, " imaginary", 10))
+				if (!vector_str_push(&subst_v, " imaginary",
+				    10))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
 
 		case TYPE_EXT:
-			if (e_idx > v->ext_name.size - 1)
+			if (v->ext_name.size == 0 ||
+			    e_idx > v->ext_name.size - 1)
 				goto clean;
-			if ((e_len = strlen(v->ext_name.container[e_idx])) == 0)
+			if ((e_len = strlen(v->ext_name.container[e_idx])) ==
+			    0)
 				goto clean;
-			if ((buf = malloc(sizeof(char) * (e_len + 1))) == NULL)
+			if ((buf = malloc(e_len + 2)) == NULL)
 				goto clean;
-
-			memcpy(buf, " ", 1);
-			memcpy(buf + 1, v->ext_name.container[e_idx], e_len);
+			snprintf(buf, e_len + 2, " %s",
+			    v->ext_name.container[e_idx]);
 
 			if (!cpp_demangle_push_str(ddata, buf, e_len + 1)) {
 				free(buf);
@@ -463,7 +477,8 @@ cpp_demangle_push_type_qualifier(struct 
 					free(buf);
 					goto clean;
 				}
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v)) {
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v)) {
 					free(buf);
 					goto clean;
 				}
@@ -478,7 +493,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " restrict", 9))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -489,7 +505,8 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " volatile", 9))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
@@ -500,11 +517,42 @@ cpp_demangle_push_type_qualifier(struct 
 			if (type_str != NULL) {
 				if (!vector_str_push(&subst_v, " const", 6))
 					goto clean;
-				if (!cpp_demangle_push_subst_v(ddata, &subst_v))
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v))
 					goto clean;
 			}
 			break;
 
+		case TYPE_VEC:
+			if (v->ext_name.size == 0 ||
+			    e_idx > v->ext_name.size - 1)
+				goto clean;
+			if ((e_len = strlen(v->ext_name.container[e_idx])) ==
+			    0)
+				goto clean;
+			if ((buf = malloc(e_len + 12)) == NULL)
+				goto clean;
+			snprintf(buf, e_len + 12, " __vector(%s)",
+			    v->ext_name.container[e_idx]);
+			if (!cpp_demangle_push_str(ddata, buf, e_len + 11)) {
+				free(buf);
+				goto clean;
+			}
+			if (type_str != NULL) {
+				if (!vector_str_push(&subst_v, buf,
+				    e_len + 11)) {
+					free(buf);
+					goto clean;
+				}
+				if (!cpp_demangle_push_subst_v(ddata,
+				    &subst_v)) {
+					free(buf);
+					goto clean;
+				}
+			}
+			free(buf);
+			++e_idx;
+			break;
 		};
 		--idx;
 	}
@@ -655,10 +703,14 @@ cpp_demangle_read_expr_primary(struct cp
 
 	switch (*ddata->cur) {
 	case 'b':
+		if (*(ddata->cur + 2) != 'E')
+			return (0);
 		switch (*(++ddata->cur)) {
 		case '0':
+			ddata->cur += 2;
 			return (cpp_demangle_push_str(ddata, "false", 5));
 		case '1':
+			ddata->cur += 2;
 			return (cpp_demangle_push_str(ddata, "true", 4));
 		default:
 			return (0);
@@ -707,7 +759,8 @@ cpp_demangle_read_expr_primary(struct cp
 			++ddata->cur;
 		}
 		++ddata->cur;
-		return (cpp_demangle_push_str(ddata, num, ddata->cur - num));
+		return (cpp_demangle_push_str(ddata, num,
+		    ddata->cur - num - 1));
 
 	default:
 		return (0);
@@ -999,6 +1052,38 @@ cpp_demangle_read_expression(struct cpp_
 }
 
 static int
+cpp_demangle_read_expression_flat(struct cpp_demangle_data *ddata, char **str)
+{
+	struct vector_str *output;
+	size_t i, p_idx, idx, exp_len;
+	char *exp;
+
+	output = ddata->push_head > 0 ? &ddata->output_tmp :
+	    &ddata->output;
+
+	p_idx = output->size;
+
+	if (!cpp_demangle_read_expression(ddata))
+		return (0);
+
+	if ((exp = vector_str_substr(output, p_idx, output->size - 1,
+	    &exp_len)) == NULL)
+		return (0);
+
+	idx = output->size;
+	for (i = p_idx; i < idx; ++i) {
+		if (!vector_str_pop(output)) {
+			free(exp);
+			return (0);
+		}
+	}
+
+	*str = exp;
+
+	return (1);
+}
+
+static int
 cpp_demangle_read_expression_binary(struct cpp_demangle_data *ddata,
     const char *name, size_t len)
 {
@@ -1127,12 +1212,65 @@ cpp_demangle_read_function(struct cpp_de
 static int
 cpp_demangle_read_encoding(struct cpp_demangle_data *ddata)
 {
+	char *name, *type, *num_str;
+	long offset;
+	int rtn;
 
 	if (ddata == NULL || *ddata->cur == '\0')
 		return (0);
 
 	/* special name */
 	switch (SIMPLE_HASH(*ddata->cur, *(ddata->cur + 1))) {
+	case SIMPLE_HASH('G', 'A'):
+		if (!cpp_demangle_push_str(ddata, "hidden alias for ", 17))
+			return (0);
+		ddata->cur += 2;
+		if (*ddata->cur == '\0')
+			return (0);
+		return (cpp_demangle_read_encoding(ddata));
+

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

More information about the svn-src-user mailing list