svn commit: r265081 - in projects/vxlan: . bin/date cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common cddl/lib/libzpool contrib/llvm/inc...

Bryan Venteicher bryanv at FreeBSD.org
Tue Apr 29 06:13:01 UTC 2014 

Author: bryanv
Date: Tue Apr 29 06:12:57 2014
New Revision: 265081
URL: http://svnweb.freebsd.org/changeset/base/265081

Log:
  IFC

Added:
  projects/vxlan/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff
     - copied unchanged from r265080, head/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff
  projects/vxlan/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff
     - copied unchanged from r265080, head/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff
  projects/vxlan/release/amd64/make-uefi-memstick.sh
     - copied unchanged from r265080, head/release/amd64/make-uefi-memstick.sh
  projects/vxlan/release/amd64/mkisoimages-uefi.sh
     - copied unchanged from r265080, head/release/amd64/mkisoimages-uefi.sh
  projects/vxlan/share/man/man4/proto.4
     - copied unchanged from r265080, head/share/man/man4/proto.4
  projects/vxlan/sys/arm/freescale/imx/imx_ccmvar.h
     - copied unchanged from r265080, head/sys/arm/freescale/imx/imx_ccmvar.h
  projects/vxlan/sys/boot/amd64/boot1.efi/Makefile.fat
     - copied unchanged from r265080, head/sys/boot/amd64/boot1.efi/Makefile.fat
  projects/vxlan/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
     - copied unchanged from r265080, head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
  projects/vxlan/sys/boot/amd64/boot1.efi/generate-fat.sh
     - copied unchanged from r265080, head/sys/boot/amd64/boot1.efi/generate-fat.sh
  projects/vxlan/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
     - copied unchanged from r265080, head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
  projects/vxlan/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
     - copied unchanged from r265080, head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
  projects/vxlan/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu
     - copied unchanged from r265080, head/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu
  projects/vxlan/sys/dev/proto/
     - copied from r265080, head/sys/dev/proto/
  projects/vxlan/sys/dev/uart/uart_dev_imx.h
     - copied unchanged from r265080, head/sys/dev/uart/uart_dev_imx.h
  projects/vxlan/sys/modules/proto/
     - copied from r265080, head/sys/modules/proto/
  projects/vxlan/sys/modules/usb/urtwnfw/urtwnrtl8188eu/
     - copied from r265080, head/sys/modules/usb/urtwnfw/urtwnrtl8188eu/
  projects/vxlan/tests/sys/netinet/udp_dontroute.c
     - copied unchanged from r265080, head/tests/sys/netinet/udp_dontroute.c
  projects/vxlan/tools/build/options/WITHOUT_VI
     - copied unchanged from r265080, head/tools/build/options/WITHOUT_VI
  projects/vxlan/tools/build/options/WITH_OPENLDAP
     - copied unchanged from r265080, head/tools/build/options/WITH_OPENLDAP
  projects/vxlan/tools/bus_space/
     - copied from r265080, head/tools/bus_space/
  projects/vxlan/usr.sbin/bhyve/atkbdc.c
     - copied unchanged from r265080, head/usr.sbin/bhyve/atkbdc.c
  projects/vxlan/usr.sbin/bsdconfig/share/geom.subr
     - copied unchanged from r265080, head/usr.sbin/bsdconfig/share/geom.subr
Deleted:
  projects/vxlan/sys/dev/uart/uart_dev_imx5xx.h
