Date: Sat, 22 Mar 2014 10:42:02 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263622 - in projects/arm_eabi_vfp: . bin/pkill bin/pkill/tests bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool contrib/file ... Message-ID: <201403221042.s2MAg2L5055106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sat Mar 22 10:42:01 2014 New Revision: 263622 URL: http://svnweb.freebsd.org/changeset/base/263622 Log: MFC Added: projects/arm_eabi_vfp/bin/pkill/tests/ - copied from r263620, head/bin/pkill/tests/ projects/arm_eabi_vfp/contrib/llvm/patches/ - copied from r263620, head/contrib/llvm/patches/ projects/arm_eabi_vfp/lib/libpmc/pmc.atomsilvermont.3 - copied unchanged from r263620, head/lib/libpmc/pmc.atomsilvermont.3 projects/arm_eabi_vfp/sbin/ifconfig/tests/ - copied from r263620, head/sbin/ifconfig/tests/ projects/arm_eabi_vfp/share/man/man4/umoscom.4 - copied unchanged from r263620, head/share/man/man4/umoscom.4 projects/arm_eabi_vfp/share/man/man4/usb_template.4 - copied unchanged from r263620, head/share/man/man4/usb_template.4 projects/arm_eabi_vfp/share/man/man4/usfs.4 - copied unchanged from r263620, head/share/man/man4/usfs.4 projects/arm_eabi_vfp/sys/arm/conf/CHROMEBOOK - copied unchanged from r263620, head/sys/arm/conf/CHROMEBOOK projects/arm_eabi_vfp/sys/arm/samsung/exynos/exynos5_common.h - copied unchanged from r263620, head/sys/arm/samsung/exynos/exynos5_common.h projects/arm_eabi_vfp/sys/arm/samsung/exynos/exynos5_ehci.c - copied unchanged from r263620, head/sys/arm/samsung/exynos/exynos5_ehci.c projects/arm_eabi_vfp/sys/arm/samsung/exynos/exynos5_fimd.c - copied unchanged from r263620, head/sys/arm/samsung/exynos/exynos5_fimd.c projects/arm_eabi_vfp/sys/arm/samsung/exynos/exynos5_mct.c - copied unchanged from r263620, head/sys/arm/samsung/exynos/exynos5_mct.c projects/arm_eabi_vfp/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts - copied unchanged from r263620, head/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts projects/arm_eabi_vfp/sys/ia64/ia64/xtrace.c - copied unchanged from r263620, head/sys/ia64/ia64/xtrace.c projects/arm_eabi_vfp/sys/mips/atheros/ar934x_nfcreg.h - copied unchanged from r263620, head/sys/mips/atheros/ar934x_nfcreg.h projects/arm_eabi_vfp/tests/sys/netinet/ - copied from r263620, head/tests/sys/netinet/ projects/arm_eabi_vfp/usr.bin/make/tests/ - copied from r263620, head/usr.bin/make/tests/ Deleted: projects/arm_eabi_vfp/share/man/man4/usb2_template.4 projects/arm_eabi_vfp/sys/arm/samsung/exynos/arch_timer.c projects/arm_eabi_vfp/sys/arm/samsung/exynos/ehci_exynos5.c projects/arm_eabi_vfp/sys/x86/isa/isa.h projects/arm_eabi_vfp/tools/regression/usr.bin/make/ projects/arm_eabi_vfp/tools/regression/usr.bin/pkill/ Modified: projects/arm_eabi_vfp/MAINTAINERS (contents, props changed) projects/arm_eabi_vfp/Makefile.inc1 projects/arm_eabi_vfp/ObsoleteFiles.inc projects/arm_eabi_vfp/bin/pkill/Makefile projects/arm_eabi_vfp/bin/sh/jobs.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zdb/zdb.8 projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/arm_eabi_vfp/contrib/file/mygetopt.h projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFunction.h projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/MachineFunction.cpp projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/arm_eabi_vfp/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/arm_eabi_vfp/contrib/pf/pflogd/pidfile.c projects/arm_eabi_vfp/contrib/subversion/subversion/svn/util.c projects/arm_eabi_vfp/contrib/tnftp/COPYING projects/arm_eabi_vfp/contrib/vis/extern.h projects/arm_eabi_vfp/etc/mtree/BSD.tests.dist projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_double.c projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_float.c projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h projects/arm_eabi_vfp/lib/libedit/chartype.h projects/arm_eabi_vfp/lib/libnv/nv.3 projects/arm_eabi_vfp/lib/libpmc/Makefile projects/arm_eabi_vfp/lib/libpmc/libpmc.c projects/arm_eabi_vfp/lib/libpmc/pmc.atom.3 projects/arm_eabi_vfp/sbin/casperd/Makefile projects/arm_eabi_vfp/sbin/ifconfig/Makefile projects/arm_eabi_vfp/sbin/ping/Makefile projects/arm_eabi_vfp/share/examples/etc/make.conf projects/arm_eabi_vfp/share/man/man4/Makefile projects/arm_eabi_vfp/share/man/man4/cxgbe.4 projects/arm_eabi_vfp/share/man/man4/nvd.4 projects/arm_eabi_vfp/share/man/man4/nvme.4 projects/arm_eabi_vfp/share/man/man4/vmx.4 projects/arm_eabi_vfp/share/man/man4/wsp.4 projects/arm_eabi_vfp/share/man/man4/xhci.4 projects/arm_eabi_vfp/share/man/man7/tests.7 projects/arm_eabi_vfp/share/man/man9/bus_dma.9 projects/arm_eabi_vfp/share/man/man9/bus_space.9 projects/arm_eabi_vfp/share/man/man9/counter.9 projects/arm_eabi_vfp/share/man/man9/memguard.9 projects/arm_eabi_vfp/share/man/man9/vm_set_page_size.9 projects/arm_eabi_vfp/share/mk/bsd.cpu.mk projects/arm_eabi_vfp/sys/amd64/amd64/machdep.c projects/arm_eabi_vfp/sys/amd64/amd64/mem.c projects/arm_eabi_vfp/sys/amd64/amd64/pmap.c projects/arm_eabi_vfp/sys/amd64/amd64/trap.c projects/arm_eabi_vfp/sys/amd64/amd64/uma_machdep.c projects/arm_eabi_vfp/sys/amd64/amd64/vm_machdep.c projects/arm_eabi_vfp/sys/amd64/conf/GENERIC projects/arm_eabi_vfp/sys/amd64/conf/NOTES projects/arm_eabi_vfp/sys/amd64/include/pmap.h projects/arm_eabi_vfp/sys/amd64/vmm/vmm.c projects/arm_eabi_vfp/sys/arm/arm/cpufunc.c projects/arm_eabi_vfp/sys/arm/arm/cpufunc_asm_armv7.S projects/arm_eabi_vfp/sys/arm/arm/machdep.c projects/arm_eabi_vfp/sys/arm/arm/pmap-v6.c projects/arm_eabi_vfp/sys/arm/arm/pmap.c projects/arm_eabi_vfp/sys/arm/conf/AC100 projects/arm_eabi_vfp/sys/arm/conf/ARMADAXP projects/arm_eabi_vfp/sys/arm/conf/ARNDALE projects/arm_eabi_vfp/sys/arm/conf/ATMEL projects/arm_eabi_vfp/sys/arm/conf/AVILA projects/arm_eabi_vfp/sys/arm/conf/BEAGLEBONE projects/arm_eabi_vfp/sys/arm/conf/BWCT projects/arm_eabi_vfp/sys/arm/conf/CAMBRIA projects/arm_eabi_vfp/sys/arm/conf/CNS11XXNAS projects/arm_eabi_vfp/sys/arm/conf/COLIBRI-VF50 projects/arm_eabi_vfp/sys/arm/conf/COSMIC projects/arm_eabi_vfp/sys/arm/conf/CRB projects/arm_eabi_vfp/sys/arm/conf/CUBIEBOARD projects/arm_eabi_vfp/sys/arm/conf/CUBIEBOARD2 projects/arm_eabi_vfp/sys/arm/conf/DB-78XXX projects/arm_eabi_vfp/sys/arm/conf/DB-88F5XXX projects/arm_eabi_vfp/sys/arm/conf/DB-88F6XXX projects/arm_eabi_vfp/sys/arm/conf/DIGI-CCWMX53 projects/arm_eabi_vfp/sys/arm/conf/DOCKSTAR projects/arm_eabi_vfp/sys/arm/conf/DREAMPLUG-1001 projects/arm_eabi_vfp/sys/arm/conf/EA3250 projects/arm_eabi_vfp/sys/arm/conf/EB9200 projects/arm_eabi_vfp/sys/arm/conf/EFIKA_MX projects/arm_eabi_vfp/sys/arm/conf/EP80219 projects/arm_eabi_vfp/sys/arm/conf/ETHERNUT5 projects/arm_eabi_vfp/sys/arm/conf/GUMSTIX projects/arm_eabi_vfp/sys/arm/conf/HL200 projects/arm_eabi_vfp/sys/arm/conf/HL201 projects/arm_eabi_vfp/sys/arm/conf/IMX53-QSB projects/arm_eabi_vfp/sys/arm/conf/IMX6 projects/arm_eabi_vfp/sys/arm/conf/IQ31244 projects/arm_eabi_vfp/sys/arm/conf/KB920X projects/arm_eabi_vfp/sys/arm/conf/LN2410SBC projects/arm_eabi_vfp/sys/arm/conf/NSLU projects/arm_eabi_vfp/sys/arm/conf/PANDABOARD projects/arm_eabi_vfp/sys/arm/conf/QILA9G20 projects/arm_eabi_vfp/sys/arm/conf/QUARTZ projects/arm_eabi_vfp/sys/arm/conf/RADXA projects/arm_eabi_vfp/sys/arm/conf/RPI-B projects/arm_eabi_vfp/sys/arm/conf/SAM9260EK projects/arm_eabi_vfp/sys/arm/conf/SAM9G20EK projects/arm_eabi_vfp/sys/arm/conf/SAM9X25EK projects/arm_eabi_vfp/sys/arm/conf/SHEEVAPLUG projects/arm_eabi_vfp/sys/arm/conf/SN9G45 projects/arm_eabi_vfp/sys/arm/conf/TS7800 projects/arm_eabi_vfp/sys/arm/conf/VERSATILEPB projects/arm_eabi_vfp/sys/arm/conf/VYBRID.common projects/arm_eabi_vfp/sys/arm/conf/WANDBOARD.common projects/arm_eabi_vfp/sys/arm/conf/ZEDBOARD projects/arm_eabi_vfp/sys/arm/samsung/exynos/files.exynos5 projects/arm_eabi_vfp/sys/boot/common/part.c projects/arm_eabi_vfp/sys/boot/fdt/dts/arm/exynos5250.dtsi projects/arm_eabi_vfp/sys/boot/uboot/common/main.c projects/arm_eabi_vfp/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_misc.c projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_proto.h projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_syscall.h projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_syscalls.c projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_sysent.c projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32_systrace_args.c projects/arm_eabi_vfp/sys/compat/freebsd32/syscalls.master projects/arm_eabi_vfp/sys/compat/linprocfs/linprocfs.c projects/arm_eabi_vfp/sys/compat/linux/linux_misc.c projects/arm_eabi_vfp/sys/compat/svr4/svr4_fuser.h projects/arm_eabi_vfp/sys/compat/svr4/svr4_ipc.c projects/arm_eabi_vfp/sys/compat/svr4/svr4_misc.c projects/arm_eabi_vfp/sys/compat/svr4/svr4_resource.c projects/arm_eabi_vfp/sys/compat/svr4/svr4_resource.h projects/arm_eabi_vfp/sys/conf/files.ia64 projects/arm_eabi_vfp/sys/conf/options.ia64 projects/arm_eabi_vfp/sys/dev/ath/ah_osdep.c projects/arm_eabi_vfp/sys/dev/ath/ath_hal/ar5212/ar5212_power.c projects/arm_eabi_vfp/sys/dev/ath/ath_hal/ar5416/ar5416_power.c projects/arm_eabi_vfp/sys/dev/ath/if_ath.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_tx.c projects/arm_eabi_vfp/sys/dev/cxgbe/adapter.h projects/arm_eabi_vfp/sys/dev/cxgbe/common/t4_hw.h projects/arm_eabi_vfp/sys/dev/cxgbe/t4_main.c projects/arm_eabi_vfp/sys/dev/cxgbe/t4_sge.c projects/arm_eabi_vfp/sys/dev/esp/ncr53c9xvar.h projects/arm_eabi_vfp/sys/dev/hwpmc/hwpmc_core.c projects/arm_eabi_vfp/sys/dev/hwpmc/hwpmc_intel.c projects/arm_eabi_vfp/sys/dev/hwpmc/pmc_events.h projects/arm_eabi_vfp/sys/dev/isci/scil/sati_passthrough.c projects/arm_eabi_vfp/sys/dev/isci/scil/sati_util.h projects/arm_eabi_vfp/sys/dev/isci/scil/sci_controller_constants.h projects/arm_eabi_vfp/sys/dev/isci/scil/sci_util.h projects/arm_eabi_vfp/sys/dev/isci/scil/scic_sds_request.h projects/arm_eabi_vfp/sys/dev/le/am7990.c projects/arm_eabi_vfp/sys/dev/le/am79900.c projects/arm_eabi_vfp/sys/dev/le/am79900reg.h projects/arm_eabi_vfp/sys/dev/le/am7990reg.h projects/arm_eabi_vfp/sys/dev/le/if_le_isa.c projects/arm_eabi_vfp/sys/dev/le/if_le_pci.c projects/arm_eabi_vfp/sys/dev/le/lance.c projects/arm_eabi_vfp/sys/dev/le/lancereg.h projects/arm_eabi_vfp/sys/dev/md/md.c projects/arm_eabi_vfp/sys/dev/nvme/nvme.c projects/arm_eabi_vfp/sys/dev/nvme/nvme_ctrlr.c projects/arm_eabi_vfp/sys/dev/nvme/nvme_private.h projects/arm_eabi_vfp/sys/dev/nvme/nvme_qpair.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge_tx.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge_tx.h projects/arm_eabi_vfp/sys/dev/usb/input/ukbd.c projects/arm_eabi_vfp/sys/dev/usb/serial/ubsa.c projects/arm_eabi_vfp/sys/dev/usb/serial/ubser.c projects/arm_eabi_vfp/sys/dev/usb/serial/uchcom.c projects/arm_eabi_vfp/sys/dev/usb/serial/ufoma.c projects/arm_eabi_vfp/sys/dev/usb/serial/umodem.c projects/arm_eabi_vfp/sys/dev/usb/serial/uplcom.c projects/arm_eabi_vfp/sys/dev/usb/serial/usb_serial.c projects/arm_eabi_vfp/sys/dev/usb/serial/usb_serial.h projects/arm_eabi_vfp/sys/dev/usb/usb_dev.c projects/arm_eabi_vfp/sys/dev/usb/usb_device.c projects/arm_eabi_vfp/sys/dev/usb/usb_process.c projects/arm_eabi_vfp/sys/dev/usb/usb_process.h projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmx.c projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmxreg.h projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/arm_eabi_vfp/sys/dev/vt/vt_core.c projects/arm_eabi_vfp/sys/dev/xen/console/console.c projects/arm_eabi_vfp/sys/fs/msdosfs/msdosfs_fileno.c projects/arm_eabi_vfp/sys/fs/tmpfs/tmpfs_subr.c projects/arm_eabi_vfp/sys/i386/conf/GENERIC projects/arm_eabi_vfp/sys/i386/conf/NOTES projects/arm_eabi_vfp/sys/i386/conf/XEN projects/arm_eabi_vfp/sys/i386/i386/machdep.c projects/arm_eabi_vfp/sys/i386/i386/pmap.c projects/arm_eabi_vfp/sys/i386/i386/trap.c projects/arm_eabi_vfp/sys/i386/i386/vm_machdep.c projects/arm_eabi_vfp/sys/i386/xen/clock.c projects/arm_eabi_vfp/sys/i386/xen/pmap.c projects/arm_eabi_vfp/sys/ia64/conf/GENERIC projects/arm_eabi_vfp/sys/ia64/ia64/clock.c projects/arm_eabi_vfp/sys/ia64/ia64/db_machdep.c projects/arm_eabi_vfp/sys/ia64/ia64/exception.S projects/arm_eabi_vfp/sys/ia64/ia64/interrupt.c projects/arm_eabi_vfp/sys/ia64/ia64/machdep.c projects/arm_eabi_vfp/sys/ia64/ia64/mp_machdep.c projects/arm_eabi_vfp/sys/ia64/ia64/pmap.c projects/arm_eabi_vfp/sys/ia64/ia64/trap.c projects/arm_eabi_vfp/sys/ia64/ia64/uma_machdep.c projects/arm_eabi_vfp/sys/ia64/include/kdb.h projects/arm_eabi_vfp/sys/ia64/include/md_var.h projects/arm_eabi_vfp/sys/ia64/include/pcpu.h projects/arm_eabi_vfp/sys/ia64/include/pmap.h projects/arm_eabi_vfp/sys/ia64/include/smp.h projects/arm_eabi_vfp/sys/isa/isareg.h projects/arm_eabi_vfp/sys/kern/init_main.c projects/arm_eabi_vfp/sys/kern/init_sysent.c projects/arm_eabi_vfp/sys/kern/kern_descrip.c projects/arm_eabi_vfp/sys/kern/kern_exec.c projects/arm_eabi_vfp/sys/kern/kern_malloc.c projects/arm_eabi_vfp/sys/kern/kern_mib.c projects/arm_eabi_vfp/sys/kern/kern_umtx.c projects/arm_eabi_vfp/sys/kern/sched_ule.c projects/arm_eabi_vfp/sys/kern/subr_trap.c projects/arm_eabi_vfp/sys/kern/syscalls.c projects/arm_eabi_vfp/sys/kern/syscalls.master projects/arm_eabi_vfp/sys/kern/systrace_args.c projects/arm_eabi_vfp/sys/kern/vfs_bio.c projects/arm_eabi_vfp/sys/kern/vfs_subr.c projects/arm_eabi_vfp/sys/mips/atheros/apb.c projects/arm_eabi_vfp/sys/mips/atheros/ar71xx_cpudef.h projects/arm_eabi_vfp/sys/mips/atheros/ar934x_chip.c projects/arm_eabi_vfp/sys/mips/cavium/octopci_bus_space.c projects/arm_eabi_vfp/sys/mips/conf/ALCHEMY projects/arm_eabi_vfp/sys/mips/conf/ALFA_HORNET_UB projects/arm_eabi_vfp/sys/mips/conf/AP121 projects/arm_eabi_vfp/sys/mips/conf/AP91 projects/arm_eabi_vfp/sys/mips/conf/AP93 projects/arm_eabi_vfp/sys/mips/conf/AP94 projects/arm_eabi_vfp/sys/mips/conf/AP96 projects/arm_eabi_vfp/sys/mips/conf/AR71XX_BASE projects/arm_eabi_vfp/sys/mips/conf/AR724X_BASE projects/arm_eabi_vfp/sys/mips/conf/AR91XX_BASE projects/arm_eabi_vfp/sys/mips/conf/AR933X_BASE projects/arm_eabi_vfp/sys/mips/conf/AR934X_BASE projects/arm_eabi_vfp/sys/mips/conf/CARAMBOLA2 projects/arm_eabi_vfp/sys/mips/conf/DB120 projects/arm_eabi_vfp/sys/mips/conf/DIR-825B1 projects/arm_eabi_vfp/sys/mips/conf/ENH200 projects/arm_eabi_vfp/sys/mips/conf/PB47 projects/arm_eabi_vfp/sys/mips/conf/PB92 projects/arm_eabi_vfp/sys/mips/conf/PICOSTATION_M2HP projects/arm_eabi_vfp/sys/mips/conf/ROUTERSTATION projects/arm_eabi_vfp/sys/mips/conf/ROUTERSTATION_MFS projects/arm_eabi_vfp/sys/mips/conf/RSPRO projects/arm_eabi_vfp/sys/mips/conf/RSPRO_MFS projects/arm_eabi_vfp/sys/mips/conf/RSPRO_STANDALONE projects/arm_eabi_vfp/sys/mips/conf/RT305X projects/arm_eabi_vfp/sys/mips/conf/SENTRY5 projects/arm_eabi_vfp/sys/mips/conf/SWARM64_SMP projects/arm_eabi_vfp/sys/mips/conf/SWARM_SMP projects/arm_eabi_vfp/sys/mips/conf/TP-WN1043ND projects/arm_eabi_vfp/sys/mips/conf/WZR-300HP projects/arm_eabi_vfp/sys/mips/conf/XLRN32 projects/arm_eabi_vfp/sys/mips/conf/std.SWARM projects/arm_eabi_vfp/sys/mips/conf/std.XLP projects/arm_eabi_vfp/sys/mips/include/bus.h projects/arm_eabi_vfp/sys/mips/mips/bus_space_fdt.c projects/arm_eabi_vfp/sys/mips/mips/bus_space_generic.c projects/arm_eabi_vfp/sys/mips/mips/gdb_machdep.c projects/arm_eabi_vfp/sys/mips/mips/machdep.c projects/arm_eabi_vfp/sys/mips/mips/pmap.c projects/arm_eabi_vfp/sys/mips/mips/uma_machdep.c projects/arm_eabi_vfp/sys/modules/vmware/vmxnet3/Makefile projects/arm_eabi_vfp/sys/net/bpf_filter.c projects/arm_eabi_vfp/sys/net/if_var.h projects/arm_eabi_vfp/sys/net/rtsock.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw_pfil.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/umem.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/arm_eabi_vfp/sys/pc98/cbus/cbus.h projects/arm_eabi_vfp/sys/pc98/cbus/cbus_dma.c projects/arm_eabi_vfp/sys/pc98/pc98/machdep.c projects/arm_eabi_vfp/sys/powerpc/aim/machdep.c projects/arm_eabi_vfp/sys/powerpc/aim/mmu_oea.c projects/arm_eabi_vfp/sys/powerpc/aim/mmu_oea64.c projects/arm_eabi_vfp/sys/powerpc/aim/moea64_native.c projects/arm_eabi_vfp/sys/powerpc/aim/uma_machdep.c projects/arm_eabi_vfp/sys/powerpc/booke/machdep.c projects/arm_eabi_vfp/sys/powerpc/booke/pmap.c projects/arm_eabi_vfp/sys/powerpc/conf/GENERIC projects/arm_eabi_vfp/sys/powerpc/conf/GENERIC64 projects/arm_eabi_vfp/sys/powerpc/conf/MPC85XX projects/arm_eabi_vfp/sys/powerpc/conf/NOTES projects/arm_eabi_vfp/sys/powerpc/include/bat.h projects/arm_eabi_vfp/sys/powerpc/include/bus.h projects/arm_eabi_vfp/sys/powerpc/include/psl.h projects/arm_eabi_vfp/sys/security/audit/audit_bsm_klib.c projects/arm_eabi_vfp/sys/sparc64/sparc64/machdep.c projects/arm_eabi_vfp/sys/sparc64/sparc64/pmap.c projects/arm_eabi_vfp/sys/sparc64/sparc64/vm_machdep.c projects/arm_eabi_vfp/sys/sys/_umtx.h projects/arm_eabi_vfp/sys/sys/bus_dma.h projects/arm_eabi_vfp/sys/sys/capability.h projects/arm_eabi_vfp/sys/sys/param.h projects/arm_eabi_vfp/sys/sys/pmc.h projects/arm_eabi_vfp/sys/sys/proc.h projects/arm_eabi_vfp/sys/sys/syscall.h projects/arm_eabi_vfp/sys/sys/syscall.mk projects/arm_eabi_vfp/sys/sys/sysproto.h projects/arm_eabi_vfp/sys/sys/umtx.h projects/arm_eabi_vfp/sys/sys/vmmeter.h projects/arm_eabi_vfp/sys/tools/miidevs2h.awk projects/arm_eabi_vfp/sys/tools/pccarddevs2h.awk projects/arm_eabi_vfp/sys/vm/memguard.c projects/arm_eabi_vfp/sys/vm/swap_pager.c projects/arm_eabi_vfp/sys/vm/vm_fault.c projects/arm_eabi_vfp/sys/vm/vm_glue.c projects/arm_eabi_vfp/sys/vm/vm_map.c projects/arm_eabi_vfp/sys/vm/vm_meter.c projects/arm_eabi_vfp/sys/vm/vm_mmap.c projects/arm_eabi_vfp/sys/vm/vm_object.c projects/arm_eabi_vfp/sys/vm/vm_page.c projects/arm_eabi_vfp/sys/vm/vm_pageout.c projects/arm_eabi_vfp/sys/vm/vm_param.h projects/arm_eabi_vfp/sys/vm/vm_phys.c projects/arm_eabi_vfp/sys/vm/vm_phys.h projects/arm_eabi_vfp/sys/vm/vm_radix.c projects/arm_eabi_vfp/sys/vm/vm_zeroidle.c projects/arm_eabi_vfp/sys/vm/vnode_pager.c projects/arm_eabi_vfp/sys/x86/include/bus.h projects/arm_eabi_vfp/sys/x86/iommu/busdma_dmar.c projects/arm_eabi_vfp/sys/x86/iommu/intel_ctx.c projects/arm_eabi_vfp/sys/x86/iommu/intel_dmar.h projects/arm_eabi_vfp/sys/x86/isa/atpic.c projects/arm_eabi_vfp/sys/x86/isa/isa_dma.c projects/arm_eabi_vfp/sys/x86/x86/intr_machdep.c projects/arm_eabi_vfp/sys/x86/x86/nexus.c projects/arm_eabi_vfp/tests/sys/Makefile projects/arm_eabi_vfp/tests/sys/kern/kern_descrip_test.c projects/arm_eabi_vfp/tools/build/mk/OptionalObsoleteFiles.inc projects/arm_eabi_vfp/tools/regression/priv/main.c projects/arm_eabi_vfp/tools/tools/nanobsd/nanobsd.sh projects/arm_eabi_vfp/usr.bin/find/function.c projects/arm_eabi_vfp/usr.bin/make/Makefile projects/arm_eabi_vfp/usr.bin/netstat/if.c projects/arm_eabi_vfp/usr.bin/sed/tests/Makefile projects/arm_eabi_vfp/usr.bin/talk/Makefile projects/arm_eabi_vfp/usr.bin/talk/display.c projects/arm_eabi_vfp/usr.bin/talk/io.c projects/arm_eabi_vfp/usr.bin/talk/talk.h projects/arm_eabi_vfp/usr.bin/truss/syscall.h projects/arm_eabi_vfp/usr.bin/truss/syscalls.c projects/arm_eabi_vfp/usr.sbin/bhyve/bhyverun.c projects/arm_eabi_vfp/usr.sbin/bhyve/bhyverun.h projects/arm_eabi_vfp/usr.sbin/bhyve/pci_ahci.c projects/arm_eabi_vfp/usr.sbin/bhyve/spinup_ap.c projects/arm_eabi_vfp/usr.sbin/config/config.8 projects/arm_eabi_vfp/usr.sbin/config/config.h projects/arm_eabi_vfp/usr.sbin/config/lang.l projects/arm_eabi_vfp/usr.sbin/config/main.c projects/arm_eabi_vfp/usr.sbin/ctld/login.c projects/arm_eabi_vfp/usr.sbin/jail/jail.8 Directory Properties: projects/arm_eabi_vfp/ (props changed) projects/arm_eabi_vfp/cddl/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/arm_eabi_vfp/contrib/file/ (props changed) projects/arm_eabi_vfp/contrib/llvm/ (props changed) projects/arm_eabi_vfp/contrib/llvm/tools/clang/ (props changed) projects/arm_eabi_vfp/contrib/pf/ (props changed) projects/arm_eabi_vfp/contrib/subversion/ (props changed) projects/arm_eabi_vfp/contrib/tnftp/ (props changed) projects/arm_eabi_vfp/etc/ (props changed) projects/arm_eabi_vfp/lib/libc/ (props changed) projects/arm_eabi_vfp/sbin/ (props changed) projects/arm_eabi_vfp/share/man/man4/ (props changed) projects/arm_eabi_vfp/sys/ (props changed) projects/arm_eabi_vfp/sys/amd64/vmm/ (props changed) projects/arm_eabi_vfp/sys/boot/ (props changed) projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/sys/conf/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyve/ (props changed) projects/arm_eabi_vfp/usr.sbin/jail/ (props changed) Modified: projects/arm_eabi_vfp/MAINTAINERS ============================================================================== --- projects/arm_eabi_vfp/MAINTAINERS Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/MAINTAINERS Sat Mar 22 10:42:01 2014 (r263622) @@ -77,7 +77,7 @@ ntp roberto Pre-commit review r inetd dwmalone Recommends pre-commit review. contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. -contrib/pf mlaier Pre-commit review requested. +contrib/pf glebius Pre-commit review recommended. binutils obrien Insists on BU blocked from unapproved commits file obrien Insists to keep file blocked from other's unapproved commits @@ -131,3 +131,4 @@ nvd(4) jimharris Pre-commit review requ nvmecontrol(8) jimharris Pre-commit review requested. release/release.sh gjb Pre-commit review and regression tests requested. +nanobsd imp Pre-commit review requested for coordination. Modified: projects/arm_eabi_vfp/Makefile.inc1 ============================================================================== --- projects/arm_eabi_vfp/Makefile.inc1 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/Makefile.inc1 Sat Mar 22 10:42:01 2014 (r263622) @@ -1017,7 +1017,7 @@ buildkernel: cd ${KRNLCONFDIR}; \ PATH=${TMPPATH} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ - ${KERNCONFDIR}/${_kernel} + -I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel} .endif .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) @echo Modified: projects/arm_eabi_vfp/ObsoleteFiles.inc ============================================================================== --- projects/arm_eabi_vfp/ObsoleteFiles.inc Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/ObsoleteFiles.inc Sat Mar 22 10:42:01 2014 (r263622) @@ -75,7 +75,10 @@ OLD_FILES+=usr/share/man/man3/ipx_ntoa.3 OLD_FILES+=usr/share/man/man4/ef.4.gz OLD_FILES+=usr/share/man/man4/if_ef.4.gz OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz - +# 20140314: bsdconfig usermgmt rewrite +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput +# 20140307: bsdconfig groupmgmt rewrite +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput # 20140223: Remove libyaml OLD_FILES+=usr/lib/private/libyaml.a OLD_FILES+=usr/lib/private/libyaml.so @@ -118,6 +121,9 @@ OLD_FILES+=usr/include/clang/3.3/xopintr OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz OLD_DIRS+=usr/include/clang/3.3 +# 20140216: nve(4) removed +OLD_FILES+=usr/share/man/man4/if_nve.4.gz +OLD_FILES+=usr/share/man/man4/nve.4.gz # 20140205: Open Firmware device moved OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h # 20140128: libelf and libdwarf import Modified: projects/arm_eabi_vfp/bin/pkill/Makefile ============================================================================== --- projects/arm_eabi_vfp/bin/pkill/Makefile Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/bin/pkill/Makefile Sat Mar 22 10:42:01 2014 (r263622) @@ -1,6 +1,8 @@ # $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $ # $FreeBSD$ +.include <bsd.own.mk> + PROG= pkill DPADD= ${LIBKVM} @@ -17,4 +19,8 @@ MLINKS= pkill.1 pgrep.1 SYMLINKS= ${BINDIR}/pkill /usr/bin/pkill SYMLINKS+= ${BINDIR}/pgrep /usr/bin/pgrep +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: projects/arm_eabi_vfp/bin/sh/jobs.c ============================================================================== --- projects/arm_eabi_vfp/bin/sh/jobs.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/bin/sh/jobs.c Sat Mar 22 10:42:01 2014 (r263622) @@ -1121,7 +1121,8 @@ dowait(int mode, struct job *job) for (sp = jp->ps ; sp < jp->ps + jp->nprocs ; sp++) { if (sp->pid == -1) continue; - if (sp->pid == pid) { + if (sp->pid == pid && (sp->status == -1 || + WIFSTOPPED(sp->status))) { TRACE(("Changing status of proc %d from 0x%x to 0x%x\n", (int)pid, sp->status, status)); Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zdb/zdb.8 ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Sat Mar 22 10:42:01 2014 (r263622) @@ -19,7 +19,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZDB 8 .Os .Sh NAME @@ -127,6 +127,12 @@ compression ratio (compress), inflation If specified twice, display a histogram of deduplication statistics, showing the allocated (physically present on disk) and referenced (logically referenced in the pool) block counts and sizes by reference count. +.Pp +If specified a third time, display the statistics independently for each deduplication table. +.Pp +If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks. +.Pp +If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks. .It Fl h Display pool history similar to .Cm zpool history , Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Mar 22 10:42:01 2014 (r263622) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 2, 2014 +.Dd March 20, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -1335,10 +1335,21 @@ features being supported, the new file s these properties. .Bl -tag -width 4n .It Sy casesensitivity Ns = Ns Cm sensitive | insensitive | mixed +Indicates whether the file name matching algorithm used by the file system +should be case-sensitive, case-insensitive, or allow a combination of both +styles of matching. The default value for the +.Sy casesensitivity +property is +.Cm sensitive . +Traditionally, UNIX and POSIX file systems have case-sensitive file names. +.Pp The +.Cm mixed +value for the .Sy casesensitivity -property is currently not supported on -.Fx . +property indicates that the +file system can support requests for both case-sensitive and case-insensitive +matching behavior. .It Sy normalization Ns = Ns Cm none | formC | formD | formKC | formKD Indicates whether the file system should perform a .Sy unicode Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Mar 22 10:42:01 2014 (r263622) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZPOOL 8 .Os .Sh NAME @@ -624,6 +624,9 @@ Datasets of this pool can only be mounte .It To write to a read-only pool, a export and import of the pool is required. .El +.Pp +This property can also be referred to by its shortened column name, +.Sy rdonly . .El .Pp The following properties can be set at creation time and import time, and later @@ -682,7 +685,9 @@ property. Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block is automatically stored. Default setting is -.Cm 0 . +.Cm 0 +which causes no ditto copies to be created for deduplicated blocks. +The miniumum legal nonzero setting is 100. .It Sy delegation Ns = Ns Cm on No | Cm off Controls whether a non-privileged user is granted access based on the dataset permissions defined on the dataset. See @@ -1152,9 +1157,10 @@ option is also required. .It Fl f Forces import, even if the pool appears to be potentially active. .It Fl m -Enables import with missing log devices. +Allows a pool to import when there is a missing log device. Recent transactions +can be lost because the log device will be discarded. .It Fl N -Do not mount any filesystems from the imported pool. +Import the pool without mounting any file systems. .It Fl R Ar root Sets the .Qq Sy cachefile @@ -1245,9 +1251,10 @@ option is also required. .It Fl f Forces import, even if the pool appears to be potentially active. .It Fl m -Enables import with missing log devices. +Allows a pool to import when there is a missing log device. Recent transactions +can be lost because the log device will be discarded. .It Fl N -Do not mount any filesystems from the imported pool. +Import the pool without mounting any file systems. .It Fl R Ar root Equivalent to .Qq Fl o Cm cachefile=none,altroot= Ns Pa root @@ -1336,8 +1343,9 @@ Treat exported or foreign devices as ina .Op Ar inverval Op Ar count .Xc .Pp -Lists the given pools along with a health status and space usage. When given no -arguments, all pools in the system are listed. +Lists the given pools along with a health status and space usage. If no +.Ar pools +are specified, all pools in the system are listed. .Pp When given an interval, the output is printed every .Ar interval @@ -1349,6 +1357,17 @@ is specified, the command exits after .Ar count reports are printed. .Bl -tag -width indent +.It Fl T Cm d Ns | Ns Cm u +Print a timestamp. +.Pp +Use modifier +.Cm d +for standard date format. See +.Xr date 1 . +Use modifier +.Cm u +for unixtime +.Pq equals Qq Ic date +%s . .It Fl H Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space. @@ -1677,7 +1696,7 @@ Once this is done, the pool will no long not support feature flags. See .Xr zpool-features 7 -for details on compatability with system sthat support feature flags, but do +for details on compatibility with systems that support feature flags, but do not support all features enabled on the pool. .Bl -tag -width indent .It Fl a Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Mar 22 10:42:01 2014 (r263622) @@ -1969,7 +1969,7 @@ zpool_do_import(int argc, char **argv) char *endptr; /* check options */ - while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:rR:T:VX")) != -1) { + while ((c = getopt(argc, argv, ":aCc:d:DEfFmnNo:R:T:VX")) != -1) { switch (c) { case 'a': do_all = B_TRUE; Modified: projects/arm_eabi_vfp/contrib/file/mygetopt.h ============================================================================== --- projects/arm_eabi_vfp/contrib/file/mygetopt.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/file/mygetopt.h Sat Mar 22 10:42:01 2014 (r263622) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h Sat Mar 22 10:42:01 2014 (r263622) @@ -41,6 +41,7 @@ class MachineBasicBlock; class MachineFunction; class MachineModuleInfo; class MachineRegisterInfo; +class SelectionDAG; class TargetLowering; class Value; @@ -125,7 +126,7 @@ public: /// set - Initialize this FunctionLoweringInfo with the given Function /// and its associated MachineFunction. /// - void set(const Function &Fn, MachineFunction &MF); + void set(const Function &Fn, MachineFunction &MF, SelectionDAG *DAG); /// clear - Clear out all the function-specific state. This returns this /// FunctionLoweringInfo to an empty state, ready to be used for a Modified: projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h Sat Mar 22 10:42:01 2014 (r263622) @@ -223,6 +223,10 @@ class MachineFrameInfo { /// Whether the "realign-stack" option is on. bool RealignOption; + /// True if the function includes inline assembly that adjusts the stack + /// pointer. + bool HasInlineAsmWithSPAdjust; + const TargetFrameLowering *getFrameLowering() const; public: explicit MachineFrameInfo(const TargetMachine &TM, bool RealignOpt) @@ -240,6 +244,7 @@ public: LocalFrameSize = 0; LocalFrameMaxAlign = 0; UseLocalStackAllocationBlock = false; + HasInlineAsmWithSPAdjust = false; } /// hasStackObjects - Return true if there are any stack objects in this @@ -451,6 +456,10 @@ public: bool hasCalls() const { return HasCalls; } void setHasCalls(bool V) { HasCalls = V; } + /// Returns true if the function contains any stack-adjusting inline assembly. + bool hasInlineAsmWithSPAdjust() const { return HasInlineAsmWithSPAdjust; } + void setHasInlineAsmWithSPAdjust(bool B) { HasInlineAsmWithSPAdjust = B; } + /// getMaxCallFrameSize - Return the maximum size of a call frame that must be /// allocated for an outgoing function call. This is only available if /// CallFrameSetup/Destroy pseudo instructions are used by the target, and @@ -521,7 +530,7 @@ public: /// variable sized object is created, whether or not the index returned is /// actually used. /// - int CreateVariableSizedObject(unsigned Alignment); + int CreateVariableSizedObject(unsigned Alignment, const AllocaInst *Alloca); /// getCalleeSavedInfo - Returns a reference to call saved info vector for the /// current function. Modified: projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFunction.h ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Sat Mar 22 10:42:01 2014 (r263622) @@ -131,8 +131,8 @@ class MachineFunction { /// about the control flow of such functions. bool ExposesReturnsTwice; - /// True if the function includes MS-style inline assembly. - bool HasMSInlineAsm; + /// True if the function includes any inline assembly. + bool HasInlineAsm; MachineFunction(const MachineFunction &) LLVM_DELETED_FUNCTION; void operator=(const MachineFunction&) LLVM_DELETED_FUNCTION; @@ -218,15 +218,14 @@ public: ExposesReturnsTwice = B; } - /// Returns true if the function contains any MS-style inline assembly. - bool hasMSInlineAsm() const { - return HasMSInlineAsm; + /// Returns true if the function contains any inline assembly. + bool hasInlineAsm() const { + return HasInlineAsm; } - /// Set a flag that indicates that the function contains MS-style inline - /// assembly. - void setHasMSInlineAsm(bool B) { - HasMSInlineAsm = B; + /// Set a flag that indicates that the function contains inline assembly. + void setHasInlineAsm(bool B) { + HasInlineAsm = B; } /// getInfo - Keep track of various per-function pieces of information for Modified: projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/MachineFunction.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/MachineFunction.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/MachineFunction.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -525,13 +525,14 @@ int MachineFrameInfo::CreateSpillStackOb /// variable sized object is created, whether or not the index returned is /// actually used. /// -int MachineFrameInfo::CreateVariableSizedObject(unsigned Alignment) { +int MachineFrameInfo::CreateVariableSizedObject(unsigned Alignment, + const AllocaInst *Alloca) { HasVarSizedObjects = true; Alignment = clampStackAlignment(!getFrameLowering()->isStackRealignable() || !RealignOption, Alignment, getFrameLowering()->getStackAlignment()); - Objects.push_back(StackObject(0, Alignment, 0, false, false, true, 0)); + Objects.push_back(StackObject(0, Alignment, 0, false, false, true, Alloca)); ensureMaxAlignment(Alignment); return (int)Objects.size()-NumFixedObjects-1; } Modified: projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -33,6 +33,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" #include "llvm/Target/TargetInstrInfo.h" +#include "llvm/Target/TargetFrameLowering.h" #include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetRegisterInfo.h" @@ -55,7 +56,8 @@ static bool isUsedOutsideOfDefiningBlock return false; } -void FunctionLoweringInfo::set(const Function &fn, MachineFunction &mf) { +void FunctionLoweringInfo::set(const Function &fn, MachineFunction &mf, + SelectionDAG *DAG) { const TargetLowering *TLI = TM.getTargetLowering(); Fn = &fn; @@ -100,6 +102,43 @@ void FunctionLoweringInfo::set(const Fun for (; BB != EB; ++BB) for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I) { + // Look for dynamic allocas. + if (const AllocaInst *AI = dyn_cast<AllocaInst>(I)) { + if (!AI->isStaticAlloca()) { + unsigned Align = std::max( + (unsigned)TLI->getDataLayout()->getPrefTypeAlignment( + AI->getAllocatedType()), + AI->getAlignment()); + unsigned StackAlign = TM.getFrameLowering()->getStackAlignment(); + if (Align <= StackAlign) + Align = 0; + // Inform the Frame Information that we have variable-sized objects. + MF->getFrameInfo()->CreateVariableSizedObject(Align ? Align : 1, AI); + } + } + + // Look for inline asm that clobbers the SP register. + if (isa<CallInst>(I) || isa<InvokeInst>(I)) { + ImmutableCallSite CS(I); + if (const InlineAsm *IA = dyn_cast<InlineAsm>(CS.getCalledValue())) { + unsigned SP = TLI->getStackPointerRegisterToSaveRestore(); + std::vector<TargetLowering::AsmOperandInfo> Ops = + TLI->ParseConstraints(CS); + for (size_t I = 0, E = Ops.size(); I != E; ++I) { + TargetLowering::AsmOperandInfo &Op = Ops[I]; + if (Op.Type == InlineAsm::isClobber) { + // Clobbers don't have SDValue operands, hence SDValue(). + TLI->ComputeConstraintToUse(Op, SDValue(), DAG); + std::pair<unsigned, const TargetRegisterClass*> PhysReg = + TLI->getRegForInlineAsmConstraint(Op.ConstraintCode, + Op.ConstraintVT); + if (PhysReg.first == SP) + MF->getFrameInfo()->setHasInlineAsmWithSPAdjust(true); + } + } + } + } + // Mark values used outside their block as exported, by allocating // a virtual register for them. if (isUsedOutsideOfDefiningBlock(I)) Modified: projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -2180,6 +2180,17 @@ SDValue DAGTypeLegalizer::WidenVecRes_SE if (getTypeAction(CondVT) == TargetLowering::TypeWidenVector) Cond1 = GetWidenedVector(Cond1); + // If we have to split the condition there is no point in widening the + // select. This would result in an cycle of widening the select -> + // widening the condition operand -> splitting the condition operand -> + // splitting the select -> widening the select. Instead split this select + // further and widen the resulting type. + if (getTypeAction(CondVT) == TargetLowering::TypeSplitVector) { + SDValue SplitSelect = SplitVecOp_VSELECT(N, 0); + SDValue Res = ModifyToType(SplitSelect, WidenVT); + return Res; + } + if (Cond1.getValueType() != CondWidenVT) Cond1 = ModifyToType(Cond1, CondWidenVT); } Modified: projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -851,12 +851,20 @@ void RegsForValue::AddInlineAsmOperands( SDValue Res = DAG.getTargetConstant(Flag, MVT::i32); Ops.push_back(Res); + unsigned SP = TLI.getStackPointerRegisterToSaveRestore(); for (unsigned Value = 0, Reg = 0, e = ValueVTs.size(); Value != e; ++Value) { unsigned NumRegs = TLI.getNumRegisters(*DAG.getContext(), ValueVTs[Value]); MVT RegisterVT = RegVTs[Value]; for (unsigned i = 0; i != NumRegs; ++i) { assert(Reg < Regs.size() && "Mismatch in # registers expected"); - Ops.push_back(DAG.getRegister(Regs[Reg++], RegisterVT)); + unsigned TheReg = Regs[Reg++]; + Ops.push_back(DAG.getRegister(TheReg, RegisterVT)); + + if (TheReg == SP && Code == InlineAsm::Kind_Clobber) { + // If we clobbered the stack pointer, MFI should know about it. + assert(DAG.getMachineFunction().getFrameInfo()-> + hasInlineAsmWithSPAdjust()); + } } } } @@ -3370,9 +3378,7 @@ void SelectionDAGBuilder::visitAlloca(co setValue(&I, DSA); DAG.setRoot(DSA.getValue(1)); - // Inform the Frame Information that we have just allocated a variable-sized - // object. - FuncInfo.MF->getFrameInfo()->CreateVariableSizedObject(Align ? Align : 1); + assert(FuncInfo.MF->getFrameInfo()->hasVarSizedObjects()); } void SelectionDAGBuilder::visitLoad(const LoadInst &I) { Modified: projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -419,7 +419,7 @@ bool SelectionDAGISel::runOnMachineFunct SplitCriticalSideEffectEdges(const_cast<Function&>(Fn), this); CurDAG->init(*MF, TTI, TLI); - FuncInfo->set(Fn, *MF); + FuncInfo->set(Fn, *MF, CurDAG); if (UseMBPI && OptLevel != CodeGenOpt::None) FuncInfo->BPI = &getAnalysis<BranchProbabilityInfo>(); @@ -428,7 +428,8 @@ bool SelectionDAGISel::runOnMachineFunct SDB->init(GFI, *AA, LibInfo); - MF->setHasMSInlineAsm(false); + MF->setHasInlineAsm(false); + SelectAllBasicBlocks(Fn); // If the first basic block in the function has live ins that need to be @@ -511,7 +512,7 @@ bool SelectionDAGISel::runOnMachineFunct for (MachineFunction::const_iterator I = MF->begin(), E = MF->end(); I != E; ++I) { - if (MFI->hasCalls() && MF->hasMSInlineAsm()) + if (MFI->hasCalls() && MF->hasInlineAsm()) break; const MachineBasicBlock *MBB = I; @@ -522,8 +523,8 @@ bool SelectionDAGISel::runOnMachineFunct II->isStackAligningInlineAsm()) { MFI->setHasCalls(true); } - if (II->isMSInlineAsm()) { - MF->setHasMSInlineAsm(true); + if (II->isInlineAsm()) { + MF->setHasInlineAsm(true); } } } Modified: projects/arm_eabi_vfp/contrib/llvm/lib/MC/MCParser/AsmParser.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -4192,6 +4192,11 @@ bool AsmParser::parseMSInlineAsm( AsmStrRewrites.push_back(AsmRewrite(AOK_Input, Start, SymName.size())); } } + + // Consider implicit defs to be clobbers. Think of cpuid and push. + const uint16_t *ImpDefs = Desc.getImplicitDefs(); + for (unsigned I = 0, E = Desc.getNumImplicitDefs(); I != E; ++I) + ClobberRegs.push_back(ImpDefs[I]); } // Set the number of Outputs and Inputs. Modified: projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -50,7 +50,7 @@ bool X86FrameLowering::hasFP(const Machi return (MF.getTarget().Options.DisableFramePointerElim(MF) || RegInfo->needsStackRealignment(MF) || MFI->hasVarSizedObjects() || - MFI->isFrameAddressTaken() || MF.hasMSInlineAsm() || + MFI->isFrameAddressTaken() || MFI->hasInlineAsmWithSPAdjust() || MF.getInfo<X86MachineFunctionInfo>()->getForceFramePointer() || MMI.callsUnwindInit() || MMI.callsEHReturn()); } Modified: projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -403,18 +403,15 @@ bool X86RegisterInfo::hasBasePointer(con if (!EnableBasePointer) return false; - // When we need stack realignment and there are dynamic allocas, we can't - // reference off of the stack pointer, so we reserve a base pointer. - // - // This is also true if the function contain MS-style inline assembly. We - // do this because if any stack changes occur in the inline assembly, e.g., - // "pusha", then any C local variable or C argument references in the - // inline assembly will be wrong because the SP is not properly tracked. - if ((needsStackRealignment(MF) && MFI->hasVarSizedObjects()) || - MF.hasMSInlineAsm()) - return true; - - return false; + // When we need stack realignment, we can't address the stack from the frame + // pointer. When we have dynamic allocas or stack-adjusting inline asm, we + // can't address variables from the stack pointer. MS inline asm can + // reference locals while also adjusting the stack pointer. When we can't + // use both the SP and the FP, we need a separate base pointer register. + bool CantUseFP = needsStackRealignment(MF); + bool CantUseSP = + MFI->hasVarSizedObjects() || MFI->hasInlineAsmWithSPAdjust(); + return CantUseFP && CantUseSP; } bool X86RegisterInfo::canRealignStack(const MachineFunction &MF) const { Modified: projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Sat Mar 22 10:42:01 2014 (r263622) @@ -740,19 +740,11 @@ static StringRef getARMFloatABI(const Dr switch(Triple.getEnvironment()) { case llvm::Triple::GNUEABIHF: FloatABI = "hard"; - break; - case llvm::Triple::GNUEABI: { - std::string ArchName = - getLLVMArchSuffixForARM(getARMTargetCPU(Args, Triple)); - if (StringRef(ArchName).startswith("v6") || - StringRef(ArchName).startswith("v7")) - FloatABI = "softfp"; - else - FloatABI = "soft"; break; - } default: + // FreeBSD defaults to soft float FloatABI = "soft"; + break; } break; Modified: projects/arm_eabi_vfp/contrib/pf/pflogd/pidfile.c ============================================================================== --- projects/arm_eabi_vfp/contrib/pf/pflogd/pidfile.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/pf/pflogd/pidfile.c Sat Mar 22 10:42:01 2014 (r263622) @@ -17,13 +17,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/arm_eabi_vfp/contrib/subversion/subversion/svn/util.c ============================================================================== --- projects/arm_eabi_vfp/contrib/subversion/subversion/svn/util.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/subversion/subversion/svn/util.c Sat Mar 22 10:42:01 2014 (r263622) @@ -338,6 +338,7 @@ static const char *prefixes[] = { "Approved by:", "Obtained from:", "MFC after:", + "Relnotes:", "Security:", "Sponsored by:" }; @@ -408,6 +409,7 @@ svn_cl__get_log_message(const char **log svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" #ifdef HAS_ORGANIZATION_NAME @@ -423,6 +425,7 @@ svn_cl__get_log_message(const char **log svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); Modified: projects/arm_eabi_vfp/contrib/tnftp/COPYING ============================================================================== --- projects/arm_eabi_vfp/contrib/tnftp/COPYING Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/tnftp/COPYING Sat Mar 22 10:42:01 2014 (r263622) @@ -14,13 +14,6 @@ are met: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the NetBSD - Foundation, Inc. and its contributors. -4. Neither the name of The NetBSD Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/arm_eabi_vfp/contrib/vis/extern.h ============================================================================== --- projects/arm_eabi_vfp/contrib/vis/extern.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/contrib/vis/extern.h Sat Mar 22 10:42:01 2014 (r263622) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/arm_eabi_vfp/etc/mtree/BSD.tests.dist ============================================================================== --- projects/arm_eabi_vfp/etc/mtree/BSD.tests.dist Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/etc/mtree/BSD.tests.dist Sat Mar 22 10:42:01 2014 (r263622) @@ -27,6 +27,8 @@ .. pax .. + pkill + .. sh builtins .. @@ -73,6 +75,8 @@ .. growfs .. + ifconfig + .. mdconfig .. .. @@ -89,6 +93,8 @@ sys kern .. + netinet + .. .. usr.bin apply @@ -111,13 +117,111 @@ .. m4 .. + make + archives + fmt_44bsd + .. + fmt_44bsd_mod + .. + fmt_oldbsd + .. + .. + basic + t0 + .. + t1 + .. + t2 + .. + t3 + .. + .. + execution + ellipsis + .. + empty + .. + joberr + .. + plus + .. + .. + shell + builtin + .. + meta + .. + path + .. + path_select + .. + replace + .. + select + .. + .. + suffixes + basic + .. + src_wild1 + .. + src_wild2 + .. + .. + syntax + directive-t0 + .. + enl + .. + funny-targets + .. + semi + .. + .. + sysmk + t0 + 2 + 1 + .. + .. + mk + .. + .. + t1 + 2 + 1 + .. + .. + mk + .. + .. + t2 + 2 + 1 + .. + .. + mk + .. + .. + .. + variables + modifier_M + .. + modifier_t + .. + opt_V + .. + t0 + .. + .. + .. ncal .. printf .. sed - regress.multitest.out - .. + regress.multitest.out + .. .. tr .. Modified: projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_double.c ============================================================================== --- projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_double.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_double.c Sat Mar 22 10:42:01 2014 (r263622) @@ -56,7 +56,7 @@ float64 __aeabi_dsub_vfp(float64, float6 /* * Depending on the target these will: * On armv6 with a vfp call the above function, or - * Call the softfloat cunstion in the 3rd argument. + * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(dcmpeq, float64, float64_eq) int AEABI_FUNC2(dcmplt, float64, float64_lt) Modified: projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_float.c ============================================================================== --- projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_float.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_float.c Sat Mar 22 10:42:01 2014 (r263622) @@ -56,7 +56,7 @@ float32 __aeabi_fsub_vfp(float32, float3 /* * Depending on the target these will: * On armv6 with a vfp call the above function, or - * Call the softfloat cunstion in the 3rd argument. + * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(fcmpeq, float32, float32_eq) int AEABI_FUNC2(fcmplt, float32, float32_lt) Modified: projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h ============================================================================== --- projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h Sat Mar 22 10:42:01 2014 (r263622) @@ -65,7 +65,7 @@ * C Helper macros */ -#if 1 && defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) /* * Generate a function that will either call into the VFP implementation, * or the soft float version for a given __aeabi_* helper. The function Modified: projects/arm_eabi_vfp/lib/libedit/chartype.h ============================================================================== --- projects/arm_eabi_vfp/lib/libedit/chartype.h Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libedit/chartype.h Sat Mar 22 10:42:01 2014 (r263622) @@ -12,13 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/arm_eabi_vfp/lib/libnv/nv.3 ============================================================================== --- projects/arm_eabi_vfp/lib/libnv/nv.3 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libnv/nv.3 Sat Mar 22 10:42:01 2014 (r263622) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 8, 2013 +.Dd March 21, 2014 .Dt NV 3 .Os .Sh NAME @@ -594,7 +594,7 @@ while ((name = nvlist_next(nvl, &type, & The .Nm libnv library appeared in -.Fx 10.0 . +.Fx 11.0 . .Sh AUTHORS .An -nosplit The Modified: projects/arm_eabi_vfp/lib/libpmc/Makefile ============================================================================== --- projects/arm_eabi_vfp/lib/libpmc/Makefile Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libpmc/Makefile Sat Mar 22 10:42:01 2014 (r263622) @@ -24,6 +24,7 @@ MAN+= pmc.soft.3 # PMC-dependent manual pages MAN+= pmc.atom.3 +MAN+= pmc.atomsilvermont.3 MAN+= pmc.core.3 MAN+= pmc.core2.3 MAN+= pmc.corei7.3 Modified: projects/arm_eabi_vfp/lib/libpmc/libpmc.c ============================================================================== --- projects/arm_eabi_vfp/lib/libpmc/libpmc.c Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libpmc/libpmc.c Sat Mar 22 10:42:01 2014 (r263622) @@ -169,6 +169,11 @@ static const struct pmc_event_descr atom __PMC_EV_ALIAS_ATOM() }; +static const struct pmc_event_descr atom_silvermont_event_table[] = +{ + __PMC_EV_ALIAS_ATOM_SILVERMONT() +}; + static const struct pmc_event_descr core_event_table[] = { __PMC_EV_ALIAS_CORE() @@ -246,6 +251,7 @@ static const struct pmc_event_descr west } PMC_MDEP_TABLE(atom, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); +PMC_MDEP_TABLE(atom_silvermont, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(core, IAP, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP); @@ -288,6 +294,7 @@ static const struct pmc_class_descr NAME #if defined(__i386__) || defined(__amd64__) PMC_CLASS_TABLE_DESC(iaf, IAF, iaf, iaf); PMC_CLASS_TABLE_DESC(atom, IAP, atom, iap); +PMC_CLASS_TABLE_DESC(atom_silvermont, IAP, atom_silvermont, iap); PMC_CLASS_TABLE_DESC(core, IAP, core, iap); PMC_CLASS_TABLE_DESC(core2, IAP, core2, iap); PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap); @@ -597,6 +604,8 @@ static struct pmc_event_alias core2_alia #define atom_aliases core2_aliases #define atom_aliases_without_iaf core2_aliases_without_iaf +#define atom_silvermont_aliases core2_aliases +#define atom_silvermont_aliases_without_iaf core2_aliases_without_iaf #define corei7_aliases core2_aliases #define corei7_aliases_without_iaf core2_aliases_without_iaf #define haswell_aliases core2_aliases @@ -842,6 +851,7 @@ iap_allocate_pmc(enum pmc_event pe, char if (n != 1) return (-1); } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_ATOM || + cpu_info.pm_cputype == PMC_CPU_INTEL_ATOM_SILVERMONT || cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 || cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME) { if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) { @@ -2733,6 +2743,10 @@ pmc_event_names_of_class(enum pmc_class ev = atom_event_table; count = PMC_EVENT_TABLE_SIZE(atom); break; + case PMC_CPU_INTEL_ATOM_SILVERMONT: + ev = atom_silvermont_event_table; + count = PMC_EVENT_TABLE_SIZE(atom_silvermont); + break; case PMC_CPU_INTEL_CORE: ev = core_event_table; count = PMC_EVENT_TABLE_SIZE(core); @@ -3049,6 +3063,9 @@ pmc_init(void) case PMC_CPU_INTEL_ATOM: PMC_MDEP_INIT_INTEL_V2(atom); break; + case PMC_CPU_INTEL_ATOM_SILVERMONT: + PMC_MDEP_INIT_INTEL_V2(atom_silvermont); + break; case PMC_CPU_INTEL_CORE: PMC_MDEP_INIT(core); pmc_class_table[n] = &core_class_table_descr; @@ -3202,6 +3219,11 @@ _pmc_name_of_event(enum pmc_event pe, en ev = atom_event_table; evfence = atom_event_table + PMC_EVENT_TABLE_SIZE(atom); break; + case PMC_CPU_INTEL_ATOM_SILVERMONT: + ev = atom_silvermont_event_table; + evfence = atom_silvermont_event_table + + PMC_EVENT_TABLE_SIZE(atom_silvermont); + break; case PMC_CPU_INTEL_CORE: ev = core_event_table; evfence = core_event_table + PMC_EVENT_TABLE_SIZE(core); Modified: projects/arm_eabi_vfp/lib/libpmc/pmc.atom.3 ============================================================================== --- projects/arm_eabi_vfp/lib/libpmc/pmc.atom.3 Sat Mar 22 10:40:04 2014 (r263621) +++ projects/arm_eabi_vfp/lib/libpmc/pmc.atom.3 Sat Mar 22 10:42:01 2014 (r263622) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403221042.s2MAg2L5055106>