Date: Wed, 21 Aug 2013 06:32:33 +0000 (UTC) From: Neel Natu <neel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254594 - in projects/bhyve_npt_pmap: . bin/sh cddl/contrib/opensolaris/cmd/zpool contrib/binutils/binutils contrib/binutils/include/elf contrib/libc++/include contrib/libc++/src contri... Message-ID: <201308210632.r7L6WXHA021242@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: neel Date: Wed Aug 21 06:32:32 2013 New Revision: 254594 URL: http://svnweb.freebsd.org/changeset/base/254594 Log: IFC @r253582 Added: projects/bhyve_npt_pmap/sbin/mount/mount.conf.8 - copied unchanged from r253582, head/sbin/mount/mount.conf.8 projects/bhyve_npt_pmap/share/man/man9/vmem.9 - copied unchanged from r253582, head/share/man/man9/vmem.9 projects/bhyve_npt_pmap/share/monetdef/ca_ES.UTF-8.src - copied unchanged from r253582, head/share/monetdef/ca_ES.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/de_AT.UTF-8.src - copied unchanged from r253582, head/share/monetdef/de_AT.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/de_DE.UTF-8.src - copied unchanged from r253582, head/share/monetdef/de_DE.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/el_GR.UTF-8.src - copied unchanged from r253582, head/share/monetdef/el_GR.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/es_ES.UTF-8.src - copied unchanged from r253582, head/share/monetdef/es_ES.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/fi_FI.UTF-8.src - copied unchanged from r253582, head/share/monetdef/fi_FI.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/fr_BE.UTF-8.src - copied unchanged from r253582, head/share/monetdef/fr_BE.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/fr_FR.UTF-8.src - copied unchanged from r253582, head/share/monetdef/fr_FR.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/it_IT.UTF-8.src - copied unchanged from r253582, head/share/monetdef/it_IT.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/nl_BE.UTF-8.src - copied unchanged from r253582, head/share/monetdef/nl_BE.UTF-8.src projects/bhyve_npt_pmap/share/monetdef/nl_NL.UTF-8.src - copied unchanged from r253582, head/share/monetdef/nl_NL.UTF-8.src projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/std.bcm2835 - copied unchanged from r253582, head/sys/arm/broadcom/bcm2835/std.bcm2835 projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/std.rpi - copied unchanged from r253582, head/sys/arm/broadcom/bcm2835/std.rpi projects/bhyve_npt_pmap/sys/crypto/siphash/ - copied from r253582, head/sys/crypto/siphash/ projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_vlans.c - copied unchanged from r253582, head/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_vlans.h - copied unchanged from r253582, head/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_util.c - copied unchanged from r253582, head/sys/dev/nvme/nvme_util.c projects/bhyve_npt_pmap/sys/dev/usb/gadget/ - copied from r253582, head/sys/dev/usb/gadget/ projects/bhyve_npt_pmap/sys/mips/atheros/ar934x_chip.c - copied unchanged from r253582, head/sys/mips/atheros/ar934x_chip.c projects/bhyve_npt_pmap/sys/mips/atheros/ar934x_chip.h - copied unchanged from r253582, head/sys/mips/atheros/ar934x_chip.h projects/bhyve_npt_pmap/sys/mips/conf/AR934X_BASE - copied unchanged from r253582, head/sys/mips/conf/AR934X_BASE projects/bhyve_npt_pmap/sys/mips/conf/AR934X_BASE.hints - copied unchanged from r253582, head/sys/mips/conf/AR934X_BASE.hints projects/bhyve_npt_pmap/sys/mips/conf/DB120 - copied unchanged from r253582, head/sys/mips/conf/DB120 projects/bhyve_npt_pmap/sys/mips/conf/DB120.hints - copied unchanged from r253582, head/sys/mips/conf/DB120.hints projects/bhyve_npt_pmap/sys/modules/usb/g_audio/ - copied from r253582, head/sys/modules/usb/g_audio/ projects/bhyve_npt_pmap/sys/modules/usb/g_keyboard/ - copied from r253582, head/sys/modules/usb/g_keyboard/ projects/bhyve_npt_pmap/sys/modules/usb/g_modem/ - copied from r253582, head/sys/modules/usb/g_modem/ projects/bhyve_npt_pmap/sys/modules/usb/g_mouse/ - copied from r253582, head/sys/modules/usb/g_mouse/ projects/bhyve_npt_pmap/tools/build/options/WITHOUT_ARM_EABI - copied unchanged from r253582, head/tools/build/options/WITHOUT_ARM_EABI projects/bhyve_npt_pmap/tools/build/options/WITH_PKGTOOLS - copied unchanged from r253582, head/tools/build/options/WITH_PKGTOOLS projects/bhyve_npt_pmap/tools/regression/bin/sh/execution/int-cmd1.0 - copied unchanged from r253582, head/tools/regression/bin/sh/execution/int-cmd1.0 projects/bhyve_npt_pmap/usr.sbin/bhyve/rtc.h - copied unchanged from r253582, head/usr.sbin/bhyve/rtc.h projects/bhyve_npt_pmap/usr.sbin/bhyve/virtio.c - copied unchanged from r253582, head/usr.sbin/bhyve/virtio.c Deleted: projects/bhyve_npt_pmap/contrib/openbsm/m4/lt~obsolete.m4 projects/bhyve_npt_pmap/tools/build/options/WITHOUT_PKGTOOLS projects/bhyve_npt_pmap/tools/build/options/WITH_ARM_EABI projects/bhyve_npt_pmap/usr.bin/systat/mbufs.c Modified: projects/bhyve_npt_pmap/Makefile.inc1 projects/bhyve_npt_pmap/ObsoleteFiles.inc projects/bhyve_npt_pmap/UPDATING projects/bhyve_npt_pmap/bin/sh/main.c projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference projects/bhyve_npt_pmap/contrib/libc++/include/__config projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table projects/bhyve_npt_pmap/contrib/libc++/include/__locale projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream projects/bhyve_npt_pmap/contrib/libc++/include/__tree projects/bhyve_npt_pmap/contrib/libc++/include/algorithm projects/bhyve_npt_pmap/contrib/libc++/include/atomic projects/bhyve_npt_pmap/contrib/libc++/include/deque projects/bhyve_npt_pmap/contrib/libc++/include/forward_list projects/bhyve_npt_pmap/contrib/libc++/include/functional projects/bhyve_npt_pmap/contrib/libc++/include/future projects/bhyve_npt_pmap/contrib/libc++/include/istream projects/bhyve_npt_pmap/contrib/libc++/include/iterator projects/bhyve_npt_pmap/contrib/libc++/include/list projects/bhyve_npt_pmap/contrib/libc++/include/locale projects/bhyve_npt_pmap/contrib/libc++/include/map projects/bhyve_npt_pmap/contrib/libc++/include/memory projects/bhyve_npt_pmap/contrib/libc++/include/random projects/bhyve_npt_pmap/contrib/libc++/include/regex projects/bhyve_npt_pmap/contrib/libc++/include/string projects/bhyve_npt_pmap/contrib/libc++/include/type_traits projects/bhyve_npt_pmap/contrib/libc++/include/unordered_map projects/bhyve_npt_pmap/contrib/libc++/include/utility projects/bhyve_npt_pmap/contrib/libc++/include/vector projects/bhyve_npt_pmap/contrib/libc++/src/debug.cpp projects/bhyve_npt_pmap/contrib/libc++/src/hash.cpp projects/bhyve_npt_pmap/contrib/libc++/src/iostream.cpp projects/bhyve_npt_pmap/contrib/libc++/src/locale.cpp projects/bhyve_npt_pmap/contrib/libc++/src/stdexcept.cpp projects/bhyve_npt_pmap/contrib/libc++/src/string.cpp projects/bhyve_npt_pmap/contrib/libc++/src/thread.cpp projects/bhyve_npt_pmap/contrib/libcxxrt/atomic.h projects/bhyve_npt_pmap/contrib/libcxxrt/auxhelper.cc projects/bhyve_npt_pmap/contrib/libcxxrt/cxxabi.h projects/bhyve_npt_pmap/contrib/libcxxrt/dwarf_eh.h projects/bhyve_npt_pmap/contrib/libcxxrt/exception.cc projects/bhyve_npt_pmap/contrib/libcxxrt/guard.cc projects/bhyve_npt_pmap/contrib/libcxxrt/memory.cc projects/bhyve_npt_pmap/contrib/libstdc++/include/c_std/std_cmath.h projects/bhyve_npt_pmap/etc/network.subr projects/bhyve_npt_pmap/etc/rc.d/pfsync projects/bhyve_npt_pmap/lib/libc/arm/gen/sigsetjmp.S projects/bhyve_npt_pmap/lib/libc/gen/sysctl.3 projects/bhyve_npt_pmap/lib/libc/gen/wordexp.c projects/bhyve_npt_pmap/lib/libc/sparc64/gen/makecontext.c projects/bhyve_npt_pmap/lib/libc/sparc64/gen/signalcontext.c projects/bhyve_npt_pmap/lib/libc/stdio/fwrite.c projects/bhyve_npt_pmap/lib/libc/stdlib/getenv.c projects/bhyve_npt_pmap/lib/libc/sys/ptrace.2 projects/bhyve_npt_pmap/lib/libfetch/http.c projects/bhyve_npt_pmap/lib/libgeom/geom_xml2tree.c projects/bhyve_npt_pmap/lib/libgeom/libgeom.h projects/bhyve_npt_pmap/lib/libkvm/Makefile projects/bhyve_npt_pmap/lib/libkvm/kvm.h projects/bhyve_npt_pmap/lib/libthread_db/arch/sparc64/libpthread_md.c projects/bhyve_npt_pmap/lib/libusb/Makefile projects/bhyve_npt_pmap/lib/libusb/libusb20.c projects/bhyve_npt_pmap/lib/libusb/libusb20_ugen20.c projects/bhyve_npt_pmap/lib/libusb/libusb_global_linux.h projects/bhyve_npt_pmap/lib/msun/src/math.h projects/bhyve_npt_pmap/release/Makefile projects/bhyve_npt_pmap/sbin/devfs/devfs.8 projects/bhyve_npt_pmap/sbin/etherswitchcfg/etherswitchcfg.c projects/bhyve_npt_pmap/sbin/mount/Makefile (contents, props changed) projects/bhyve_npt_pmap/sbin/mount/mount.8 projects/bhyve_npt_pmap/sbin/mount/mount.c projects/bhyve_npt_pmap/sbin/nvmecontrol/Makefile projects/bhyve_npt_pmap/sbin/nvmecontrol/devlist.c projects/bhyve_npt_pmap/sbin/nvmecontrol/firmware.c projects/bhyve_npt_pmap/sbin/nvmecontrol/identify.c projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.c projects/bhyve_npt_pmap/sbin/recoverdisk/recoverdisk.1 projects/bhyve_npt_pmap/sbin/route/Makefile projects/bhyve_npt_pmap/sbin/route/route.c projects/bhyve_npt_pmap/share/examples/kld/syscall/test/call.c projects/bhyve_npt_pmap/share/man/man4/ath_hal.4 projects/bhyve_npt_pmap/share/man/man4/mfi.4 projects/bhyve_npt_pmap/share/man/man4/nvd.4 projects/bhyve_npt_pmap/share/man/man4/nvme.4 projects/bhyve_npt_pmap/share/man/man5/fstab.5 projects/bhyve_npt_pmap/share/man/man5/rc.conf.5 projects/bhyve_npt_pmap/share/man/man5/src.conf.5 projects/bhyve_npt_pmap/share/man/man9/Makefile projects/bhyve_npt_pmap/share/man/man9/bus_dma.9 projects/bhyve_npt_pmap/share/misc/committers-ports.dot projects/bhyve_npt_pmap/share/mk/bsd.own.mk projects/bhyve_npt_pmap/share/monetdef/Makefile projects/bhyve_npt_pmap/sys/amd64/amd64/machdep.c projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c projects/bhyve_npt_pmap/sys/arm/arm/db_trace.c projects/bhyve_npt_pmap/sys/arm/arm/trap.c projects/bhyve_npt_pmap/sys/arm/arm/vfp.c projects/bhyve_npt_pmap/sys/arm/arm/vm_machdep.c projects/bhyve_npt_pmap/sys/arm/conf/RPI-B projects/bhyve_npt_pmap/sys/arm/include/atomic.h projects/bhyve_npt_pmap/sys/boot/ficl/loader.c projects/bhyve_npt_pmap/sys/cam/cam_ccb.h projects/bhyve_npt_pmap/sys/cam/cam_periph.c projects/bhyve_npt_pmap/sys/cam/cam_xpt.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.h projects/bhyve_npt_pmap/sys/cam/scsi/scsi_ch.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_xpt.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_misc.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_proto.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_signal.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscall.h projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscalls.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_sysent.c projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_systrace_args.c projects/bhyve_npt_pmap/sys/compat/freebsd32/syscalls.master projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.c projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.h projects/bhyve_npt_pmap/sys/conf/Makefile.arm projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.amd64 projects/bhyve_npt_pmap/sys/conf/files.i386 projects/bhyve_npt_pmap/sys/contrib/v4l/videodev2.h projects/bhyve_npt_pmap/sys/dev/acpica/acpi_resource.c projects/bhyve_npt_pmap/sys/dev/ae/if_ae.c projects/bhyve_npt_pmap/sys/dev/ae/if_aereg.h projects/bhyve_npt_pmap/sys/dev/ahci/ahci.c projects/bhyve_npt_pmap/sys/dev/ata/ata-pci.h projects/bhyve_npt_pmap/sys/dev/ata/chipsets/ata-intel.c projects/bhyve_npt_pmap/sys/dev/bge/if_bge.c projects/bhyve_npt_pmap/sys/dev/bge/if_bgereg.h projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c projects/bhyve_npt_pmap/sys/dev/drm2/i915/i915_gem.c projects/bhyve_npt_pmap/sys/dev/e1000/if_em.c projects/bhyve_npt_pmap/sys/dev/e1000/if_igb.c projects/bhyve_npt_pmap/sys/dev/e1000/if_lem.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8216.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8226.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_reg.h projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitchreg.h projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitchvar.h projects/bhyve_npt_pmap/sys/dev/etherswitch/etherswitch.h projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip175c.c projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip175d.c projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip17x_vlans.c projects/bhyve_npt_pmap/sys/dev/etherswitch/rtl8366/rtl8366rb.c projects/bhyve_npt_pmap/sys/dev/hptnr/hptnr_osm_bsd.c projects/bhyve_npt_pmap/sys/dev/ichsmb/ichsmb_pci.c projects/bhyve_npt_pmap/sys/dev/ichwd/ichwd.c projects/bhyve_npt_pmap/sys/dev/ichwd/ichwd.h projects/bhyve_npt_pmap/sys/dev/isp/isp.c projects/bhyve_npt_pmap/sys/dev/isp/ispreg.h projects/bhyve_npt_pmap/sys/dev/ixgbe/ixgbe.c projects/bhyve_npt_pmap/sys/dev/ixgbe/ixv.c projects/bhyve_npt_pmap/sys/dev/mii/brgphy.c projects/bhyve_npt_pmap/sys/dev/mii/miidevs projects/bhyve_npt_pmap/sys/dev/mps/mps.c projects/bhyve_npt_pmap/sys/dev/mps/mps_config.c projects/bhyve_npt_pmap/sys/dev/mps/mps_mapping.c projects/bhyve_npt_pmap/sys/dev/mps/mps_pci.c projects/bhyve_npt_pmap/sys/dev/mps/mps_sas.c projects/bhyve_npt_pmap/sys/dev/mps/mps_sas.h projects/bhyve_npt_pmap/sys/dev/mps/mps_sas_lsi.c projects/bhyve_npt_pmap/sys/dev/mps/mps_table.c projects/bhyve_npt_pmap/sys/dev/mps/mps_user.c projects/bhyve_npt_pmap/sys/dev/mps/mpsvar.h projects/bhyve_npt_pmap/sys/dev/nvd/nvd.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ns.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ns_cmd.c projects/bhyve_npt_pmap/sys/dev/pci/pci.c projects/bhyve_npt_pmap/sys/dev/pci/pci_pci.c projects/bhyve_npt_pmap/sys/dev/pci/pci_private.h projects/bhyve_npt_pmap/sys/dev/pci/pcib_private.h projects/bhyve_npt_pmap/sys/dev/syscons/syscons.c projects/bhyve_npt_pmap/sys/dev/uart/uart_core.c projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci.c projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci_pci.c projects/bhyve_npt_pmap/sys/dev/usb/input/ukbd.c projects/bhyve_npt_pmap/sys/dev/usb/usb_pf.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rum.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_uath.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_upgt.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_ural.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtw.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwn.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_zyd.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vnops.c projects/bhyve_npt_pmap/sys/fs/fuse/fuse_kernel.h projects/bhyve_npt_pmap/sys/fs/nfs/nfs_commonsubs.c projects/bhyve_npt_pmap/sys/fs/tmpfs/tmpfs_vfsops.c projects/bhyve_npt_pmap/sys/geom/journal/g_journal.c projects/bhyve_npt_pmap/sys/i386/i386/pmap.c projects/bhyve_npt_pmap/sys/i386/i386/support.s projects/bhyve_npt_pmap/sys/i386/i386/symbols.raw projects/bhyve_npt_pmap/sys/i386/i386/uio_machdep.c projects/bhyve_npt_pmap/sys/i386/i386/vm_machdep.c projects/bhyve_npt_pmap/sys/ia64/ia64/mca.c projects/bhyve_npt_pmap/sys/ia64/ia64/pmap.c projects/bhyve_npt_pmap/sys/ia64/pci/pci_cfgreg.c projects/bhyve_npt_pmap/sys/kern/kern_exit.c projects/bhyve_npt_pmap/sys/kern/kern_mbuf.c projects/bhyve_npt_pmap/sys/kern/kern_sig.c projects/bhyve_npt_pmap/sys/kern/kern_time.c projects/bhyve_npt_pmap/sys/kern/subr_bus.c projects/bhyve_npt_pmap/sys/kern/subr_counter.c projects/bhyve_npt_pmap/sys/kern/sysv_shm.c projects/bhyve_npt_pmap/sys/kern/uipc_mbuf.c projects/bhyve_npt_pmap/sys/kern/uipc_mqueue.c projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c projects/bhyve_npt_pmap/sys/kern/vfs_aio.c projects/bhyve_npt_pmap/sys/kern/vfs_bio.c projects/bhyve_npt_pmap/sys/kern/vfs_mount.c projects/bhyve_npt_pmap/sys/kern/vfs_subr.c projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_chip.c projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_cpudef.h projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_gpio.c projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_setup.c projects/bhyve_npt_pmap/sys/mips/atheros/ar724x_chip.c projects/bhyve_npt_pmap/sys/mips/atheros/ar91xx_chip.c projects/bhyve_npt_pmap/sys/mips/atheros/ar933x_chip.c projects/bhyve_npt_pmap/sys/mips/atheros/files.ar71xx projects/bhyve_npt_pmap/sys/mips/atheros/uart_bus_ar71xx.c projects/bhyve_npt_pmap/sys/mips/atheros/uart_bus_ar933x.c projects/bhyve_npt_pmap/sys/mips/atheros/uart_cpu_ar71xx.c projects/bhyve_npt_pmap/sys/mips/atheros/uart_cpu_ar933x.c projects/bhyve_npt_pmap/sys/mips/cavium/std.octeon1 projects/bhyve_npt_pmap/sys/mips/mips/uio_machdep.c projects/bhyve_npt_pmap/sys/mips/mips/vm_machdep.c projects/bhyve_npt_pmap/sys/modules/Makefile projects/bhyve_npt_pmap/sys/modules/em/Makefile projects/bhyve_npt_pmap/sys/modules/igb/Makefile projects/bhyve_npt_pmap/sys/modules/nvme/Makefile projects/bhyve_npt_pmap/sys/modules/usb/Makefile projects/bhyve_npt_pmap/sys/net/ieee8023ad_lacp.c projects/bhyve_npt_pmap/sys/net/if.c projects/bhyve_npt_pmap/sys/net/if_gif.c projects/bhyve_npt_pmap/sys/net/if_lagg.c projects/bhyve_npt_pmap/sys/net/if_lagg.h projects/bhyve_npt_pmap/sys/net/rtsock.c projects/bhyve_npt_pmap/sys/netgraph/bluetooth/socket/ng_btsocket.c projects/bhyve_npt_pmap/sys/netgraph/ng_base.c projects/bhyve_npt_pmap/sys/netgraph/ng_pppoe.c projects/bhyve_npt_pmap/sys/netgraph/ng_pppoe.h projects/bhyve_npt_pmap/sys/netinet/in_pcb.c projects/bhyve_npt_pmap/sys/netinet/sctp_asconf.c projects/bhyve_npt_pmap/sys/netinet/sctp_input.c projects/bhyve_npt_pmap/sys/netinet/sctp_output.c projects/bhyve_npt_pmap/sys/netinet/tcp_input.c projects/bhyve_npt_pmap/sys/netinet/tcp_syncache.c projects/bhyve_npt_pmap/sys/netinet/tcp_syncache.h projects/bhyve_npt_pmap/sys/netinet/udp_usrreq.c projects/bhyve_npt_pmap/sys/netinet6/in6_pcb.c projects/bhyve_npt_pmap/sys/netinet6/ip6_forward.c projects/bhyve_npt_pmap/sys/netinet6/raw_ip6.c projects/bhyve_npt_pmap/sys/netinet6/udp6_usrreq.c projects/bhyve_npt_pmap/sys/netipsec/ipsec.h projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/main.c projects/bhyve_npt_pmap/sys/ofed/include/linux/sysfs.h projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea64.c projects/bhyve_npt_pmap/sys/powerpc/aim/vm_machdep.c projects/bhyve_npt_pmap/sys/powerpc/booke/vm_machdep.c projects/bhyve_npt_pmap/sys/powerpc/powerpc/uio_machdep.c projects/bhyve_npt_pmap/sys/sparc64/include/ucontext.h projects/bhyve_npt_pmap/sys/sparc64/sparc64/machdep.c projects/bhyve_npt_pmap/sys/sparc64/sparc64/uio_machdep.c projects/bhyve_npt_pmap/sys/sparc64/sparc64/vm_machdep.c projects/bhyve_npt_pmap/sys/sys/eventhandler.h projects/bhyve_npt_pmap/sys/sys/mbuf.h projects/bhyve_npt_pmap/sys/sys/param.h projects/bhyve_npt_pmap/sys/sys/sf_buf.h projects/bhyve_npt_pmap/sys/sys/syscallsubr.h projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_alloc.c projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_snapshot.c projects/bhyve_npt_pmap/sys/ufs/ufs/inode.h projects/bhyve_npt_pmap/sys/vm/swap_pager.c projects/bhyve_npt_pmap/sys/vm/uma_core.c projects/bhyve_npt_pmap/sys/vm/vm_fault.c projects/bhyve_npt_pmap/sys/vm/vm_map.c projects/bhyve_npt_pmap/sys/vm/vm_map.h projects/bhyve_npt_pmap/sys/vm/vm_mmap.c projects/bhyve_npt_pmap/sys/vm/vm_object.c projects/bhyve_npt_pmap/sys/vm/vm_object.h projects/bhyve_npt_pmap/sys/vm/vm_page.c projects/bhyve_npt_pmap/tools/build/mk/OptionalObsoleteFiles.inc projects/bhyve_npt_pmap/tools/build/options/makeman projects/bhyve_npt_pmap/tools/regression/aio/aiop/aiop.c projects/bhyve_npt_pmap/tools/regression/aio/aiotest/aiotest.c projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-fpclassify.c projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-ftw.c projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-wordexp.c projects/bhyve_npt_pmap/tools/regression/priv/Makefile projects/bhyve_npt_pmap/tools/regression/pthread/cv_cancel1/cv_cancel1.c projects/bhyve_npt_pmap/tools/regression/sbin/dhclient/Makefile projects/bhyve_npt_pmap/usr.bin/dtc/fdt.cc projects/bhyve_npt_pmap/usr.bin/fetch/fetch.1 projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c projects/bhyve_npt_pmap/usr.bin/netstat/ipsec.c projects/bhyve_npt_pmap/usr.bin/netstat/main.c projects/bhyve_npt_pmap/usr.bin/netstat/mbuf.c projects/bhyve_npt_pmap/usr.bin/netstat/netstat.1 projects/bhyve_npt_pmap/usr.bin/netstat/netstat.h projects/bhyve_npt_pmap/usr.bin/netstat/route.c projects/bhyve_npt_pmap/usr.bin/systat/Makefile projects/bhyve_npt_pmap/usr.bin/systat/cmdtab.c projects/bhyve_npt_pmap/usr.bin/systat/extern.h projects/bhyve_npt_pmap/usr.bin/systat/systat.1 projects/bhyve_npt_pmap/usr.bin/uniq/uniq.c projects/bhyve_npt_pmap/usr.sbin/bhyve/Makefile projects/bhyve_npt_pmap/usr.sbin/bhyve/bhyverun.c projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_block.c projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_net.c projects/bhyve_npt_pmap/usr.sbin/bhyve/rtc.c projects/bhyve_npt_pmap/usr.sbin/bhyve/virtio.h projects/bhyve_npt_pmap/usr.sbin/bsdconfig/include/messages.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/common.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/cdrom.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/common.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/directory.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/dos.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/floppy.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ftp.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/http.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/httpproxy.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/nfs.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ufs.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/usb.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/packages/packages.subr projects/bhyve_npt_pmap/usr.sbin/bsdinstall/scripts/mirrorselect projects/bhyve_npt_pmap/usr.sbin/nvram/nvram.c projects/bhyve_npt_pmap/usr.sbin/pciconf/cap.c projects/bhyve_npt_pmap/usr.sbin/portsnap/portsnap/portsnap.sh projects/bhyve_npt_pmap/usr.sbin/rtsold/rtsol.c projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_access.c projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_dnslookup.c projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_main.c Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/cddl/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/contrib/binutils/ (props changed) projects/bhyve_npt_pmap/contrib/ipfilter/ (props changed) projects/bhyve_npt_pmap/contrib/libc++/ (props changed) projects/bhyve_npt_pmap/contrib/libcxxrt/ (props changed) projects/bhyve_npt_pmap/contrib/libstdc++/ (props changed) projects/bhyve_npt_pmap/contrib/openbsm/ (props changed) projects/bhyve_npt_pmap/lib/libc/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/boot/ (props changed) projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/sys/contrib/ipfilter/ (props changed) projects/bhyve_npt_pmap/usr.sbin/bhyve/ (props changed) projects/bhyve_npt_pmap/usr.sbin/rtsold/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile.inc1 ============================================================================== --- projects/bhyve_npt_pmap/Makefile.inc1 Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/Makefile.inc1 Wed Aug 21 06:32:32 2013 (r254594) @@ -833,6 +833,18 @@ distributeworld installworld: installche awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} + @# For each file that exists in this dist, print the corresponding + @# line from the METALOG. This relies on the fact that + @# a line containing only the filename will sort immediatly before + @# the relevant mtree line. + cd ${DESTDIR}/${DISTDIR}; \ + find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. endfor +.endif .endif .endif @@ -841,13 +853,29 @@ packageworld: .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug . .endif .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} +. if defined(NO_ROOT) + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + @${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. else + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + usr/lib/debug +. endif +. endfor +.endif + # # reinstall # Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc ============================================================================== --- projects/bhyve_npt_pmap/ObsoleteFiles.inc Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/ObsoleteFiles.inc Wed Aug 21 06:32:32 2013 (r254594) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20130710: libkvm version bump +OLD_LIBS+=lib/libkvm.so.5 +OLD_LIBS+=usr/lib32/libkvm.so.5 # 20130623: dialog update from 1.1 to 1.2 OLD_LIBS+=usr/lib/libdialog.so.7 OLD_LIBS+=usr/lib32/libdialog.so.7 Modified: projects/bhyve_npt_pmap/UPDATING ============================================================================== --- projects/bhyve_npt_pmap/UPDATING Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/UPDATING Wed Aug 21 06:32:32 2013 (r254594) @@ -31,10 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130716: + The default ARM ABI has changed to the ARM EABI. The old ABI is + incompatible with the ARM EABI and all programs and modules will + need to be rebuilt to work with a new kernel. + + To keep using the old ABI ensure the WITHOUT_ARM_EABI knob is set. + + NOTE: Support for the old ABI will be removed in the future and + users are advised to upgrade. + +20130709: + pkg_install has been disconnected from the build if you really need it + you should add WITH_PKGTOOLS in your src.conf(5). + 20130709: Most of network statistics structures were changed to be able keep 64-bits counters. Thus all tools, that work with networking - statistics, must be rebuilded (netstat(1), bsnmpd(1), etc.) + statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.) 20130629: Fix targets that run multiple make's to use && rather than ; Modified: projects/bhyve_npt_pmap/bin/sh/main.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/main.c Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/bin/sh/main.c Wed Aug 21 06:32:32 2013 (r254594) @@ -170,8 +170,8 @@ state3: if (minusc) { evalstring(minusc, sflag ? 0 : EV_EXIT); } +state4: if (sflag || minusc == NULL) { -state4: /* XXX ??? - why isn't this before the "if" statement */ cmdloop(1); } exitshell(exitstatus); Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Aug 21 06:32:32 2013 (r254594) @@ -3997,7 +3997,7 @@ print_dedup_stats(nvlist_t *config) /* * If the pool was faulted then we may not have been able to - * obtain the config. Otherwise, if have anything in the dedup + * obtain the config. Otherwise, if we have anything in the dedup * table continue processing the stats. */ if (nvlist_lookup_uint64_array(config, ZPOOL_CONFIG_DDT_OBJ_STATS, Modified: projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c Wed Aug 21 06:32:32 2013 (r254594) @@ -9103,8 +9103,6 @@ get_note_type (unsigned e_type) return _("NT_FPREGS (floating point registers)"); case NT_PSINFO: return _("NT_PSINFO (psinfo structure)"); - case NT_THRMISC: - return _("NT_THRMISC (thrmisc structure)"); case NT_LWPSTATUS: return _("NT_LWPSTATUS (lwpstatus_t structure)"); case NT_LWPSINFO: @@ -9130,6 +9128,52 @@ get_note_type (unsigned e_type) } static const char * +get_freebsd_note_type (unsigned e_type) +{ + static char buff[64]; + + if (elf_header.e_type == ET_CORE) + switch (e_type) + { + case NT_THRMISC: + return _("NT_THRMISC (thrmisc structure)"); + case NT_PROCSTAT_PROC: + return _("NT_PROCSTAT_PROC (proc data)"); + case NT_PROCSTAT_FILES: + return _("NT_PROCSTAT_FILES (files data)"); + case NT_PROCSTAT_VMMAP: + return _("NT_PROCSTAT_VMMAP (vmmap data)"); + case NT_PROCSTAT_GROUPS: + return _("NT_PROCSTAT_GROUPS (groups data)"); + case NT_PROCSTAT_UMASK: + return _("NT_PROCSTAT_UMASK (umask data)"); + case NT_PROCSTAT_RLIMIT: + return _("NT_PROCSTAT_RLIMIT (rlimit data)"); + case NT_PROCSTAT_OSREL: + return _("NT_PROCSTAT_OSREL (osreldate data)"); + case NT_PROCSTAT_PSSTRINGS: + return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)"); + case NT_PROCSTAT_AUXV: + return _("NT_PROCSTAT_AUXV (auxv data)"); + default: + return get_note_type(e_type); + } + else + switch (e_type) + { + case NT_FREEBSD_ABI_TAG: + return _("NT_FREEBSD_ABI_TAG"); + case NT_FREEBSD_NOINIT_TAG: + return _("NT_FREEBSD_NOINIT_TAG"); + default: + break; + } + + snprintf (buff, sizeof(buff), _("Unknown note type: (0x%08x)"), e_type); + return buff; +} + +static const char * get_netbsd_elfcore_note_type (unsigned e_type) { static char buff[64]; @@ -9206,6 +9250,10 @@ process_note (Elf_Internal_Note *pnote) note type strings. */ nt = get_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "FreeBSD")) + /* FreeBSD-specific core file notes. */ + nt = get_freebsd_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "NetBSD-CORE")) /* NetBSD-specific core file notes. */ nt = get_netbsd_elfcore_note_type (pnote->type); @@ -9215,7 +9263,7 @@ process_note (Elf_Internal_Note *pnote) note type strings. */ nt = get_note_type (pnote->type); - printf (" %s\t\t0x%08lx\t%s\n", + printf (" %-13s 0x%08lx\t%s\n", pnote->namesz ? pnote->namedata : "(NONE)", pnote->descsz, nt); return 1; Modified: projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h Wed Aug 21 06:32:32 2013 (r254594) @@ -388,7 +388,6 @@ #define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ #define NT_TASKSTRUCT 4 /* Contains copy of task struct */ #define NT_AUXV 6 /* Contains copy of Elfxx_auxv_t */ -#define NT_THRMISC 7 /* Contains copy of thrmisc struct */ #define NT_PRXFPREG 0x46e62b7f /* Contains a user_xfpregs_struct; */ /* note name must be "LINUX". */ @@ -401,6 +400,19 @@ #define NT_LWPSINFO 17 /* Has a struct lwpsinfo_t */ #define NT_WIN32PSTATUS 18 /* Has a struct win32_pstatus */ +/* Note segments for core files on FreeBSD systems. Note name + must start with "FreeBSD". */ +#define NT_THRMISC 7 /* Contains copy of thrmisc struct */ +#define NT_PROCSTAT_PROC 8 +#define NT_PROCSTAT_FILES 9 +#define NT_PROCSTAT_VMMAP 10 +#define NT_PROCSTAT_GROUPS 11 +#define NT_PROCSTAT_UMASK 12 +#define NT_PROCSTAT_RLIMIT 13 +#define NT_PROCSTAT_OSREL 14 +#define NT_PROCSTAT_PSSTRINGS 15 +#define NT_PROCSTAT_AUXV 16 + /* Note segments for core files on NetBSD systems. Note name must start with "NetBSD-CORE". */ Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference Wed Aug 21 06:32:32 2013 (r254594) @@ -333,7 +333,7 @@ __fill_n_false(__bit_iterator<_Cp, false } // do middle whole words __storage_type __nw = __n / __bits_per_word; - _VSTD::memset(__first.__seg_, 0, __nw * sizeof(__storage_type)); + _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), 0, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last partial word if (__n > 0) @@ -363,7 +363,7 @@ __fill_n_true(__bit_iterator<_Cp, false> } // do middle whole words __storage_type __nw = __n / __bits_per_word; - _VSTD::memset(__first.__seg_, -1, __nw * sizeof(__storage_type)); + _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), -1, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last partial word if (__n > 0) @@ -430,7 +430,9 @@ __copy_aligned(__bit_iterator<_Cp, _IsCo // __first.__ctz_ == 0; // do middle words __storage_type __nw = __n / __bits_per_word; - _VSTD::memmove(__result.__seg_, __first.__seg_, __nw * sizeof(__storage_type)); + _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_), + _VSTD::__to_raw_pointer(__first.__seg_), + __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; __result.__seg_ += __nw; // do last word @@ -569,7 +571,9 @@ __copy_backward_aligned(__bit_iterator<_ __storage_type __nw = __n / __bits_per_word; __result.__seg_ -= __nw; __last.__seg_ -= __nw; - _VSTD::memmove(__result.__seg_, __last.__seg_, __nw * sizeof(__storage_type)); + _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_), + _VSTD::__to_raw_pointer(__last.__seg_), + __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last word if (__n > 0) @@ -870,6 +874,7 @@ struct __bit_array { typedef typename _Cp::difference_type difference_type; typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::__storage_pointer __storage_pointer; typedef typename _Cp::iterator iterator; static const unsigned __bits_per_word = _Cp::__bits_per_word; static const unsigned _Np = 4; @@ -880,9 +885,15 @@ struct __bit_array _LIBCPP_INLINE_VISIBILITY static difference_type capacity() {return static_cast<difference_type>(_Np * __bits_per_word);} _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {} - _LIBCPP_INLINE_VISIBILITY iterator begin() {return iterator(__word_, 0);} - _LIBCPP_INLINE_VISIBILITY iterator end() {return iterator(__word_ + __size_ / __bits_per_word, - static_cast<unsigned>(__size_ % __bits_per_word));} + _LIBCPP_INLINE_VISIBILITY iterator begin() + { + return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]), 0); + } + _LIBCPP_INLINE_VISIBILITY iterator end() + { + return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]) + __size_ / __bits_per_word, + static_cast<unsigned>(__size_ % __bits_per_word)); + } }; template <class _Cp> Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__config ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__config Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__config Wed Aug 21 06:32:32 2013 (r254594) @@ -56,6 +56,18 @@ # endif // __LONG_LONG_SUPPORTED #endif // __FreeBSD__ +#ifdef __NetBSD__ +# include <sys/endian.h> +# if _BYTE_ORDER == _LITTLE_ENDIAN +# define _LIBCPP_LITTLE_ENDIAN 1 +# define _LIBCPP_BIG_ENDIAN 0 +# else // _BYTE_ORDER == _LITTLE_ENDIAN +# define _LIBCPP_LITTLE_ENDIAN 0 +# define _LIBCPP_BIG_ENDIAN 1 +# endif // _BYTE_ORDER == _LITTLE_ENDIAN +# define _LIBCPP_HAS_QUICK_EXIT +#endif // __NetBSD__ + #ifdef _WIN32 # define _LIBCPP_LITTLE_ENDIAN 1 # define _LIBCPP_BIG_ENDIAN 0 @@ -135,6 +147,10 @@ #endif // _WIN32 +#ifndef __has_attribute +#define __has_attribute(__x) 0 +#endif + #ifndef _LIBCPP_HIDDEN #define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden"))) #endif @@ -212,7 +228,9 @@ typedef __char32_t char32_t; # define _LIBCPP_NORETURN __attribute__ ((noreturn)) #endif +#if !(__has_feature(cxx_defaulted_functions)) #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS +#endif // !(__has_feature(cxx_defaulted_functions)) #if !(__has_feature(cxx_deleted_functions)) #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS @@ -272,10 +290,20 @@ typedef __char32_t char32_t; #define _LIBCPP_HAS_NO_CONSTEXPR #endif -#if defined(__FreeBSD__) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L) +#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L +#if defined(__FreeBSD__) +#define _LIBCPP_HAS_QUICK_EXIT +#define _LIBCPP_HAS_C11_FEATURES +#elif defined(__linux__) +#include <features.h> +#if __GLIBC_PREREQ(2, 15) #define _LIBCPP_HAS_QUICK_EXIT +#endif +#if __GLIBC_PREREQ(2, 17) #define _LIBCPP_HAS_C11_FEATURES #endif +#endif +#endif #if (__has_feature(cxx_noexcept)) # define _NOEXCEPT noexcept @@ -418,8 +446,14 @@ template <unsigned> struct __static_asse #define _LIBCPP_CONSTEXPR constexpr #endif +#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS +#define _LIBCPP_DEFAULT {} +#else +#define _LIBCPP_DEFAULT = default; +#endif + #ifdef __GNUC__ -#define _NOALIAS __attribute__((malloc)) +#define _NOALIAS __attribute__((__malloc__)) #else #define _NOALIAS #endif @@ -451,7 +485,7 @@ template <unsigned> struct __static_asse #define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; #endif -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) || defined(__NetBSD__) #define _LIBCPP_LOCALE__L_EXTENSIONS 1 #endif #ifdef __FreeBSD__ @@ -476,6 +510,14 @@ template <unsigned> struct __static_asse # endif #endif +#ifndef _LIBCPP_STD_VER +# if __cplusplus <= 201103L +# define _LIBCPP_STD_VER 11 +# else +# define _LIBCPP_STD_VER 13 // current year, or date of c++14 ratification +# endif +#endif // _LIBCPP_STD_VER + #ifdef _LIBCPP_DEBUG2 # include <__debug> #else Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base Wed Aug 21 06:32:32 2013 (r254594) @@ -292,7 +292,8 @@ struct __weak_result_type<_Rp (_Cp::*)(_ // bullets 1 and 2 -template <class _Fp, class _A0, class ..._Args> +template <class _Fp, class _A0, class ..._Args, + class> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args) @@ -301,7 +302,8 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& return (_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...); } -template <class _Fp, class _A0, class ..._Args> +template <class _Fp, class _A0, class ..._Args, + class> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args) @@ -312,7 +314,8 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& // bullets 3 and 4 -template <class _Fp, class _A0> +template <class _Fp, class _A0, + class> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_Fp&& __f, _A0&& __a0) @@ -321,7 +324,8 @@ __invoke(_Fp&& __f, _A0&& __a0) return _VSTD::forward<_A0>(__a0).*__f; } -template <class _Fp, class _A0> +template <class _Fp, class _A0, + class> inline _LIBCPP_INLINE_VISIBILITY auto __invoke(_Fp&& __f, _A0&& __a0) Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table Wed Aug 21 06:32:32 2013 (r254594) @@ -33,7 +33,6 @@ template <class _NodePtr> struct __hash_node_base { typedef __hash_node_base __first_node; - // typedef _NodePtr pointer; _NodePtr __next_; @@ -111,7 +110,7 @@ public: _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __node_->__value_;} _LIBCPP_INLINE_VISIBILITY - pointer operator->() const {return _VSTD::addressof(__node_->__value_);} + pointer operator->() const {return pointer_traits<pointer>::pointer_to(__node_->__value_);} _LIBCPP_INLINE_VISIBILITY __hash_iterator& operator++() @@ -189,7 +188,7 @@ public: _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __node_->__value_;} _LIBCPP_INLINE_VISIBILITY - pointer operator->() const {return _VSTD::addressof(__node_->__value_);} + pointer operator->() const {return pointer_traits<pointer>::pointer_to(__node_->__value_);} _LIBCPP_INLINE_VISIBILITY __hash_const_iterator& operator++() @@ -255,7 +254,7 @@ public: _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __node_->__value_;} _LIBCPP_INLINE_VISIBILITY - pointer operator->() const {return &__node_->__value_;} + pointer operator->() const {return pointer_traits<pointer>::pointer_to(__node_->__value_);} _LIBCPP_INLINE_VISIBILITY __hash_local_iterator& operator++() @@ -345,7 +344,7 @@ public: _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __node_->__value_;} _LIBCPP_INLINE_VISIBILITY - pointer operator->() const {return &__node_->__value_;} + pointer operator->() const {return pointer_traits<pointer>::pointer_to(__node_->__value_);} _LIBCPP_INLINE_VISIBILITY __hash_const_local_iterator& operator++() @@ -505,8 +504,15 @@ public: __node_allocator; typedef allocator_traits<__node_allocator> __node_traits; typedef typename __node_traits::pointer __node_pointer; - typedef typename __node_traits::const_pointer __node_const_pointer; + typedef typename __node_traits::pointer __node_const_pointer; typedef __hash_node_base<__node_pointer> __first_node; + typedef typename pointer_traits<__node_pointer>::template +#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES + rebind<__first_node> +#else + rebind<__first_node>::other +#endif + __node_base_pointer; private: @@ -558,9 +564,9 @@ public: public: typedef __hash_iterator<__node_pointer> iterator; - typedef __hash_const_iterator<__node_const_pointer> const_iterator; + typedef __hash_const_iterator<__node_pointer> const_iterator; typedef __hash_local_iterator<__node_pointer> local_iterator; - typedef __hash_const_local_iterator<__node_const_pointer> const_local_iterator; + typedef __hash_const_local_iterator<__node_pointer> const_local_iterator; __hash_table() _NOEXCEPT_( @@ -706,7 +712,7 @@ public: _LIBCPP_INLINE_VISIBILITY size_type max_bucket_count() const _NOEXCEPT - {return __bucket_list_.get_deleter().__alloc().max_size();} + {return __pointer_alloc_traits::max_size(__bucket_list_.get_deleter().__alloc());} size_type bucket_size(size_type __n) const; _LIBCPP_INLINE_VISIBILITY float load_factor() const _NOEXCEPT { @@ -807,6 +813,9 @@ private: void __deallocate(__node_pointer __np) _NOEXCEPT; __node_pointer __detach() _NOEXCEPT; + + template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_map; + template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_multimap; }; template <class _Tp, class _Hash, class _Equal, class _Alloc> @@ -893,7 +902,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> if (size() > 0) { __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] = - static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); __u.__p1_.first().__next_ = nullptr; __u.size() = 0; } @@ -917,7 +926,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> __p1_.first().__next_ = __u.__p1_.first().__next_; __u.__p1_.first().__next_ = nullptr; __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] = - static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); size() = __u.size(); __u.size() = 0; } @@ -1014,7 +1023,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> if (size() > 0) { __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] = - static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); __u.__p1_.first().__next_ = nullptr; __u.size() = 0; } @@ -1236,7 +1245,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> __node_pointer __pn = __bucket_list_[__chash]; if (__pn == nullptr) { - __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); __nd->__next_ = __pn->__next_; __pn->__next_ = __nd; // fix up __bucket_list_ @@ -1274,7 +1283,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> __node_pointer __pn = __bucket_list_[__chash]; if (__pn == nullptr) { - __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); __cp->__next_ = __pn->__next_; __pn->__next_ = __cp; // fix up __bucket_list_ @@ -1322,7 +1331,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> { if (__p != end() && key_eq()(*__p, __cp->__value_)) { - __node_pointer __np = const_cast<__node_pointer>(__p.__node_); + __node_pointer __np = __p.__node_; __cp->__hash_ = __np->__hash_; size_type __bc = bucket_count(); if (size()+1 > __bc * max_load_factor() || __bc == 0) @@ -1380,7 +1389,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> __node_pointer __pn = __bucket_list_[__chash]; if (__pn == nullptr) { - __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); __h->__next_ = __pn->__next_; __pn->__next_ = __h.get(); // fix up __bucket_list_ @@ -1542,7 +1551,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> { for (size_type __i = 0; __i < __nbc; ++__i) __bucket_list_[__i] = nullptr; - __node_pointer __pp(static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()))); + __node_pointer __pp(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()))); __node_pointer __cp = __pp->__next_; if (__cp != nullptr) { @@ -1700,7 +1709,7 @@ template <class _Tp, class _Hash, class typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator __hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __p) { - __node_pointer __np = const_cast<__node_pointer>(__p.__node_); + __node_pointer __np = __p.__node_; iterator __r(__np); ++__r; remove(__p); @@ -1717,7 +1726,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> ++__first; erase(__p); } - __node_pointer __np = const_cast<__node_pointer>(__last.__node_); + __node_pointer __np = __last.__node_; return iterator (__np); } @@ -1757,7 +1766,7 @@ typename __hash_table<_Tp, _Hash, _Equal __hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT { // current node - __node_pointer __cn = const_cast<__node_pointer>(__p.__node_); + __node_pointer __cn = __p.__node_; size_type __bc = bucket_count(); size_t __chash = __constrain_hash(__cn->__hash_, __bc); // find previous node @@ -1767,7 +1776,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> // Fix up __bucket_list_ // if __pn is not in same bucket (before begin is not in same bucket) && // if __cn->__next_ is not in same bucket (nullptr is not in same bucket) - if (__pn == _VSTD::addressof(__p1_.first()) || __constrain_hash(__pn->__hash_, __bc) != __chash) + if (__pn == static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())) + || __constrain_hash(__pn->__hash_, __bc) != __chash) { if (__cn->__next_ == nullptr || __constrain_hash(__cn->__next_->__hash_, __bc) != __chash) __bucket_list_[__chash] = nullptr; @@ -1907,10 +1917,10 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc> __p3_.swap(__u.__p3_); if (size() > 0) __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] = - static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())); + static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())); if (__u.size() > 0) __u.__bucket_list_[__constrain_hash(__u.__p1_.first().__next_->__hash_, __u.bucket_count())] = - static_cast<__node_pointer>(_VSTD::addressof(__u.__p1_.first())); + static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__u.__p1_.first())); } template <class _Tp, class _Hash, class _Equal, class _Alloc> Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__locale ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__locale Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__locale Wed Aug 21 06:32:32 2013 (r254594) @@ -339,12 +339,12 @@ public: static const mask punct = _PUNCT; static const mask xdigit = _HEX; static const mask blank = _BLANK; -#elif (defined(__APPLE__) || defined(__FreeBSD__)) || defined(EMSCRIPTEN) +#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(EMSCRIPTEN) || defined(__NetBSD__) #ifdef __APPLE__ typedef __uint32_t mask; #elif defined(__FreeBSD__) typedef unsigned long mask; -#elif defined(EMSCRIPTEN) +#elif defined(EMSCRIPTEN) || defined(__NetBSD__) typedef unsigned short mask; #endif static const mask space = _CTYPE_S; @@ -356,7 +356,11 @@ public: static const mask digit = _CTYPE_D; static const mask punct = _CTYPE_P; static const mask xdigit = _CTYPE_X; +# if defined(__NetBSD__) + static const mask blank = _CTYPE_BL; +# else static const mask blank = _CTYPE_B; +# endif #elif defined(__sun__) typedef unsigned int mask; static const mask space = _ISSPACE; @@ -596,6 +600,10 @@ public: static const int* __classic_upper_table() _NOEXCEPT; static const int* __classic_lower_table() _NOEXCEPT; #endif +#if defined(__NetBSD__) + static const short* __classic_upper_table() _NOEXCEPT; + static const short* __classic_lower_table() _NOEXCEPT; +#endif protected: ~ctype(); Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer Wed Aug 21 06:32:32 2013 (r254594) @@ -290,7 +290,7 @@ void __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type) { while (__begin_ != __new_begin) - __alloc_traits::destroy(__alloc(), __begin_++); + __alloc_traits::destroy(__alloc(), __to_raw_pointer(__begin_++)); } template <class _Tp, class _Allocator> @@ -307,7 +307,7 @@ void __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT { while (__new_last != __end_) - __alloc_traits::destroy(__alloc(), --__end_); + __alloc_traits::destroy(__alloc(), __to_raw_pointer(--__end_)); } template <class _Tp, class _Allocator> @@ -320,7 +320,7 @@ __split_buffer<_Tp, _Allocator>::__destr template <class _Tp, class _Allocator> __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __start, __alloc_rr& __a) - : __end_cap_(0, __a) + : __end_cap_(nullptr, __a) { __first_ = __cap != 0 ? __alloc_traits::allocate(__alloc(), __cap) : nullptr; __begin_ = __end_ = __first_ + __start; @@ -331,21 +331,21 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline __split_buffer<_Tp, _Allocator>::__split_buffer() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) - : __first_(0), __begin_(0), __end_(0), __end_cap_(0) + : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr) { } template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline __split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a) - : __first_(0), __begin_(0), __end_(0), __end_cap_(0, __a) + : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a) { } template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline __split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a) - : __first_(0), __begin_(0), __end_(0), __end_cap_(0, __a) + : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a) { } Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream Wed Aug 21 06:32:32 2013 (r254594) @@ -55,6 +55,8 @@ private: const codecvt<char_type, char, state_type>* __cv_; state_type* __st_; int __encoding_; + int_type __last_consumed_; + bool __last_consumed_is_next_; bool __always_noconv_; __stdinbuf(const __stdinbuf&); @@ -66,7 +68,9 @@ private: template <class _CharT> __stdinbuf<_CharT>::__stdinbuf(FILE* __fp, state_type* __st) : __file_(__fp), - __st_(__st) + __st_(__st), + __last_consumed_(traits_type::eof()), + __last_consumed_is_next_(false) { imbue(this->getloc()); } @@ -100,6 +104,16 @@ template <class _CharT> typename __stdinbuf<_CharT>::int_type __stdinbuf<_CharT>::__getchar(bool __consume) { + if (__last_consumed_is_next_) + { + int_type __result = __last_consumed_; + if (__consume) + { + __last_consumed_ = traits_type::eof(); + __last_consumed_is_next_ = false; + } + return __result; + } char __extbuf[__limit]; int __nread = _VSTD::max(1, __encoding_); for (int __i = 0; __i < __nread; ++__i) @@ -154,6 +168,8 @@ __stdinbuf<_CharT>::__getchar(bool __con return traits_type::eof(); } } + else + __last_consumed_ = traits_type::to_int_type(__1buf); return traits_type::to_int_type(__1buf); } @@ -162,28 +178,41 @@ typename __stdinbuf<_CharT>::int_type __stdinbuf<_CharT>::pbackfail(int_type __c) { if (traits_type::eq_int_type(__c, traits_type::eof())) - return __c; - char __extbuf[__limit]; - char* __enxt; - const char_type __ci = traits_type::to_char_type(__c); - const char_type* __inxt; - switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt, - __extbuf, __extbuf + sizeof(__extbuf), __enxt)) { - case _VSTD::codecvt_base::ok: - break; - case _VSTD::codecvt_base::noconv: - __extbuf[0] = static_cast<char>(__c); - __enxt = __extbuf + 1; - break; - case codecvt_base::partial: - case codecvt_base::error: - return traits_type::eof(); + if (!__last_consumed_is_next_) + { + __c = __last_consumed_; + __last_consumed_is_next_ = !traits_type::eq_int_type(__last_consumed_, + traits_type::eof()); + } + return __c; } - while (__enxt > __extbuf) - if (ungetc(*--__enxt, __file_) == EOF) + if (__last_consumed_is_next_) + { + char __extbuf[__limit]; + char* __enxt; + const char_type __ci = traits_type::to_char_type(__last_consumed_); + const char_type* __inxt; + switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt, + __extbuf, __extbuf + sizeof(__extbuf), __enxt)) + { + case _VSTD::codecvt_base::ok: + break; + case _VSTD::codecvt_base::noconv: + __extbuf[0] = static_cast<char>(__last_consumed_); + __enxt = __extbuf + 1; + break; + case codecvt_base::partial: + case codecvt_base::error: return traits_type::eof(); - return traits_type::not_eof(__c); + } + while (__enxt > __extbuf) + if (ungetc(*--__enxt, __file_) == EOF) + return traits_type::eof(); + } + __last_consumed_ = __c; + __last_consumed_is_next_ = true; + return __c; } // __stdoutbuf @@ -234,30 +263,31 @@ __stdoutbuf<_CharT>::overflow(int_type _ char_type __1buf; if (!traits_type::eq_int_type(__c, traits_type::eof())) { - this->setp(&__1buf, &__1buf+1); - *this->pptr() = traits_type::to_char_type(__c); - this->pbump(1); + __1buf = traits_type::to_char_type(__c); if (__always_noconv_) { - if (fwrite(this->pbase(), sizeof(char_type), 1, __file_) != 1) + if (fwrite(&__1buf, sizeof(char_type), 1, __file_) != 1) return traits_type::eof(); } else { char* __extbe = __extbuf; codecvt_base::result __r; + char_type* pbase = &__1buf; + char_type* pptr = pbase + 1; + char_type* epptr = pptr; do { const char_type* __e; - __r = __cv_->out(*__st_, this->pbase(), this->pptr(), __e, + __r = __cv_->out(*__st_, pbase, pptr, __e, __extbuf, __extbuf + sizeof(__extbuf), __extbe); - if (__e == this->pbase()) + if (__e == pbase) return traits_type::eof(); if (__r == codecvt_base::noconv) { - if (fwrite(this->pbase(), 1, 1, __file_) != 1) + if (fwrite(pbase, 1, 1, __file_) != 1) return traits_type::eof(); } else if (__r == codecvt_base::ok || __r == codecvt_base::partial) @@ -267,15 +297,13 @@ __stdoutbuf<_CharT>::overflow(int_type _ return traits_type::eof(); if (__r == codecvt_base::partial) { - this->setp((char_type*)__e, this->pptr()); - this->pbump(static_cast<int>(this->epptr() - this->pbase())); + pbase = (char_type*)__e; } } else return traits_type::eof(); } while (__r == codecvt_base::partial); } - this->setp(0, 0); } return traits_type::not_eof(__c); } Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__tree ============================================================================== --- projects/bhyve_npt_pmap/contrib/libc++/include/__tree Wed Aug 21 04:49:58 2013 (r254593) +++ projects/bhyve_npt_pmap/contrib/libc++/include/__tree Wed Aug 21 06:32:32 2013 (r254594) @@ -644,7 +644,8 @@ public: _LIBCPP_INLINE_VISIBILITY __tree_iterator() _NOEXCEPT {} _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;} - _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return &__ptr_->__value_;} + _LIBCPP_INLINE_VISIBILITY pointer operator->() const + {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);} _LIBCPP_INLINE_VISIBILITY __tree_iterator& operator++() @@ -686,7 +687,7 @@ class _LIBCPP_TYPE_VIS __tree_const_iter { typedef _ConstNodePtr __node_pointer; typedef typename pointer_traits<__node_pointer>::element_type __node; - typedef const typename __node::base __node_base; + typedef typename __node::base __node_base; typedef typename pointer_traits<__node_pointer>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind<__node_base> @@ -729,7 +730,8 @@ public: : __ptr_(__p.__ptr_) {} _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;} - _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return &__ptr_->__value_;} + _LIBCPP_INLINE_VISIBILITY pointer operator->() const + {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);} _LIBCPP_INLINE_VISIBILITY __tree_const_iterator& operator++() @@ -779,8 +781,10 @@ public: typedef typename __alloc_traits::size_type size_type; typedef typename __alloc_traits::difference_type difference_type; - typedef __tree_node<value_type, typename __alloc_traits::void_pointer> __node; - typedef __tree_node_base<typename __alloc_traits::void_pointer> __node_base; + typedef typename __alloc_traits::void_pointer __void_pointer; + + typedef __tree_node<value_type, __void_pointer> __node; + typedef __tree_node_base<__void_pointer> __node_base; typedef typename __alloc_traits::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__node> @@ -790,9 +794,9 @@ public: __node_allocator; typedef allocator_traits<__node_allocator> __node_traits; typedef typename __node_traits::pointer __node_pointer; - typedef typename __node_traits::const_pointer __node_const_pointer; + typedef typename __node_traits::pointer __node_const_pointer; typedef typename __node_base::pointer __node_base_pointer; - typedef typename __node_base::const_pointer __node_base_const_pointer; + typedef typename __node_base::pointer __node_base_const_pointer; private: typedef typename __node_base::base __end_node_t; typedef typename pointer_traits<__node_pointer>::template @@ -804,9 +808,9 @@ private: __end_node_ptr; typedef typename pointer_traits<__node_pointer>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES - rebind<const __end_node_t> + rebind<__end_node_t> #else - rebind<const __end_node_t>::other + rebind<__end_node_t>::other #endif __end_node_const_ptr; @@ -828,7 +832,7 @@ public: { return static_cast<__node_const_pointer> ( - pointer_traits<__end_node_const_ptr>::pointer_to(__pair1_.first()) + pointer_traits<__end_node_const_ptr>::pointer_to(const_cast<__end_node_t&>(__pair1_.first())) ); } _LIBCPP_INLINE_VISIBILITY @@ -865,7 +869,7 @@ public: {return static_cast<__node_const_pointer>(__end_node()->__left_);} typedef __tree_iterator<value_type, __node_pointer, difference_type> iterator; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308210632.r7L6WXHA021242>