Modified:
  projects/vxlan/Makefile.inc1
  projects/vxlan/bin/date/date.1
  projects/vxlan/bin/date/date.c
  projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/vxlan/cddl/lib/libzpool/Makefile
  projects/vxlan/contrib/llvm/include/llvm/DIBuilder.h
  projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
  projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  projects/vxlan/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  projects/vxlan/contrib/ofed/usr.lib/libibcm/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libibcommon/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libibmad/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libibumad/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libibverbs/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libmlx4/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libmthca/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libopensm/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libosmcomp/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libosmvendor/Makefile
  projects/vxlan/contrib/ofed/usr.lib/librdmacm/Makefile
  projects/vxlan/contrib/ofed/usr.lib/libsdp/Makefile
  projects/vxlan/gnu/lib/libgcov/Makefile
  projects/vxlan/gnu/lib/libssp/Makefile
  projects/vxlan/gnu/lib/libssp/libssp_nonshared/Makefile
  projects/vxlan/kerberos5/Makefile.inc
  projects/vxlan/lib/libc/arm/gen/fpsetmask_vfp.c
  projects/vxlan/lib/libc_nonshared/Makefile
  projects/vxlan/lib/libcrypt/crypt.c
  projects/vxlan/lib/libiconv_modules/Makefile.inc
  projects/vxlan/lib/libpam/libpam/Makefile
  projects/vxlan/lib/libpam/modules/Makefile.inc
  projects/vxlan/lib/librpcsec_gss/Makefile
  projects/vxlan/lib/libstand/Makefile
  projects/vxlan/lib/libvmmapi/vmmapi.c
  projects/vxlan/lib/libvmmapi/vmmapi.h
  projects/vxlan/lib/ncurses/ncurses/Makefile
  projects/vxlan/release/Makefile
  projects/vxlan/release/amd64/make-memstick.sh
  projects/vxlan/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/vxlan/release/i386/make-memstick.sh
  projects/vxlan/sbin/camcontrol/camcontrol.c
  projects/vxlan/sbin/newfs_msdos/newfs_msdos.c
  projects/vxlan/secure/usr.sbin/sshd/Makefile
  projects/vxlan/share/examples/bhyve/vmrun.sh
  projects/vxlan/share/man/man4/Makefile
  projects/vxlan/share/man/man4/urtwn.4
  projects/vxlan/share/man/man4/urtwnfw.4
  projects/vxlan/share/man/man4/vmx.4
  projects/vxlan/share/misc/bsd-family-tree
  projects/vxlan/share/mk/bsd.crunchgen.mk
  projects/vxlan/share/mk/bsd.incs.mk
  projects/vxlan/share/mk/bsd.init.mk
  projects/vxlan/share/mk/bsd.libnames.mk
  projects/vxlan/share/mk/bsd.opts.mk
  projects/vxlan/share/mk/bsd.sys.mk
  projects/vxlan/sys/amd64/amd64/machdep.c
  projects/vxlan/sys/amd64/amd64/mp_machdep.c
  projects/vxlan/sys/amd64/amd64/vm_machdep.c
  projects/vxlan/sys/amd64/amd64/xen-locore.S
  projects/vxlan/sys/amd64/conf/VT
  projects/vxlan/sys/amd64/include/vmm.h   (contents, props changed)
  projects/vxlan/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/vxlan/sys/amd64/vmm/intel/vmx.c
  projects/vxlan/sys/amd64/vmm/io/vlapic.c
  projects/vxlan/sys/amd64/vmm/vmm.c
  projects/vxlan/sys/amd64/vmm/vmm_dev.c
  projects/vxlan/sys/arm/arm/cpufunc.c
  projects/vxlan/sys/arm/arm/cpufunc_asm_armv7.S
  projects/vxlan/sys/arm/arm/dump_machdep.c
  projects/vxlan/sys/arm/arm/elf_machdep.c
  projects/vxlan/sys/arm/arm/minidump_machdep.c
  projects/vxlan/sys/arm/arm/mp_machdep.c
  projects/vxlan/sys/arm/arm/pl310.c
  projects/vxlan/sys/arm/freescale/imx/imx51_ccm.c
  projects/vxlan/sys/arm/freescale/imx/imx6_ccm.c
  projects/vxlan/sys/arm/freescale/imx/imx6_pl310.c
  projects/vxlan/sys/arm/freescale/imx/imx6_usbphy.c
  projects/vxlan/sys/arm/freescale/imx/imx_gpt.c
  projects/vxlan/sys/arm/freescale/imx/imx_machdep.h
  projects/vxlan/sys/arm/freescale/imx/imx_nop_usbphy.c
  projects/vxlan/sys/arm/freescale/imx/imx_sdhci.c
  projects/vxlan/sys/arm/include/cpufunc.h
  projects/vxlan/sys/arm/include/kdb.h
  projects/vxlan/sys/arm/include/pl310.h
  projects/vxlan/sys/arm/include/smp.h
  projects/vxlan/sys/arm/ti/omap4/omap4_l2cache.c
  projects/vxlan/sys/boot/amd64/Makefile.inc
  projects/vxlan/sys/boot/amd64/boot1.efi/Makefile
  projects/vxlan/sys/boot/fdt/dts/arm/cubieboard.dts
  projects/vxlan/sys/boot/fdt/dts/arm/cubieboard2.dts
  projects/vxlan/sys/boot/fdt/dts/arm/rpi.dts
  projects/vxlan/sys/boot/forth/beastie.4th
  projects/vxlan/sys/boot/forth/beastie.4th.8
  projects/vxlan/sys/boot/forth/loader.conf.5
  projects/vxlan/sys/boot/libstand32/Makefile
  projects/vxlan/sys/boot/userboot/libstand/Makefile
  projects/vxlan/sys/cam/ctl/ctl.c
  projects/vxlan/sys/cam/ctl/ctl_backend_block.c
  projects/vxlan/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/vxlan/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/vxlan/sys/cam/ctl/scsi_ctl.c
  projects/vxlan/sys/cam/scsi/scsi_da.c
  projects/vxlan/sys/cddl/contrib/opensolaris/common/avl/avl.c
  projects/vxlan/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/vxlan/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/vxlan/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  projects/vxlan/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/vxlan/sys/conf/files
  projects/vxlan/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
  projects/vxlan/sys/dev/acpica/Osd/OsdSchedule.c
  projects/vxlan/sys/dev/acpica/acpivar.h
  projects/vxlan/sys/dev/ath/ath_hal/ah.c
  projects/vxlan/sys/dev/ath/ath_hal/ah.h
  projects/vxlan/sys/dev/ath/ath_hal/ah_internal.h
  projects/vxlan/sys/dev/ath/ath_hal/ar5210/ar5210.h
  projects/vxlan/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5210/ar5210_power.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5211/ar5211_power.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  projects/vxlan/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  projects/vxlan/sys/dev/gpio/gpiobusvar.h
  projects/vxlan/sys/dev/gpio/ofw_gpiobus.c
  projects/vxlan/sys/dev/ofw/ofw_bus.h
  projects/vxlan/sys/dev/ofw/ofw_bus_if.m
  projects/vxlan/sys/dev/random/random_adaptors.c
  projects/vxlan/sys/dev/sound/pci/hda/hdaa.c
  projects/vxlan/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/vxlan/sys/dev/sound/pci/hda/hdac.c
  projects/vxlan/sys/dev/sound/pci/hda/hdac.h
  projects/vxlan/sys/dev/sound/pci/hda/hdacc.c
  projects/vxlan/sys/dev/uart/uart_dev_imx.c
  projects/vxlan/sys/dev/usb/controller/ehci_imx.c
  projects/vxlan/sys/dev/usb/controller/xhci.c
  projects/vxlan/sys/dev/usb/controller/xhci.h
  projects/vxlan/sys/dev/usb/controller/xhci_pci.c
  projects/vxlan/sys/dev/usb/controller/xhcireg.h
  projects/vxlan/sys/dev/usb/serial/uftdi.c
  projects/vxlan/sys/dev/usb/serial/uftdi_reg.h
  projects/vxlan/sys/dev/usb/usbdevs
  projects/vxlan/sys/dev/usb/wlan/if_urtwn.c
  projects/vxlan/sys/dev/usb/wlan/if_urtwnreg.h
  projects/vxlan/sys/dev/virtio/random/virtio_random.c
  projects/vxlan/sys/dev/vt/hw/vga/vga.c
  projects/vxlan/sys/dev/vt/vt.h
  projects/vxlan/sys/fs/nfsclient/nfs_clvnops.c
  projects/vxlan/sys/fs/nfsserver/nfs_nfsdport.c
  projects/vxlan/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/vxlan/sys/geom/geom_disk.c
  projects/vxlan/sys/geom/raid/g_raid.c
  projects/vxlan/sys/geom/raid/md_ddf.c
  projects/vxlan/sys/geom/raid/md_intel.c
  projects/vxlan/sys/geom/raid/md_jmicron.c
  projects/vxlan/sys/geom/raid/md_nvidia.c
  projects/vxlan/sys/geom/raid/md_promise.c
  projects/vxlan/sys/geom/raid/md_sii.c
  projects/vxlan/sys/i386/i386/mp_machdep.c
  projects/vxlan/sys/i386/i386/vm_machdep.c
  projects/vxlan/sys/i386/xen/mp_machdep.c
  projects/vxlan/sys/ia64/ia64/mp_machdep.c
  projects/vxlan/sys/kern/kern_cpu.c
  projects/vxlan/sys/kern/subr_bus.c
  projects/vxlan/sys/kern/subr_smp.c
  projects/vxlan/sys/mips/beri/beri_machdep.c
  projects/vxlan/sys/mips/beri/beri_simplebus.c
  projects/vxlan/sys/mips/mips/mp_machdep.c
  projects/vxlan/sys/mips/mips/pm_machdep.c
  projects/vxlan/sys/modules/Makefile
  projects/vxlan/sys/modules/usb/urtwnfw/Makefile
  projects/vxlan/sys/net/if.c
  projects/vxlan/sys/net/if_var.h
  projects/vxlan/sys/net/route.c
  projects/vxlan/sys/net/route.h
  projects/vxlan/sys/net/rtsock.c
  projects/vxlan/sys/net80211/ieee80211.c
  projects/vxlan/sys/net80211/ieee80211_ioctl.c
  projects/vxlan/sys/net80211/ieee80211_output.c
  projects/vxlan/sys/net80211/ieee80211_power.c
  projects/vxlan/sys/net80211/ieee80211_power.h
  projects/vxlan/sys/net80211/ieee80211_sta.c
  projects/vxlan/sys/net80211/ieee80211_var.h
  projects/vxlan/sys/netinet/in.c
  projects/vxlan/sys/netinet/in_pcb.c
  projects/vxlan/sys/netinet/in_pcb.h
  projects/vxlan/sys/netinet/ip_options.c
  projects/vxlan/sys/netinet/ip_output.c
  projects/vxlan/sys/netinet/raw_ip.c
  projects/vxlan/sys/netinet/sctp_indata.c
  projects/vxlan/sys/netinet6/ip6_input.c
  projects/vxlan/sys/netinet6/nd6.c
  projects/vxlan/sys/netinet6/nd6_nbr.c
  projects/vxlan/sys/netpfil/ipfw/ip_fw_nat.c
  projects/vxlan/sys/netpfil/pf/pf_ioctl.c
  projects/vxlan/sys/nfsserver/nfs_serv.c
  projects/vxlan/sys/powerpc/powerpc/mp_machdep.c
  projects/vxlan/sys/sparc64/sparc64/mp_machdep.c
  projects/vxlan/sys/sys/ata.h
  projects/vxlan/sys/sys/select.h
  projects/vxlan/sys/sys/smp.h
  projects/vxlan/sys/vm/swap_pager.c
  projects/vxlan/sys/vm/vm_fault.c
  projects/vxlan/tests/sys/netinet/Makefile
  projects/vxlan/tests/sys/netinet/fibs_test.sh
  projects/vxlan/tools/regression/filemon/Makefile
  projects/vxlan/tools/regression/vfs/trailing_slash.t
  projects/vxlan/tools/tools/ath/arcode/Makefile
  projects/vxlan/tools/tools/ath/ath_ee_9287_print/Makefile
  projects/vxlan/tools/tools/ath/ath_ee_9300_print/Makefile
  projects/vxlan/tools/tools/ath/ath_ee_v14_print/Makefile
  projects/vxlan/tools/tools/ath/ath_ee_v4k_print/Makefile
  projects/vxlan/tools/tools/ath/athalq/Makefile
  projects/vxlan/tools/tools/nanobsd/dhcpd/common
  projects/vxlan/tools/tools/nanobsd/dhcpd/os-base
  projects/vxlan/tools/tools/nanobsd/nanobsd.sh
  projects/vxlan/usr.bin/Makefile
  projects/vxlan/usr.bin/hexdump/hexdump.h
  projects/vxlan/usr.bin/hexdump/parse.c
  projects/vxlan/usr.bin/iscsictl/iscsictl.8
  projects/vxlan/usr.bin/sort/sort.1.in
  projects/vxlan/usr.bin/svn/lib/libapr/Makefile
  projects/vxlan/usr.bin/svn/lib/libserf/Makefile
  projects/vxlan/usr.bin/svn/lib/libsqlite3/Makefile
  projects/vxlan/usr.bin/truss/syscall.h
  projects/vxlan/usr.bin/truss/syscalls.c
  projects/vxlan/usr.sbin/bhyve/Makefile
  projects/vxlan/usr.sbin/bhyve/bhyverun.c
  projects/vxlan/usr.sbin/bhyve/pci_ahci.c
  projects/vxlan/usr.sbin/bhyve/pci_emul.c
  projects/vxlan/usr.sbin/bhyvectl/bhyvectl.c
  projects/vxlan/usr.sbin/bsdconfig/dot/dot
  projects/vxlan/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
  projects/vxlan/usr.sbin/bsdconfig/examples/browse_packages_http.sh
  projects/vxlan/usr.sbin/bsdconfig/networking/share/device.subr
  projects/vxlan/usr.sbin/bsdconfig/share/Makefile
  projects/vxlan/usr.sbin/bsdconfig/share/common.subr
  projects/vxlan/usr.sbin/bsdconfig/share/device.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/cdrom.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/common.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/directory.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/dos.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/floppy.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/ftp.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/http.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/nfs.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/tcpip.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/ufs.subr
  projects/vxlan/usr.sbin/bsdconfig/share/media/usb.subr
  projects/vxlan/usr.sbin/bsdconfig/share/packages/index.subr
  projects/vxlan/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/vxlan/usr.sbin/bsdconfig/share/struct.subr
  projects/vxlan/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit.h
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit_generic.c
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit_pc98.c
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
  projects/vxlan/usr.sbin/bsdinstall/partedit/partedit_x86.c
  projects/vxlan/usr.sbin/bsdinstall/scripts/zfsboot
  projects/vxlan/usr.sbin/ctld/ctl.conf.5
  projects/vxlan/usr.sbin/ifmcstat/ifmcstat.c
Directory Properties:
  projects/vxlan/   (props changed)
  projects/vxlan/cddl/   (props changed)
  projects/vxlan/cddl/contrib/opensolaris/   (props changed)
  projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/vxlan/contrib/llvm/   (props changed)
  projects/vxlan/contrib/llvm/tools/clang/   (props changed)
  projects/vxlan/gnu/lib/   (props changed)
  projects/vxlan/lib/libc/   (props changed)
  projects/vxlan/lib/libvmmapi/   (props changed)
  projects/vxlan/sbin/   (props changed)
  projects/vxlan/share/man/man4/   (props changed)
  projects/vxlan/sys/   (props changed)
  projects/vxlan/sys/amd64/vmm/   (props changed)
  projects/vxlan/sys/boot/   (props changed)
  projects/vxlan/sys/cddl/contrib/opensolaris/   (props changed)
  projects/vxlan/sys/conf/   (props changed)
  projects/vxlan/usr.sbin/bhyve/   (props changed)
  projects/vxlan/usr.sbin/bhyvectl/   (props changed)

Modified: projects/vxlan/Makefile.inc1
==============================================================================
--- projects/vxlan/Makefile.inc1	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/Makefile.inc1	Tue Apr 29 06:12:57 2014	(r265081)
@@ -15,7 +15,7 @@
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_ROOT install without using root privilege
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
-#	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
+#	-DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
@@ -247,8 +247,8 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -258,7 +258,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -276,8 +276,8 @@ KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOB
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD
 
 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -294,7 +294,7 @@ HMAKE+=		PATH=${TMPPATH} METALOG=${METAL
 .endif
 
 .if ${MK_CDDL} == "no"
-WMAKEENV+=	NO_CTF=1
+WMAKEENV+=	MK_CTF=no
 .endif
 
 .if defined(CROSS_TOOLCHAIN_PREFIX)
@@ -400,14 +400,14 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAG
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
 		-DNO_CPU_CFLAGS \
-		-DNO_CTF \
+		MK_CTF=no \
 		-DNO_LINT \
 		MK_TESTS=no
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
 		MK_MAN=no MK_INFO=no MK_HTML=no
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
-		${IMAKE_INSTALL}
+LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+		MK_TOOLCHAIN=no ${IMAKE_INSTALL}
 .endif
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
@@ -557,7 +557,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-	    -DNO_PROFILE MK_TESTS=no libraries
+	    MK_PROFILE=no  MK_TESTS=no libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -609,7 +609,7 @@ build32:
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no \
 	    -DEARLY_BUILD build-tools
 .endfor
 	cd ${.CURDIR}; \
@@ -1480,6 +1480,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 .if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
+gnu/lib/libstdc++__L: lib/msun__L
 .endif
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
@@ -1602,9 +1603,9 @@ ${_lib}__PL: .PHONY .MAKE
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
-		${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all && \
-		${MAKE} MK_TESTS=no -DNO_PROFILE -DNO_PIC \
+		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
@@ -1833,7 +1834,7 @@ builddtb:
 		echo "ERROR: FDT_DTS_FILE must be specified!"; \
 		exit 1; \
 	fi;	\
-	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE} ]; then \
+	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${TARGET}/${FDT_DTS_FILE} ]; then \
 		echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
 			exist!"; \
 		exit 1;	\
@@ -1843,6 +1844,7 @@ builddtb:
 			directory"; \
 	fi
 	@PATH=${TMPPATH} \
+	MACHINE=${TARGET} \
 	${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
 	    ${FDT_DTS_FILE} \
 	    ${DTBOUTPUTPATH}/`basename ${FDT_DTS_FILE} .dts`
@@ -1858,7 +1860,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
-	MK_MAN=no MK_NLS=no -DNO_PROFILE \
+	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}

Modified: projects/vxlan/bin/date/date.1
==============================================================================
--- projects/vxlan/bin/date/date.1	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/bin/date/date.1	Tue Apr 29 06:12:57 2014	(r265081)
@@ -32,7 +32,7 @@
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd June 3, 2010
+.Dd April 26, 2014
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd display or set date and time
 .Sh SYNOPSIS
 .Nm
-.Op Fl ju
+.Op Fl jRu
 .Op Fl r Ar seconds
 .Oo
 .Fl v
@@ -58,7 +58,7 @@
 .Ar MM Op Ar .ss
 .Sm on
 .Nm
-.Op Fl jnu
+.Op Fl jnRu
 .Fl f Ar input_fmt new_date
 .Op Cm + Ns Ar output_fmt
 .Nm
@@ -130,6 +130,16 @@ The
 .Fl n
 option suppresses this behavior and causes the time to be set only on the
 current machine.
+.It Fl R
+Use RFC 2822 date and time output format. This is equivalent to use
+.Dq Li %a, %d %b %Y \&%T %z
+as
+.Ar output_fmt
+while
+.Ev LC_TIME
+is set to the
+.Dq C
+locale .
 .It Fl r Ar seconds
 Print the date and time represented by
 .Ar seconds ,

Modified: projects/vxlan/bin/date/date.c
==============================================================================
--- projects/vxlan/bin/date/date.c	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/bin/date/date.c	Tue Apr 29 06:12:57 2014	(r265081)
@@ -69,12 +69,14 @@ static void setthetime(const char *, con
 static void badformat(void);
 static void usage(void);
 
+static const char *rfc2822_format = "%a, %d %b %Y %T %z";
+
 int
 main(int argc, char *argv[])
 {
 	struct timezone tz;
 	int ch, rflag;
-	int jflag, nflag;
+	int jflag, nflag, Rflag;
 	const char *format;
 	char buf[1024];
 	char *endptr, *fmt;
@@ -89,9 +91,9 @@ main(int argc, char *argv[])
 	(void) setlocale(LC_TIME, "");
 	tz.tz_dsttime = tz.tz_minuteswest = 0;
 	rflag = 0;
-	jflag = nflag = 0;
+	jflag = nflag = Rflag = 0;
 	set_timezone = 0;
-	while ((ch = getopt(argc, argv, "d:f:jnr:t:uv:")) != -1)
+	while ((ch = getopt(argc, argv, "d:f:jnRr:t:uv:")) != -1)
 		switch((char)ch) {
 		case 'd':		/* daylight savings time */
 			tz.tz_dsttime = strtol(optarg, &endptr, 10) ? 1 : 0;
@@ -108,6 +110,9 @@ main(int argc, char *argv[])
 		case 'n':		/* don't set network */
 			nflag = 1;
 			break;
+		case 'R':		/* RFC 2822 datetime format */
+			Rflag = 1;
+			break;
 		case 'r':		/* user specified seconds */
 			rflag = 1;
 			tval = strtoq(optarg, &tmp, 0);
@@ -145,6 +150,9 @@ main(int argc, char *argv[])
 
 	format = "%+";
 
+	if (Rflag)
+		format = rfc2822_format;
+
 	/* allow the operands in any order */
 	if (*argv && **argv == '+') {
 		format = *argv + 1;
@@ -169,6 +177,14 @@ main(int argc, char *argv[])
 		usage();
 	}
 	vary_destroy(v);
+
+	if (format == rfc2822_format)
+		/*
+		 * When using RFC 2822 datetime format, don't honor the
+		 * locale.
+		 */
+		setlocale(LC_TIME, "C");
+
 	(void)strftime(buf, sizeof(buf), format, &lt);
 	(void)printf("%s\n", buf);
 	if (fflush(stdout))
@@ -301,7 +317,7 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: date [-jnu] [-d dst] [-r seconds] [-t west] "
+	    "usage: date [-jnRu] [-d dst] [-r seconds] [-t west] "
 	    "[-v[+|-]val[ymwdHMS]] ... ",
 	    "            "
 	    "[-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format]");

Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Apr 29 06:12:57 2014	(r265081)
@@ -24,13 +24,13 @@
 .\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
 .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
 .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved.
-.\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
+.\" Copyright (c) 2014, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
 .\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 5, 2014
+.Dd April 23, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -542,6 +542,13 @@ if the snapshot has been marked for defe
 .Qq Nm Cm destroy -d
 command. Otherwise, the property is
 .Cm off .
+.It Sy filesystem_count
+The total number of filesystems and volumes that exist under this location in the
+dataset tree.
+This value is only available when a
+.Sy filesystem_limit
+has
+been set somewhere in the tree under which the dataset resides.
 .It Sy logicalreferenced
 The amount of space that is
 .Qq logically
@@ -600,6 +607,12 @@ The compression ratio achieved for the
 space of this dataset, expressed as a multiplier.  See also the
 .Sy compressratio
 property.
+.It Sy snapshot_count
+The total number of snapshots that exist under this location in the dataset tree.
+This value is only available when a
+.Sy snapshot_limit
+has been set somewhere
+in the tree under which the dataset resides.
 .It Sy type
 The type of dataset:
 .Sy filesystem , volume , No or Sy snapshot .
@@ -1020,6 +1033,23 @@ The
 .Sy mlslabel
 property is currently not supported on
 .Fx .
+.It Sy filesystem_limit Ns = Ns Ar count | Cm none
+Limits the number of filesystems and volumes that can exist under this point in
+the dataset tree.
+The limit is not enforced if the user is allowed to change
+the limit.
+Setting a
+.Sy filesystem_limit
+on a descendent of a filesystem that
+already has a
+.Sy filesystem_limit
+does not override the ancestor's
+.Sy filesystem_limit ,
+but rather imposes an additional limit.
+This feature must be enabled to be used
+.Po see
+.Xr zpool-features 7
+.Pc .
 .It Sy mountpoint Ns = Ns Ar path | Cm none | legacy
 Controls the mount point used for this file system. See the
 .Qq Sx Mount Points
@@ -1061,6 +1091,27 @@ the ancestor's quota, but rather imposes
 Quotas cannot be set on volumes, as the
 .Sy volsize
 property acts as an implicit quota.
+.It Sy snapshot_limit Ns = Ns Ar count | Cm none
+Limits the number of snapshots that can be created on a dataset and its
+descendents.
+Setting a
+.Sy snapshot_limit
+on a descendent of a dataset that already
+has a
+.Sy snapshot_limit
+does not override the ancestor's
+.Sy snapshot_limit ,
+but
+rather imposes an additional limit.
+The limit is not enforced if the user is
+allowed to change the limit.
+For example, this means that recursive snapshots
+taken from the global zone are counted against each delegated dataset within
+a jail.
+This feature must be enabled to be used
+.Po see
+.Xr zpool-features 7
+.Pc .
 .It Sy userquota@ Ns Ar user Ns = Ns Ar size | Cm none
 Limits the amount of space consumed by the specified user.
 Similar to the
@@ -2738,6 +2789,7 @@ protocol
 .It dedup Ta property
 .It devices Ta property
 .It exec Ta property
+.It filesystem_limit Ta property
 .It logbias Ta property
 .It jailed Ta property
 .It mlslabel Ta property
@@ -2756,6 +2808,7 @@ protocol
 .It sharenfs Ta property
 .It sharesmb Ta property
 .It snapdir Ta property
+.It snapshot_limit Ta property
 .It sync Ta property
 .It utf8only Ta property
 .It version Ta property
@@ -3102,10 +3155,12 @@ pool/home/bob  compression           on 
 pool/home/bob  atime                 on                     default
 pool/home/bob  devices               on                     default
 pool/home/bob  exec                  on                     default
+pool/home/bob  filesystem_limit      none                   default
 pool/home/bob  setuid                on                     default
 pool/home/bob  readonly              off                    default
 pool/home/bob  jailed                off                    default
 pool/home/bob  snapdir               hidden                 default
+pool/home/bob  snapshot_limit        none                   default
 pool/home/bob  aclmode               discard                default
 pool/home/bob  aclinherit            restricted             default
 pool/home/bob  canmount              on                     default

Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Apr 29 06:12:57 2014	(r265081)
@@ -495,9 +495,8 @@ usage(boolean_t requested)
 }
 
 static int
-parseprop(nvlist_t *props)
+parseprop(nvlist_t *props, char *propname)
 {
-	char *propname = optarg;
 	char *propval, *strval;
 
 	if ((propval = strchr(propname, '=')) == NULL) {
@@ -526,7 +525,7 @@ parse_depth(char *opt, int *flags)
 	depth = (int)strtol(opt, &tmp, 0);
 	if (*tmp) {
 		(void) fprintf(stderr,
-		    gettext("%s is not an integer\n"), optarg);
+		    gettext("%s is not an integer\n"), opt);
 		usage(B_FALSE);
 	}
 	if (depth < 0) {
@@ -617,7 +616,7 @@ zfs_do_clone(int argc, char **argv)
 	while ((c = getopt(argc, argv, "o:p")) != -1) {
 		switch (c) {
 		case 'o':
-			if (parseprop(props))
+			if (parseprop(props, optarg))
 				return (1);
 			break;
 		case 'p':
@@ -767,7 +766,7 @@ zfs_do_create(int argc, char **argv)
 				nomem();
 			break;
 		case 'o':
-			if (parseprop(props))
+			if (parseprop(props, optarg))
 				goto error;
 			break;
 		case 's':
@@ -3636,7 +3635,7 @@ zfs_do_snapshot(int argc, char **argv)
 	while ((c = getopt(argc, argv, "ro:")) != -1) {
 		switch (c) {
 		case 'o':
-			if (parseprop(props))
+			if (parseprop(props, optarg))
 				return (1);
 			break;
 		case 'r':

Modified: projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Apr 29 06:12:57 2014	(r265081)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2014
+.Dd April 23, 2014
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -187,6 +187,23 @@ This feature is
 .Sy active
 while there are any filesystems, volumes, or snapshots which were created
 after enabling this feature.
+.It Sy filesystem_limits
+.Bl -column "READ\-ONLY COMPATIBLE" "com.joyent:filesystem_limits"
+.It GUID Ta com.joyent:filesystem_limits
+.It READ\-ONLY COMPATIBLE Ta yes
+.It DEPENDENCIES Ta extensible_dataset
+.El
+.Pp
+This feature enables filesystem and snapshot limits.
+These limits can be used
+to control how many filesystems and/or snapshots can be created at the point in
+the tree on which the limits are set.
+.Pp
+This feature is
+.Sy active
+once either of the limit properties has been
+set on a dataset.
+Once activated the feature is never deactivated.
 .It Sy lz4_compress
 .Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:lz4_compress"
 .It GUID Ta org.illumos:lz4_compress

Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Tue Apr 29 06:12:57 2014	(r265081)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
@@ -1910,6 +1911,10 @@ get_numeric_property(zfs_handle_t *zhp, 
 	case ZFS_PROP_REFQUOTA:
 	case ZFS_PROP_RESERVATION:
 	case ZFS_PROP_REFRESERVATION:
+	case ZFS_PROP_FILESYSTEM_LIMIT:
+	case ZFS_PROP_SNAPSHOT_LIMIT:
+	case ZFS_PROP_FILESYSTEM_COUNT:
+	case ZFS_PROP_SNAPSHOT_COUNT:
 		*val = getprop_uint64(zhp, prop, source);
 
 		if (*source == NULL) {
@@ -2315,6 +2320,30 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop
 		}
 		break;
 
+	case ZFS_PROP_FILESYSTEM_LIMIT:
+	case ZFS_PROP_SNAPSHOT_LIMIT:
+	case ZFS_PROP_FILESYSTEM_COUNT:
+	case ZFS_PROP_SNAPSHOT_COUNT:
+
+		if (get_numeric_property(zhp, prop, src, &source, &val) != 0)
+			return (-1);
+
+		/*
+		 * If limit is UINT64_MAX, we translate this into 'none' (unless
+		 * literal is set), and indicate that it's the default value.
+		 * Otherwise, we print the number nicely and indicate that it's
+		 * set locally.
+		 */
+		if (literal) {
+			(void) snprintf(propbuf, proplen, "%llu",
+			    (u_longlong_t)val);
+		} else if (val == UINT64_MAX) {
+			(void) strlcpy(propbuf, "none", proplen);
+		} else {
+			zfs_nicenum(val, propbuf, proplen);
+		}
+		break;
+
 	case ZFS_PROP_REFRATIO:
 	case ZFS_PROP_COMPRESSRATIO:
 		if (get_numeric_property(zhp, prop, src, &source, &val) != 0)
@@ -2544,6 +2573,7 @@ out:
 	return (err);
 #else	/* !sun */
 	assert(!"invalid code path");
+	return (EINVAL); // silence compiler warning
 #endif	/* !sun */
 }
 

Modified: projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Tue Apr 29 06:12:57 2014	(r265081)
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -1268,6 +1269,16 @@ zprop_parse_value(libzfs_handle_t *hdl, 
 			    "use 'none' to disable quota/refquota"));
 			goto error;
 		}
+
+		/*
+		 * Special handling for "*_limit=none". In this case it's not
+		 * 0 but UINT64_MAX.
+		 */
+		if ((type & ZFS_TYPE_DATASET) && isnone &&
+		    (prop == ZFS_PROP_FILESYSTEM_LIMIT ||
+		    prop == ZFS_PROP_SNAPSHOT_LIMIT)) {
+			*ivalp = UINT64_MAX;
+		}
 		break;
 
 	case PROP_TYPE_INDEX:

Modified: projects/vxlan/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/vxlan/cddl/lib/libzpool/Makefile	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/cddl/lib/libzpool/Makefile	Tue Apr 29 06:12:57 2014	(r265081)
@@ -60,7 +60,7 @@ DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 LDADD=		-lmd -lpthread -lz
 
 # atomic.S doesn't like profiling.
-NO_PROFILE=
+MK_PROFILE=	no
 
 CSTD=	c99
 

Modified: projects/vxlan/contrib/llvm/include/llvm/DIBuilder.h
==============================================================================
--- projects/vxlan/contrib/llvm/include/llvm/DIBuilder.h	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/contrib/llvm/include/llvm/DIBuilder.h	Tue Apr 29 06:12:57 2014	(r265081)
@@ -439,7 +439,7 @@ namespace llvm {
     /// through debug info anchors.
     void retainType(DIType T);
 
-    /// createUnspecifiedParameter - Create unspeicified type descriptor
+    /// createUnspecifiedParameter - Create unspecified type descriptor
     /// for a subroutine type.
     DIDescriptor createUnspecifiedParameter();
 

Modified: projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
==============================================================================
--- projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp	Tue Apr 29 06:12:57 2014	(r265081)
@@ -1116,6 +1116,22 @@ void CompileUnit::constructTypeDIE(DIE &
     addSourceLine(&Buffer, DTy);
 }
 
+/// constructSubprogramArguments - Construct function argument DIEs.
+void CompileUnit::constructSubprogramArguments(DIE &Buffer, DIArray Args) {
+    for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
+      DIDescriptor Ty = Args.getElement(i);
+      if (Ty.isUnspecifiedParameter()) {
+        assert(i == N-1 && "ellipsis must be the last argument");
+        createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer);
+      } else {
+        DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer);
+        addType(Arg, DIType(Ty));
+        if (DIType(Ty).isArtificial())
+          addFlag(Arg, dwarf::DW_AT_artificial);
+      }
+    }
+}
+
 /// Return true if the type is appropriately scoped to be contained inside
 /// its own type unit.
 static bool isTypeUnitScoped(DIType Ty, const DwarfDebug *DD) {
@@ -1170,19 +1186,12 @@ void CompileUnit::constructTypeDIE(DIE &
       addType(&Buffer, RTy);
 
     bool isPrototyped = true;
-    // Add arguments.
-    for (unsigned i = 1, N = Elements.getNumElements(); i < N; ++i) {
-      DIDescriptor Ty = Elements.getElement(i);
-      if (Ty.isUnspecifiedParameter()) {
-        createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer);
-        isPrototyped = false;
-      } else {
-        DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer);
-        addType(Arg, DIType(Ty));
-        if (DIType(Ty).isArtificial())
-          addFlag(Arg, dwarf::DW_AT_artificial);
-      }
-    }
+    if (Elements.getNumElements() == 2 &&
+        Elements.getElement(1).isUnspecifiedParameter())
+      isPrototyped = false;
+
+    constructSubprogramArguments(Buffer, Elements);
+
     // Add prototype flag if we're dealing with a C language and the
     // function has been prototyped.
     uint16_t Language = getLanguage();
@@ -1475,13 +1484,7 @@ DIE *CompileUnit::getOrCreateSubprogramD
 
     // Add arguments. Do not add arguments for subprogram definition. They will
     // be handled while processing variables.
-    for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
-      DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie);
-      DIType ATy(Args.getElement(i));
-      addType(Arg, ATy);
-      if (ATy.isArtificial())
-        addFlag(Arg, dwarf::DW_AT_artificial);
-    }
+    constructSubprogramArguments(*SPDie, Args);
   }
 
   if (SP.isArtificial())

Modified: projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
==============================================================================
--- projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h	Tue Apr 29 06:12:57 2014	(r265081)
@@ -342,6 +342,9 @@ public:
   void emitHeader(const MCSection *ASection, const MCSymbol *ASectionSym);
 
 private:
+  /// constructSubprogramArguments - Construct function argument DIEs.
+  void constructSubprogramArguments(DIE &Buffer, DIArray Args);
+
   /// constructTypeDIE - Construct basic type die from DIBasicType.
   void constructTypeDIE(DIE &Buffer, DIBasicType BTy);
 

Modified: projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
==============================================================================
--- projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Tue Apr 29 06:12:57 2014	(r265081)
@@ -404,15 +404,21 @@ DIE *DwarfDebug::updateSubprogramScopeDI
         DIArray Args = SPTy.getTypeArray();
         uint16_t SPTag = SPTy.getTag();
         if (SPTag == dwarf::DW_TAG_subroutine_type)
+          // FIXME: Use DwarfUnit::constructSubprogramArguments() here.
           for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
-            DIE *Arg =
-                SPCU->createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie);
             DIType ATy(Args.getElement(i));
-            SPCU->addType(Arg, ATy);
-            if (ATy.isArtificial())
-              SPCU->addFlag(Arg, dwarf::DW_AT_artificial);
-            if (ATy.isObjectPointer())
-              SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg);
+            if (ATy.isUnspecifiedParameter()) {
+              assert(i == N-1 && "ellipsis must be the last argument");
+              SPCU->createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, *SPDie);
+            } else {
+              DIE *Arg =
+                SPCU->createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie);
+              SPCU->addType(Arg, ATy);
+              if (ATy.isArtificial())
+                SPCU->addFlag(Arg, dwarf::DW_AT_artificial);
+              if (ATy.isObjectPointer())
+                SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg);
+            }
           }
         DIE *SPDeclDie = SPDie;
         SPDie =
@@ -579,7 +585,7 @@ DIE *DwarfDebug::createScopeChildrenDIE(
     DIE *ObjectPointer = NULL;
 
   // Collect arguments for current function.
-  if (LScopes.isCurrentFunctionScope(Scope))
+  if (LScopes.isCurrentFunctionScope(Scope)) {
     for (unsigned i = 0, N = CurrentFnArguments.size(); i < N; ++i)
       if (DbgVariable *ArgDV = CurrentFnArguments[i])
         if (DIE *Arg =
@@ -588,6 +594,16 @@ DIE *DwarfDebug::createScopeChildrenDIE(
           if (ArgDV->isObjectPointer()) ObjectPointer = Arg;
         }
 
+    // Create the unspecified parameter that marks a function as variadic.
+    DISubprogram SP(Scope->getScopeNode());
+    assert(SP.Verify());
+    DIArray FnArgs = SP.getType().getTypeArray();
+    if (FnArgs.getElement(FnArgs.getNumElements()-1).isUnspecifiedParameter()) {
+      DIE *Ellipsis = new DIE(dwarf::DW_TAG_unspecified_parameters);
+      Children.push_back(Ellipsis);
+    }
+  }
+
   // Collect lexical scope children first.
   const SmallVectorImpl<DbgVariable *> &Variables =ScopeVariables.lookup(Scope);
   for (unsigned i = 0, N = Variables.size(); i < N; ++i)

Copied: projects/vxlan/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff (from r265080, head/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vxlan/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff	Tue Apr 29 06:12:57 2014	(r265081, copy of r265080, head/contrib/llvm/patches/patch-r264826-llvm-r202188-variadic-fn-debug-info.diff)
@@ -0,0 +1,176 @@
+Merge LLVM r202188:
+
+  Debug info: Support variadic functions.
+  Variadic functions have an unspecified parameter tag after the last
+  argument. In IR this is represented as an unspecified parameter in the
+  subroutine type.
+
+  Paired commit with CFE r202185.
+
+  rdar://problem/13690847
+
+  This re-applies r202184 + a bugfix in DwarfDebug's argument handling.
+
+This merge includes a change to use the LLVM 3.4 API in
+lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp:
+
+DwarfUnit -> CompileUnit
+
+Sponsored by:       DARPA, AFRL
+
+http://svnweb.freebsd.org/changeset/base/264826
+
+Index: include/llvm/DIBuilder.h
+===================================================================
+--- include/llvm/DIBuilder.h	(revision 264825)
++++ include/llvm/DIBuilder.h	(revision 264826)
+@@ -439,7 +439,7 @@
+     /// through debug info anchors.
+     void retainType(DIType T);
+ 
+-    /// createUnspecifiedParameter - Create unspeicified type descriptor
++    /// createUnspecifiedParameter - Create unspecified type descriptor
+     /// for a subroutine type.
+     DIDescriptor createUnspecifiedParameter();
+ 
+Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+===================================================================
+--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp	(revision 264825)
++++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp	(revision 264826)
+@@ -404,15 +404,21 @@
+         DIArray Args = SPTy.getTypeArray();
+         uint16_t SPTag = SPTy.getTag();
+         if (SPTag == dwarf::DW_TAG_subroutine_type)
++          // FIXME: Use DwarfUnit::constructSubprogramArguments() here.
+           for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
+-            DIE *Arg =
++            DIType ATy(Args.getElement(i));
++            if (ATy.isUnspecifiedParameter()) {
++              assert(i == N-1 && "ellipsis must be the last argument");
++              SPCU->createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, *SPDie);
++            } else {
++              DIE *Arg =
+                 SPCU->createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie);
+-            DIType ATy(Args.getElement(i));
+-            SPCU->addType(Arg, ATy);
+-            if (ATy.isArtificial())
+-              SPCU->addFlag(Arg, dwarf::DW_AT_artificial);
+-            if (ATy.isObjectPointer())
+-              SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg);
++              SPCU->addType(Arg, ATy);
++              if (ATy.isArtificial())
++                SPCU->addFlag(Arg, dwarf::DW_AT_artificial);
++              if (ATy.isObjectPointer())
++                SPCU->addDIEEntry(SPDie, dwarf::DW_AT_object_pointer, Arg);
++            }
+           }
+         DIE *SPDeclDie = SPDie;
+         SPDie =
+@@ -579,7 +585,7 @@
+     DIE *ObjectPointer = NULL;
+ 
+   // Collect arguments for current function.
+-  if (LScopes.isCurrentFunctionScope(Scope))
++  if (LScopes.isCurrentFunctionScope(Scope)) {
+     for (unsigned i = 0, N = CurrentFnArguments.size(); i < N; ++i)
+       if (DbgVariable *ArgDV = CurrentFnArguments[i])
+         if (DIE *Arg =
+@@ -588,6 +594,16 @@
+           if (ArgDV->isObjectPointer()) ObjectPointer = Arg;
+         }
+ 
++    // Create the unspecified parameter that marks a function as variadic.
++    DISubprogram SP(Scope->getScopeNode());
++    assert(SP.Verify());
++    DIArray FnArgs = SP.getType().getTypeArray();
++    if (FnArgs.getElement(FnArgs.getNumElements()-1).isUnspecifiedParameter()) {
++      DIE *Ellipsis = new DIE(dwarf::DW_TAG_unspecified_parameters);
++      Children.push_back(Ellipsis);
++    }
++  }
++
+   // Collect lexical scope children first.
+   const SmallVectorImpl<DbgVariable *> &Variables =ScopeVariables.lookup(Scope);
+   for (unsigned i = 0, N = Variables.size(); i < N; ++i)
+Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+===================================================================
+--- lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp	(revision 264825)
++++ lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp	(revision 264826)
+@@ -1116,6 +1116,22 @@
+     addSourceLine(&Buffer, DTy);
+ }
+ 
++/// constructSubprogramArguments - Construct function argument DIEs.
++void CompileUnit::constructSubprogramArguments(DIE &Buffer, DIArray Args) {
++    for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
++      DIDescriptor Ty = Args.getElement(i);
++      if (Ty.isUnspecifiedParameter()) {
++        assert(i == N-1 && "ellipsis must be the last argument");
++        createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer);
++      } else {
++        DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer);
++        addType(Arg, DIType(Ty));
++        if (DIType(Ty).isArtificial())
++          addFlag(Arg, dwarf::DW_AT_artificial);
++      }
++    }
++}
++
+ /// Return true if the type is appropriately scoped to be contained inside
+ /// its own type unit.
+ static bool isTypeUnitScoped(DIType Ty, const DwarfDebug *DD) {
+@@ -1170,19 +1186,12 @@
+       addType(&Buffer, RTy);
+ 
+     bool isPrototyped = true;
+-    // Add arguments.
+-    for (unsigned i = 1, N = Elements.getNumElements(); i < N; ++i) {
+-      DIDescriptor Ty = Elements.getElement(i);
+-      if (Ty.isUnspecifiedParameter()) {
+-        createAndAddDIE(dwarf::DW_TAG_unspecified_parameters, Buffer);
+-        isPrototyped = false;
+-      } else {
+-        DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, Buffer);
+-        addType(Arg, DIType(Ty));
+-        if (DIType(Ty).isArtificial())
+-          addFlag(Arg, dwarf::DW_AT_artificial);
+-      }
+-    }
++    if (Elements.getNumElements() == 2 &&
++        Elements.getElement(1).isUnspecifiedParameter())
++      isPrototyped = false;
++
++    constructSubprogramArguments(Buffer, Elements);
++
+     // Add prototype flag if we're dealing with a C language and the
+     // function has been prototyped.
+     uint16_t Language = getLanguage();
+@@ -1475,13 +1484,7 @@
+ 
+     // Add arguments. Do not add arguments for subprogram definition. They will
+     // be handled while processing variables.
+-    for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
+-      DIE *Arg = createAndAddDIE(dwarf::DW_TAG_formal_parameter, *SPDie);
+-      DIType ATy(Args.getElement(i));
+-      addType(Arg, ATy);
+-      if (ATy.isArtificial())
+-        addFlag(Arg, dwarf::DW_AT_artificial);
+-    }
++    constructSubprogramArguments(*SPDie, Args);
+   }
+ 
+   if (SP.isArtificial())
+Index: lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+===================================================================
+--- lib/CodeGen/AsmPrinter/DwarfCompileUnit.h	(revision 264825)
++++ lib/CodeGen/AsmPrinter/DwarfCompileUnit.h	(revision 264826)
+@@ -342,6 +342,9 @@
+   void emitHeader(const MCSection *ASection, const MCSymbol *ASectionSym);
+ 
+ private:
++  /// constructSubprogramArguments - Construct function argument DIEs.
++  void constructSubprogramArguments(DIE &Buffer, DIArray Args);
++
+   /// constructTypeDIE - Construct basic type die from DIBasicType.
+   void constructTypeDIE(DIE &Buffer, DIBasicType BTy);
+ 

Copied: projects/vxlan/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff (from r265080, head/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vxlan/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff	Tue Apr 29 06:12:57 2014	(r265081, copy of r265080, head/contrib/llvm/patches/patch-r264827-clang-r202185-variadic-fn-debug-info.diff)
@@ -0,0 +1,74 @@
+Merge Clang r202185:
+
+  Debug info: Generate debug info for variadic functions.
+  Paired commit with LLVM.
+
+  rdar://problem/13690847
+
+This merege includes changes to use the Clang 3.4 API (revisions
+199686 and 200082) in lib/CodeGen/CGDebugInfo.cpp:
+
+getParamType  -> getArgType
+getNumParams  -> getNumArgs
+getReturnType -> getResultType
+
+Sponsored by:	DARPA, AFRL
+
+http://svnweb.freebsd.org/changeset/base/264827
+
+Index: tools/clang/lib/CodeGen/CGDebugInfo.cpp
+===================================================================
+--- tools/clang/lib/CodeGen/CGDebugInfo.cpp	(revision 264826)
++++ tools/clang/lib/CodeGen/CGDebugInfo.cpp	(revision 264827)
+@@ -37,7 +37,7 @@
+ #include "llvm/IR/Module.h"
+ #include "llvm/Support/Dwarf.h"
+ #include "llvm/Support/FileSystem.h"
+-#include "llvm/Support/Path.h"
++#include "llvm/Support/Path.h"
+ using namespace clang;
+ using namespace clang::CodeGen;
+ 
+@@ -342,9 +342,9 @@
+   if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) {
+     MainFileDir = MainFile->getDir()->getName();
+     if (MainFileDir != ".") {
+-      llvm::SmallString<1024> MainFileDirSS(MainFileDir);
+-      llvm::sys::path::append(MainFileDirSS, MainFileName);
+-      MainFileName = MainFileDirSS.str();
++      llvm::SmallString<1024> MainFileDirSS(MainFileDir);
++      llvm::sys::path::append(MainFileDirSS, MainFileName);
++      MainFileName = MainFileDirSS.str();
+     }
+   }
+ 
+@@ -760,6 +760,8 @@
+   else if (const FunctionProtoType *FPT = dyn_cast<FunctionProtoType>(Ty)) {
+     for (unsigned i = 0, e = FPT->getNumArgs(); i != e; ++i)
+       EltTys.push_back(getOrCreateType(FPT->getArgType(i), Unit));
++    if (FPT->isVariadic())
++      EltTys.push_back(DBuilder.createUnspecifiedParameter());
+   }
+ 
+   llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(EltTys);
+@@ -2420,6 +2422,20 @@
+     llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(Elts);
+     return DBuilder.createSubroutineType(F, EltTypeArray);
+   }
++
++  // Variadic function.
++  if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D))
++    if (FD->isVariadic()) {
++      SmallVector<llvm::Value *, 16> EltTys;
++      EltTys.push_back(getOrCreateType(FD->getResultType(), F));
++      if (const FunctionProtoType *FPT = dyn_cast<FunctionProtoType>(FnType))
++        for (unsigned i = 0, e = FPT->getNumArgs(); i != e; ++i)
++          EltTys.push_back(getOrCreateType(FPT->getArgType(i), F));
++      EltTys.push_back(DBuilder.createUnspecifiedParameter());
++      llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(EltTys);
++      return DBuilder.createSubroutineType(F, EltTypeArray);
++    }
++
+   return llvm::DICompositeType(getOrCreateType(FnType, F));
+ }
+ 

Modified: projects/vxlan/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
==============================================================================
--- projects/vxlan/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Tue Apr 29 05:48:50 2014	(r265080)
+++ projects/vxlan/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Tue Apr 29 06:12:57 2014	(r265081)
@@ -37,7 +37,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
+#include "llvm/Support/Path.h"
 using namespace clang;
 using namespace clang::CodeGen;
 
@@ -342,9 +342,9 @@ void CGDebugInfo::CreateCompileUnit() {
   if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) {
     MainFileDir = MainFile->getDir()->getName();
     if (MainFileDir != ".") {
-      llvm::SmallString<1024> MainFileDirSS(MainFileDir);
-      llvm::sys::path::append(MainFileDirSS, MainFileName);
-      MainFileName = MainFileDirSS.str();
+      llvm::SmallString<1024> MainFileDirSS(MainFileDir);
+      llvm::sys::path::append(MainFileDirSS, MainFileName);
+      MainFileName = MainFileDirSS.str();
     }
   }
 
@@ -760,6 +760,8 @@ llvm::DIType CGDebugInfo::CreateType(con
   else if (const FunctionProtoType *FPT = dyn_cast<FunctionProtoType>(Ty)) {
     for (unsigned i = 0, e = FPT->getNumArgs(); i != e; ++i)
       EltTys.push_back(getOrCreateType(FPT->getArgType(i), Unit));
+    if (FPT->isVariadic())
+      EltTys.push_back(DBuilder.createUnspecifiedParameter());
   }
 
   llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(EltTys);
@@ -2420,6 +2422,20 @@ llvm::DICompositeType CGDebugInfo::getOr
     llvm::DIArray EltTypeArray = DBuilder.getOrCreateArray(Elts);
     return DBuilder.createSubroutineType(F, EltTypeArray);
   }

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

More information about the svn-src-projects mailing list