Date: Tue, 24 Dec 2013 15:44:11 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259824 - in user/ae/inet6: . bin bin/date bin/date/tests bin/mv bin/mv/tests bin/pax bin/pax/tests bin/sh bin/sh/tests bin/test bin/test/tests bin/tests cddl/contrib/opensolaris/cmd/zd... Message-ID: <201312241544.rBOFiBDo052333@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Tue Dec 24 15:44:09 2013 New Revision: 259824 URL: http://svnweb.freebsd.org/changeset/base/259824 Log: Merge from head/. Added: user/ae/inet6/bin/date/tests/ - copied from r259823, head/bin/date/tests/ user/ae/inet6/bin/mv/tests/ - copied from r259823, head/bin/mv/tests/ user/ae/inet6/bin/pax/tests/ - copied from r259823, head/bin/pax/tests/ user/ae/inet6/bin/sh/tests/ - copied from r259823, head/bin/sh/tests/ user/ae/inet6/bin/test/tests/ - copied from r259823, head/bin/test/tests/ user/ae/inet6/bin/tests/ - copied from r259823, head/bin/tests/ user/ae/inet6/contrib/gcclibs/libcpp/ChangeLog.apple - copied unchanged from r259823, head/contrib/gcclibs/libcpp/ChangeLog.apple user/ae/inet6/etc/rc.d/casperd - copied unchanged from r259823, head/etc/rc.d/casperd user/ae/inet6/lib/clang/include/PPCGenAsmMatcher.inc - copied unchanged from r259823, head/lib/clang/include/PPCGenAsmMatcher.inc user/ae/inet6/lib/clang/libllvmpowerpcasmparser/ - copied from r259823, head/lib/clang/libllvmpowerpcasmparser/ user/ae/inet6/release/scripts/FreeBSD_install_cdrom.conf - copied unchanged from r259823, head/release/scripts/FreeBSD_install_cdrom.conf user/ae/inet6/share/mk/tap.test.mk - copied unchanged from r259823, head/share/mk/tap.test.mk user/ae/inet6/sys/arm/broadcom/bcm2835/bcm2835_fbd.c - copied unchanged from r259823, head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c user/ae/inet6/sys/arm/freescale/imx/imx51_ipuv3_fbd.c - copied unchanged from r259823, head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c user/ae/inet6/sys/boot/fdt/dts/beri-netfpga.dts - copied unchanged from r259823, head/sys/boot/fdt/dts/beri-netfpga.dts user/ae/inet6/sys/dev/netmap/netmap_freebsd.c - copied unchanged from r259823, head/sys/dev/netmap/netmap_freebsd.c user/ae/inet6/sys/dev/netmap/netmap_generic.c - copied unchanged from r259823, head/sys/dev/netmap/netmap_generic.c user/ae/inet6/sys/dev/netmap/netmap_mbq.c - copied unchanged from r259823, head/sys/dev/netmap/netmap_mbq.c user/ae/inet6/sys/dev/netmap/netmap_mbq.h - copied unchanged from r259823, head/sys/dev/netmap/netmap_mbq.h user/ae/inet6/sys/dev/netmap/netmap_vale.c - copied unchanged from r259823, head/sys/dev/netmap/netmap_vale.c user/ae/inet6/sys/mips/conf/BERI_NETFPGA_MDROOT - copied unchanged from r259823, head/sys/mips/conf/BERI_NETFPGA_MDROOT user/ae/inet6/sys/powerpc/cpufreq/pmufreq.c - copied unchanged from r259823, head/sys/powerpc/cpufreq/pmufreq.c user/ae/inet6/usr.sbin/bhyve/bhyve.8 - copied unchanged from r259823, head/usr.sbin/bhyve/bhyve.8 Deleted: user/ae/inet6/sys/i386/i386/symbols.raw user/ae/inet6/tools/regression/bin/ Modified: user/ae/inet6/ObsoleteFiles.inc user/ae/inet6/UPDATING user/ae/inet6/bin/Makefile user/ae/inet6/bin/date/Makefile user/ae/inet6/bin/mv/Makefile user/ae/inet6/bin/pax/Makefile user/ae/inet6/bin/pax/pax.1 user/ae/inet6/bin/sh/Makefile user/ae/inet6/bin/test/Makefile user/ae/inet6/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/ae/inet6/cddl/contrib/opensolaris/cmd/zhack/zhack.c user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/ae/inet6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/ae/inet6/contrib/file/compress.c user/ae/inet6/contrib/gcc/ChangeLog.gcc43 user/ae/inet6/contrib/gcc/c-common.c user/ae/inet6/contrib/gcc/c-convert.c user/ae/inet6/contrib/gcc/c-incpath.c user/ae/inet6/contrib/gcc/c-opts.c user/ae/inet6/contrib/gcc/c-typeck.c user/ae/inet6/contrib/gcc/c.opt user/ae/inet6/contrib/gcc/calls.c user/ae/inet6/contrib/gcc/cfg.c user/ae/inet6/contrib/gcc/collect2.c user/ae/inet6/contrib/gcc/config/darwin.h user/ae/inet6/contrib/gcc/config/rs6000/rs6000.c user/ae/inet6/contrib/gcc/cp/ChangeLog.gcc43 user/ae/inet6/contrib/gcc/cp/Make-lang.in user/ae/inet6/contrib/gcc/cp/cvt.c user/ae/inet6/contrib/gcc/cp/decl.c user/ae/inet6/contrib/gcc/cp/mangle.c user/ae/inet6/contrib/gcc/cp/method.c user/ae/inet6/contrib/gcc/cp/parser.c user/ae/inet6/contrib/gcc/cp/pt.c user/ae/inet6/contrib/gcc/cp/rtti.c user/ae/inet6/contrib/gcc/cp/typeck.c user/ae/inet6/contrib/gcc/doc/cppopts.texi user/ae/inet6/contrib/gcc/doc/invoke.texi user/ae/inet6/contrib/gcc/doc/tm.texi user/ae/inet6/contrib/gcc/dwarf2out.c user/ae/inet6/contrib/gcc/fold-const.c user/ae/inet6/contrib/gcc/gcc.c user/ae/inet6/contrib/gcc/gcov.c user/ae/inet6/contrib/gcc/sched-vis.c user/ae/inet6/contrib/gcc/target-def.h user/ae/inet6/contrib/gcc/target.h user/ae/inet6/contrib/gcc/tlink.c user/ae/inet6/contrib/gcc/tree-dump.c user/ae/inet6/contrib/gcc/version.c user/ae/inet6/contrib/gcclibs/libcpp/charset.c user/ae/inet6/contrib/gcclibs/libcpp/include/cpplib.h user/ae/inet6/contrib/gcclibs/libcpp/init.c user/ae/inet6/contrib/gcclibs/libcpp/lex.c user/ae/inet6/contrib/gperf/lib/getline.cc user/ae/inet6/contrib/llvm/tools/clang/lib/Headers/cpuid.h user/ae/inet6/contrib/tcpdump/addrtoname.c user/ae/inet6/contrib/tcpdump/tcpdump.c user/ae/inet6/contrib/tzcode/stdtime/tzfile.5 user/ae/inet6/contrib/tzdata/asia user/ae/inet6/contrib/tzdata/northamerica user/ae/inet6/crypto/heimdal/lib/gssapi/krb5/prf.c user/ae/inet6/etc/defaults/rc.conf user/ae/inet6/etc/mtree/BSD.tests.dist user/ae/inet6/etc/rc.d/Makefile user/ae/inet6/etc/syslog.conf user/ae/inet6/games/fortune/datfiles/fortunes user/ae/inet6/gnu/lib/csu/Makefile user/ae/inet6/gnu/lib/libgcc/Makefile user/ae/inet6/gnu/lib/libstdc++/Makefile user/ae/inet6/gnu/lib/libsupc++/Makefile user/ae/inet6/kerberos5/lib/Makefile user/ae/inet6/kerberos5/lib/libkafs5/Makefile user/ae/inet6/lib/atf/libatf-c/tests/Makefile user/ae/inet6/lib/clang/Makefile user/ae/inet6/lib/clang/include/llvm/Config/AsmParsers.def user/ae/inet6/lib/libc/stdlib/getopt_long.3 user/ae/inet6/lib/libc/sys/shm_open.2 user/ae/inet6/lib/libcam/Makefile user/ae/inet6/lib/libnv/msgio.c user/ae/inet6/lib/libnv/msgio.h user/ae/inet6/lib/libnv/nvlist.c user/ae/inet6/lib/libstand/close.c user/ae/inet6/lib/libstand/dosfs.c user/ae/inet6/lib/libstand/dosfs.h user/ae/inet6/lib/libstand/environment.c user/ae/inet6/lib/libvmmapi/vmmapi.c user/ae/inet6/lib/libvmmapi/vmmapi.h user/ae/inet6/release/Makefile user/ae/inet6/release/doc/Makefile user/ae/inet6/release/doc/en_US.ISO8859-1/relnotes/article.xml user/ae/inet6/release/doc/share/xml/release.ent user/ae/inet6/release/picobsd/build/picobsd user/ae/inet6/release/rc.local user/ae/inet6/release/scripts/pkg-stage.sh user/ae/inet6/sbin/casperd/zygote.c user/ae/inet6/sbin/devd/devd.cc user/ae/inet6/sbin/growfs/growfs.8 user/ae/inet6/sbin/hastd/hastd.c user/ae/inet6/sbin/hastd/nv.c user/ae/inet6/sbin/hastd/primary.c user/ae/inet6/sbin/hastd/proto.c user/ae/inet6/sbin/hastd/secondary.c user/ae/inet6/sbin/ipfw/ipfw.8 user/ae/inet6/sbin/iscontrol/iscsi.conf.5 user/ae/inet6/sbin/swapon/swapon.c user/ae/inet6/share/man/man4/arcmsr.4 user/ae/inet6/share/man/man4/cxgbe.4 user/ae/inet6/share/man/man4/netmap.4 user/ae/inet6/share/man/man9/Makefile user/ae/inet6/share/man/man9/mbuf.9 user/ae/inet6/share/misc/committers-ports.dot user/ae/inet6/share/misc/committers-src.dot user/ae/inet6/share/mk/Makefile user/ae/inet6/share/mk/bsd.own.mk user/ae/inet6/share/mk/bsd.progs.mk user/ae/inet6/share/mk/bsd.sys.mk user/ae/inet6/sys/amd64/amd64/machdep.c user/ae/inet6/sys/amd64/amd64/mp_machdep.c user/ae/inet6/sys/amd64/amd64/pmap.c user/ae/inet6/sys/amd64/include/cpu.h user/ae/inet6/sys/amd64/include/pmap.h user/ae/inet6/sys/amd64/include/vmm.h (contents, props changed) user/ae/inet6/sys/amd64/include/vmm_dev.h (contents, props changed) user/ae/inet6/sys/amd64/vmm/amd/amdv.c user/ae/inet6/sys/amd64/vmm/intel/ept.c user/ae/inet6/sys/amd64/vmm/intel/vmcs.c user/ae/inet6/sys/amd64/vmm/intel/vmcs.h user/ae/inet6/sys/amd64/vmm/intel/vmx.c user/ae/inet6/sys/amd64/vmm/intel/vmx_genassym.c user/ae/inet6/sys/amd64/vmm/io/ppt.c user/ae/inet6/sys/amd64/vmm/io/ppt.h user/ae/inet6/sys/amd64/vmm/io/vhpet.c user/ae/inet6/sys/amd64/vmm/io/vioapic.c user/ae/inet6/sys/amd64/vmm/io/vlapic.c user/ae/inet6/sys/amd64/vmm/io/vlapic.h user/ae/inet6/sys/amd64/vmm/vmm.c user/ae/inet6/sys/amd64/vmm/vmm_dev.c user/ae/inet6/sys/amd64/vmm/vmm_lapic.c user/ae/inet6/sys/amd64/vmm/vmm_lapic.h user/ae/inet6/sys/amd64/vmm/vmm_msr.c user/ae/inet6/sys/amd64/vmm/vmm_msr.h user/ae/inet6/sys/arm/arm/bus_space-v6.c user/ae/inet6/sys/arm/arm/cpufunc.c user/ae/inet6/sys/arm/arm/elf_trampoline.c user/ae/inet6/sys/arm/arm/identcpu.c user/ae/inet6/sys/arm/arm/locore.S user/ae/inet6/sys/arm/arm/swtch.S user/ae/inet6/sys/arm/at91/if_ate.c user/ae/inet6/sys/arm/at91/uart_dev_at91usart.c user/ae/inet6/sys/arm/broadcom/bcm2835/files.bcm2835 user/ae/inet6/sys/arm/conf/RPI-B user/ae/inet6/sys/arm/freescale/imx/files.imx51 user/ae/inet6/sys/arm/freescale/imx/files.imx53 user/ae/inet6/sys/arm/freescale/imx/files.imx6 user/ae/inet6/sys/arm/include/armreg.h user/ae/inet6/sys/arm/include/cpuconf.h user/ae/inet6/sys/arm/include/cpufunc.h user/ae/inet6/sys/arm/include/intr.h user/ae/inet6/sys/arm/include/md_var.h user/ae/inet6/sys/arm/mv/mv_pci.c user/ae/inet6/sys/arm/ti/am335x/am335x_dmtimer.c user/ae/inet6/sys/arm/ti/files.ti user/ae/inet6/sys/arm/versatile/bus_space.c user/ae/inet6/sys/arm/xilinx/zy7_bus_space.c user/ae/inet6/sys/boot/ia64/efi/version user/ae/inet6/sys/cam/cam.h user/ae/inet6/sys/cam/cam_ccb.h user/ae/inet6/sys/cam/cam_compat.c user/ae/inet6/sys/cam/cam_compat.h user/ae/inet6/sys/cam/scsi/scsi_xpt.c user/ae/inet6/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c user/ae/inet6/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c user/ae/inet6/sys/cddl/dev/fbt/fbt_powerpc.c user/ae/inet6/sys/conf/Makefile.arm user/ae/inet6/sys/conf/files user/ae/inet6/sys/conf/files.arm user/ae/inet6/sys/conf/files.powerpc user/ae/inet6/sys/conf/kern.mk user/ae/inet6/sys/conf/options user/ae/inet6/sys/conf/options.arm user/ae/inet6/sys/dev/ae/if_ae.c user/ae/inet6/sys/dev/ahci/ahciem.c user/ae/inet6/sys/dev/an/if_an.c user/ae/inet6/sys/dev/an/if_an_pccard.c user/ae/inet6/sys/dev/arcmsr/arcmsr.c user/ae/inet6/sys/dev/arcmsr/arcmsr.h user/ae/inet6/sys/dev/cxgbe/common/common.h user/ae/inet6/sys/dev/cxgbe/offload.h user/ae/inet6/sys/dev/cxgbe/t4_main.c user/ae/inet6/sys/dev/cxgbe/t4_sge.c user/ae/inet6/sys/dev/cxgbe/tom/t4_cpl_io.c user/ae/inet6/sys/dev/cxgbe/tom/t4_listen.c user/ae/inet6/sys/dev/cxgbe/tom/t4_tom.h user/ae/inet6/sys/dev/drm2/drmP.h user/ae/inet6/sys/dev/drm2/drm_edid.c user/ae/inet6/sys/dev/drm2/drm_fb_helper.c user/ae/inet6/sys/dev/drm2/radeon/radeon_fence.c user/ae/inet6/sys/dev/drm2/radeon/radeon_sa.c user/ae/inet6/sys/dev/drm2/ttm/ttm_bo.c user/ae/inet6/sys/dev/drm2/ttm/ttm_bo_vm.c user/ae/inet6/sys/dev/drm2/ttm/ttm_lock.c user/ae/inet6/sys/dev/fb/fbd.c user/ae/inet6/sys/dev/fdt/fdt_common.h user/ae/inet6/sys/dev/fdt/fdt_pci.c user/ae/inet6/sys/dev/hwpmc/hwpmc_core.c user/ae/inet6/sys/dev/hwpmc/hwpmc_core.h user/ae/inet6/sys/dev/hwpmc/hwpmc_intel.c user/ae/inet6/sys/dev/hwpmc/hwpmc_powerpc.c user/ae/inet6/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/ae/inet6/sys/dev/iscsi/iscsi.c user/ae/inet6/sys/dev/ixgbe/ixgbe.c user/ae/inet6/sys/dev/md/md.c user/ae/inet6/sys/dev/netmap/if_em_netmap.h user/ae/inet6/sys/dev/netmap/if_igb_netmap.h user/ae/inet6/sys/dev/netmap/if_lem_netmap.h user/ae/inet6/sys/dev/netmap/if_re_netmap.h user/ae/inet6/sys/dev/netmap/ixgbe_netmap.h user/ae/inet6/sys/dev/netmap/netmap.c user/ae/inet6/sys/dev/netmap/netmap_kern.h user/ae/inet6/sys/dev/netmap/netmap_mem2.c user/ae/inet6/sys/dev/netmap/netmap_mem2.h user/ae/inet6/sys/dev/nmdm/nmdm.c user/ae/inet6/sys/dev/ofw/ofw_bus_subr.c user/ae/inet6/sys/dev/ofw/ofw_bus_subr.h user/ae/inet6/sys/dev/ofw/ofw_console.c user/ae/inet6/sys/dev/ofw/ofw_fdt.c user/ae/inet6/sys/dev/pci/vga_pci.c user/ae/inet6/sys/dev/syscons/scterm-teken.c user/ae/inet6/sys/dev/uart/uart_cpu.h user/ae/inet6/sys/dev/uart/uart_tty.c user/ae/inet6/sys/dev/usb/controller/at91dci.c user/ae/inet6/sys/dev/usb/controller/atmegadci.c user/ae/inet6/sys/dev/usb/controller/avr32dci.c user/ae/inet6/sys/dev/usb/controller/dwc_otg.c user/ae/inet6/sys/dev/usb/controller/ehci.c user/ae/inet6/sys/dev/usb/controller/musb_otg.c user/ae/inet6/sys/dev/usb/controller/ohci.c user/ae/inet6/sys/dev/usb/controller/uhci.c user/ae/inet6/sys/dev/usb/controller/uss820dci.c user/ae/inet6/sys/dev/usb/controller/xhci.c user/ae/inet6/sys/dev/usb/quirk/usb_quirk.c user/ae/inet6/sys/dev/usb/template/usb_template.c user/ae/inet6/sys/dev/usb/usb_bus.h user/ae/inet6/sys/dev/usb/usb_device.c user/ae/inet6/sys/dev/usb/usb_device.h user/ae/inet6/sys/dev/usb/usb_hub.c user/ae/inet6/sys/dev/usb/usb_transfer.c user/ae/inet6/sys/dev/usb/usbdevs user/ae/inet6/sys/dev/usb/usbdi.h user/ae/inet6/sys/dev/usb/wlan/if_run.c user/ae/inet6/sys/dev/usb/wlan/if_runreg.h user/ae/inet6/sys/dev/usb/wlan/if_runvar.h user/ae/inet6/sys/dev/vt/font/vt_font_default.c user/ae/inet6/sys/dev/vt/hw/fb/vt_fb.c user/ae/inet6/sys/dev/vt/vt.h user/ae/inet6/sys/dev/vt/vt_consolectl.c user/ae/inet6/sys/dev/vt/vt_core.c user/ae/inet6/sys/dev/vt/vt_font.c user/ae/inet6/sys/dev/vt/vt_sysmouse.c user/ae/inet6/sys/fs/devfs/devfs_devs.c user/ae/inet6/sys/fs/ext2fs/ext2_hash.c user/ae/inet6/sys/fs/fifofs/fifo_vnops.c user/ae/inet6/sys/fs/nfs/nfs_commonsubs.c user/ae/inet6/sys/fs/nfsclient/nfs_clstate.c user/ae/inet6/sys/fs/nfsserver/nfs_fha_new.c user/ae/inet6/sys/geom/eli/g_eli.c user/ae/inet6/sys/geom/eli/g_eli_crypto.c user/ae/inet6/sys/geom/geom_dev.c user/ae/inet6/sys/geom/mirror/g_mirror_ctl.c user/ae/inet6/sys/ia64/ia64/pmap.c user/ae/inet6/sys/kern/capabilities.conf user/ae/inet6/sys/kern/init_sysent.c user/ae/inet6/sys/kern/kern_clocksource.c user/ae/inet6/sys/kern/kern_event.c user/ae/inet6/sys/kern/kern_exit.c user/ae/inet6/sys/kern/kern_fork.c user/ae/inet6/sys/kern/kern_linker.c user/ae/inet6/sys/kern/kern_resource.c user/ae/inet6/sys/kern/kern_rwlock.c user/ae/inet6/sys/kern/makesyscalls.sh user/ae/inet6/sys/kern/subr_terminal.c user/ae/inet6/sys/kern/subr_trap.c user/ae/inet6/sys/kern/subr_vmem.c user/ae/inet6/sys/kern/tty.c user/ae/inet6/sys/kern/uipc_syscalls.c user/ae/inet6/sys/kern/vfs_bio.c user/ae/inet6/sys/kern/vfs_vnops.c user/ae/inet6/sys/mips/beri/beri_machdep.c user/ae/inet6/sys/modules/drm2/drm2/Makefile user/ae/inet6/sys/modules/drm2/i915kms/Makefile user/ae/inet6/sys/modules/drm2/radeonkms/Makefile user/ae/inet6/sys/modules/netmap/Makefile user/ae/inet6/sys/net/netmap.h user/ae/inet6/sys/net/netmap_user.h user/ae/inet6/sys/net/radix.c user/ae/inet6/sys/netgraph/ng_ksocket.c user/ae/inet6/sys/netinet/ip_output.c user/ae/inet6/sys/netinet6/send.c user/ae/inet6/sys/netpfil/ipfw/ip_fw_dynamic.c user/ae/inet6/sys/netpfil/pf/pf.c user/ae/inet6/sys/netpfil/pf/pf.h user/ae/inet6/sys/nfs/nfs_fha.c user/ae/inet6/sys/nfs/nfs_fha.h user/ae/inet6/sys/nfsserver/nfs_fha_old.c user/ae/inet6/sys/ofed/drivers/net/mlx4/en_netdev.c user/ae/inet6/sys/ofed/drivers/net/mlx4/mlx4_en.h user/ae/inet6/sys/powerpc/aim/mp_cpudep.c user/ae/inet6/sys/powerpc/aim/trap.c user/ae/inet6/sys/powerpc/aim/trap_subr32.S user/ae/inet6/sys/powerpc/aim/trap_subr64.S user/ae/inet6/sys/powerpc/include/cpu.h user/ae/inet6/sys/powerpc/include/dbdma.h user/ae/inet6/sys/powerpc/include/openpicreg.h user/ae/inet6/sys/powerpc/include/openpicvar.h user/ae/inet6/sys/powerpc/include/pcpu.h user/ae/inet6/sys/powerpc/include/pmc_mdep.h user/ae/inet6/sys/powerpc/include/spr.h user/ae/inet6/sys/powerpc/ofw/ofw_pci.c user/ae/inet6/sys/powerpc/ofw/ofw_pcib_pci.c user/ae/inet6/sys/powerpc/ofw/openpic_ofw.c user/ae/inet6/sys/powerpc/powermac/ata_macio.c user/ae/inet6/sys/powerpc/powermac/atibl.c user/ae/inet6/sys/powerpc/powermac/cpcht.c user/ae/inet6/sys/powerpc/powermac/dbdma.c user/ae/inet6/sys/powerpc/powermac/dbdmavar.h user/ae/inet6/sys/powerpc/powermac/platform_powermac.c user/ae/inet6/sys/powerpc/powermac/pmu.c user/ae/inet6/sys/powerpc/powermac/pmuvar.h user/ae/inet6/sys/powerpc/powermac/uninorth.c user/ae/inet6/sys/powerpc/powermac/uninorthvar.h user/ae/inet6/sys/powerpc/powermac/viareg.h user/ae/inet6/sys/powerpc/powerpc/mp_machdep.c user/ae/inet6/sys/powerpc/powerpc/openpic.c user/ae/inet6/sys/powerpc/pseries/phyp_vscsi.c user/ae/inet6/sys/powerpc/psim/openpic_iobus.c user/ae/inet6/sys/rpc/svc.c user/ae/inet6/sys/rpc/svc.h user/ae/inet6/sys/rpc/svc_vc.c user/ae/inet6/sys/sparc64/ebus/ebus.c user/ae/inet6/sys/sparc64/isa/ofw_isa.c user/ae/inet6/sys/sparc64/pci/fire.c user/ae/inet6/sys/sparc64/pci/ofw_pcib_subr.c user/ae/inet6/sys/sparc64/pci/psycho.c user/ae/inet6/sys/sparc64/pci/schizo.c user/ae/inet6/sys/sys/consio.h user/ae/inet6/sys/sys/fbio.h user/ae/inet6/sys/sys/param.h user/ae/inet6/sys/sys/terminal.h user/ae/inet6/sys/sys/tty.h user/ae/inet6/sys/teken/demo/teken_demo.c user/ae/inet6/sys/teken/teken.h user/ae/inet6/sys/teken/teken_subr.h user/ae/inet6/sys/x86/acpica/acpi_wakeup.c user/ae/inet6/sys/x86/cpufreq/est.c user/ae/inet6/sys/x86/include/mptable.h user/ae/inet6/sys/x86/x86/mptable.c user/ae/inet6/tools/build/mk/OptionalObsoleteFiles.inc user/ae/inet6/tools/tools/ath/athstats/Makefile user/ae/inet6/tools/tools/net80211/wlanstats/Makefile user/ae/inet6/tools/tools/vt/fontcvt/fontcvt.c user/ae/inet6/tools/tools/vt/mkkfont/mkkfont.c user/ae/inet6/tools/tools/vt/setfont/setfont.c user/ae/inet6/usr.bin/calendar/calcpp.c user/ae/inet6/usr.bin/clang/clang/Makefile user/ae/inet6/usr.bin/clang/llc/Makefile user/ae/inet6/usr.bin/clang/lldb/Makefile user/ae/inet6/usr.bin/clang/llvm-mc/Makefile user/ae/inet6/usr.bin/clang/llvm-objdump/Makefile user/ae/inet6/usr.bin/clang/llvm-rtdyld/Makefile user/ae/inet6/usr.bin/clang/opt/Makefile user/ae/inet6/usr.bin/dtc/fdt.cc user/ae/inet6/usr.bin/kdump/Makefile user/ae/inet6/usr.bin/kdump/kdump.c user/ae/inet6/usr.bin/mkcsmapper/Makefile.inc user/ae/inet6/usr.bin/netstat/if.c user/ae/inet6/usr.bin/netstat/main.c user/ae/inet6/usr.bin/netstat/mroute.c user/ae/inet6/usr.bin/netstat/mroute6.c user/ae/inet6/usr.bin/netstat/netgraph.c user/ae/inet6/usr.bin/netstat/netstat.h user/ae/inet6/usr.bin/netstat/route.c user/ae/inet6/usr.bin/sort/radixsort.c user/ae/inet6/usr.sbin/bhyve/Makefile user/ae/inet6/usr.sbin/bhyve/acpi.c user/ae/inet6/usr.sbin/bhyve/bhyverun.c user/ae/inet6/usr.sbin/bhyve/mptbl.c user/ae/inet6/usr.sbin/bhyve/pci_emul.c user/ae/inet6/usr.sbin/bhyve/pci_emul.h user/ae/inet6/usr.sbin/bhyve/pci_passthru.c user/ae/inet6/usr.sbin/bhyve/xmsr.c user/ae/inet6/usr.sbin/bhyve/xmsr.h user/ae/inet6/usr.sbin/bhyvectl/bhyvectl.c user/ae/inet6/usr.sbin/bsdconfig/share/packages/index.subr user/ae/inet6/usr.sbin/bsdinstall/scripts/auto user/ae/inet6/usr.sbin/bsdinstall/scripts/config user/ae/inet6/usr.sbin/bsdinstall/scripts/services user/ae/inet6/usr.sbin/bsdinstall/scripts/zfsboot user/ae/inet6/usr.sbin/ctld/login.c user/ae/inet6/usr.sbin/mptable/mptable.c user/ae/inet6/usr.sbin/pkg/config.c user/ae/inet6/usr.sbin/pkg/config.h user/ae/inet6/usr.sbin/pkg/pkg.7 user/ae/inet6/usr.sbin/pkg/pkg.c user/ae/inet6/usr.sbin/tcpdump/tcpdump/Makefile user/ae/inet6/usr.sbin/ypbind/yp_ping.c Directory Properties: user/ae/inet6/ (props changed) user/ae/inet6/cddl/ (props changed) user/ae/inet6/cddl/contrib/opensolaris/ (props changed) user/ae/inet6/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/ae/inet6/contrib/file/ (props changed) user/ae/inet6/contrib/gcc/ (props changed) user/ae/inet6/contrib/llvm/ (props changed) user/ae/inet6/contrib/llvm/tools/clang/ (props changed) user/ae/inet6/contrib/tcpdump/ (props changed) user/ae/inet6/contrib/tzcode/stdtime/ (props changed) user/ae/inet6/contrib/tzdata/ (props changed) user/ae/inet6/crypto/heimdal/ (props changed) user/ae/inet6/etc/ (props changed) user/ae/inet6/gnu/lib/ (props changed) user/ae/inet6/lib/libc/ (props changed) user/ae/inet6/lib/libvmmapi/ (props changed) user/ae/inet6/sbin/ (props changed) user/ae/inet6/sbin/ipfw/ (props changed) user/ae/inet6/share/man/man4/ (props changed) user/ae/inet6/sys/ (props changed) user/ae/inet6/sys/amd64/vmm/ (props changed) user/ae/inet6/sys/boot/ (props changed) user/ae/inet6/sys/boot/ia64/efi/ (props changed) user/ae/inet6/sys/cddl/contrib/opensolaris/ (props changed) user/ae/inet6/sys/conf/ (props changed) user/ae/inet6/sys/dev/hyperv/ (props changed) user/ae/inet6/usr.bin/calendar/ (props changed) user/ae/inet6/usr.sbin/bhyve/ (props changed) user/ae/inet6/usr.sbin/bhyvectl/ (props changed) Modified: user/ae/inet6/ObsoleteFiles.inc ============================================================================== --- user/ae/inet6/ObsoleteFiles.inc Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/ObsoleteFiles.inc Tue Dec 24 15:44:09 2013 (r259824) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131215: libcam version bumped +OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6 # 20131202: libcapsicum and libcasper moved to /lib/ OLD_LIBS+=usr/lib/libcapsicum.so.0 OLD_LIBS+=usr/lib/libcasper.so.0 Modified: user/ae/inet6/UPDATING ============================================================================== --- user/ae/inet6/UPDATING Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/UPDATING Tue Dec 24 15:44:09 2013 (r259824) @@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131213: + The behavior of gss_pseudo_random() for the krb5 mechanism + has changed, for applications requesting a longer random string + than produced by the underlying enctype's pseudo-random() function. + In particular, the random string produced from a session key of + enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will + be different at the 17th octet and later, after this change. + The counter used in the PRF+ construction is now encoded as a + big-endian integer in accordance with RFC 4402. + __FreeBSD_version is bumped to 1100004. + 20131108: The WITHOUT_ATF build knob has been removed and its functionality has been subsumed into the more generic WITHOUT_TESTS. If you were @@ -1932,7 +1943,7 @@ COMMON ITEMS: make buildkernel KERNCONF=YOUR_KERNEL_HERE <maybe newfs current's root partition> <mount current's root partition on directory ${CURRENT_ROOT}> - make installworld DESTDIR=${CURRENT_ROOT} + make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd Modified: user/ae/inet6/bin/Makefile ============================================================================== --- user/ae/inet6/bin/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -52,6 +52,10 @@ SUBDIR+= rmail SUBDIR+= csh .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.arch.inc.mk> SUBDIR:= ${SUBDIR:O} Modified: user/ae/inet6/bin/date/Makefile ============================================================================== --- user/ae/inet6/bin/date/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/date/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -1,7 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= date SRCS= date.c netdate.c vary.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: user/ae/inet6/bin/mv/Makefile ============================================================================== --- user/ae/inet6/bin/mv/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/mv/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -1,6 +1,12 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ +.include <bsd.own.mk> + PROG= mv +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: user/ae/inet6/bin/pax/Makefile ============================================================================== --- user/ae/inet6/bin/pax/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/pax/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += # @@ -30,4 +32,8 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: user/ae/inet6/bin/pax/pax.1 ============================================================================== --- user/ae/inet6/bin/pax/pax.1 Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/pax/pax.1 Tue Dec 24 15:44:09 2013 (r259824) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 29, 2010 +.Dd December 21, 2013 .Dt PAX 1 .Os .Sh NAME @@ -587,6 +587,16 @@ precedence. For example, if .Dl Fl p Ar eme is specified, file modification times are still preserved. +.Pp +File flags set by +.Xr chflags 1 +are not understood by +.Nm , +however +.Xr tar 1 +and +.Xr dump 1 +will preserve these. .It Fl s Ar replstr Modify the file or archive member names specified by the .Ar pattern @@ -1195,3 +1205,11 @@ at the University of California, San Die The .Nm utility does not recognize multibyte characters. +.Pp +File flags set by +.Xr chflags 1 +are not preserved by +.Nm . +The BUGS section of +.Xr chflags 1 +has a list of utilities that are unaware of flags. Modified: user/ae/inet6/bin/sh/Makefile ============================================================================== --- user/ae/inet6/bin/sh/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/sh/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -1,6 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ +.include <bsd.own.mk> + PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ @@ -59,7 +61,8 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -regress: - cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include <bsd.prog.mk> Modified: user/ae/inet6/bin/test/Makefile ============================================================================== --- user/ae/inet6/bin/test/Makefile Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/bin/test/Makefile Tue Dec 24 15:44:09 2013 (r259824) @@ -1,8 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> Modified: user/ae/inet6/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 24 15:44:09 2013 (r259824) @@ -559,16 +559,20 @@ get_metaslab_refcount(vdev_t *vd) static int verify_spacemap_refcounts(spa_t *spa) { - int expected_refcount, actual_refcount; + uint64_t expected_refcount = 0; + uint64_t actual_refcount; - expected_refcount = spa_feature_get_refcount(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]); + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM], + &expected_refcount); actual_refcount = get_dtl_refcount(spa->spa_root_vdev); actual_refcount += get_metaslab_refcount(spa->spa_root_vdev); if (expected_refcount != actual_refcount) { - (void) printf("space map refcount mismatch: expected %d != " - "actual %d\n", expected_refcount, actual_refcount); + (void) printf("space map refcount mismatch: expected %lld != " + "actual %lld\n", + (longlong_t)expected_refcount, + (longlong_t)actual_refcount); return (2); } return (0); @@ -670,8 +674,7 @@ dump_metaslab(metaslab_t *msp) } if (dump_opt['m'] > 1 && sm != NULL && - spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) { + spa_feature_is_active(spa, SPA_FEATURE_SPACEMAP_HISTOGRAM)) { /* * The space map histogram represents free space in chunks * of sm_shift (i.e. bucket 0 refers to 2^sm_shift). @@ -2417,8 +2420,7 @@ dump_block_stats(spa_t *spa) (void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj, count_block_cb, &zcb, NULL); } - if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + if (spa_feature_is_active(spa, SPA_FEATURE_ASYNC_DESTROY)) { VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb, &zcb, NULL)); @@ -2719,7 +2721,7 @@ dump_zpool(spa_t *spa) } if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) { + SPA_FEATURE_ASYNC_DESTROY)) { dump_bptree(spa->spa_meta_objset, spa->spa_dsl_pool->dp_bptree_obj, "Pool dataset frees"); Modified: user/ae/inet6/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/cmd/zhack/zhack.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/cddl/contrib/opensolaris/cmd/zhack/zhack.c Tue Dec 24 15:44:09 2013 (r259824) @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -85,10 +85,15 @@ usage(void) static void -fatal(const char *fmt, ...) +fatal(spa_t *spa, void *tag, const char *fmt, ...) { va_list ap; + if (spa != NULL) { + spa_close(spa, tag); + (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE); + } + va_start(ap, fmt); (void) fprintf(stderr, "%s: ", cmdname); (void) vfprintf(stderr, fmt, ap); @@ -159,13 +164,14 @@ import_pool(const char *target, boolean_ g_importargs.can_be_active = B_TRUE; if (zpool_search_import(g_zfs, &g_importargs) != NULL || spa_open(target, &spa, FTAG) == 0) { - fatal("cannot import '%s': pool is active; run " - "\"zpool export %s\" first\n", - g_pool, g_pool); + fatal(spa, FTAG, "cannot import '%s': pool is " + "active; run " "\"zpool export %s\" " + "first\n", g_pool, g_pool); } } - fatal("cannot import '%s': no such pool available\n", g_pool); + fatal(NULL, FTAG, "cannot import '%s': no such pool " + "available\n", g_pool); } elem = nvlist_next_nvpair(pools, NULL); @@ -186,7 +192,8 @@ import_pool(const char *target, boolean_ error = 0; if (error) - fatal("can't import '%s': %s", name, strerror(error)); + fatal(NULL, FTAG, "can't import '%s': %s", name, + strerror(error)); } static void @@ -201,10 +208,11 @@ zhack_spa_open(const char *target, boole zfeature_checks_disable = B_FALSE; if (err != 0) - fatal("cannot open '%s': %s", target, strerror(err)); + fatal(*spa, FTAG, "cannot open '%s': %s", target, + strerror(err)); if (spa_version(*spa) < SPA_VERSION_FEATURES) { - fatal("'%s' has version %d, features not enabled", target, - (int)spa_version(*spa)); + fatal(*spa, FTAG, "'%s' has version %d, features not enabled", + target, (int)spa_version(*spa)); } } @@ -275,12 +283,13 @@ zhack_do_feature_stat(int argc, char **a } static void -feature_enable_sync(void *arg, dmu_tx_t *tx) +zhack_feature_enable_sync(void *arg, dmu_tx_t *tx) { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; - spa_feature_enable(spa, feature, tx); + feature_enable_sync(spa, feature, tx); + spa_history_log_internal(spa, "zhack enable feature", tx, "name=%s can_readonly=%u", feature->fi_guid, feature->fi_can_readonly); @@ -294,7 +303,7 @@ zhack_do_feature_enable(int argc, char * spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * Features are not added to the pool's label until their refcounts @@ -336,18 +345,19 @@ zhack_do_feature_enable(int argc, char * feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not enable"); + if (zfeature_is_supported(feature.fi_guid)) + fatal(spa, FTAG, "'%s' is a real feature, will not enable"); if (0 == zap_contains(mos, spa->spa_feat_desc_obj, feature.fi_guid)) - fatal("feature already enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature already enabled: %s", + feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5)); spa_close(spa, FTAG); @@ -359,8 +369,10 @@ feature_incr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_incr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount + 1, tx); spa_history_log_internal(spa, "zhack feature incr", tx, "name=%s", feature->fi_guid); } @@ -370,8 +382,10 @@ feature_decr_sync(void *arg, dmu_tx_t *t { spa_t *spa = dmu_tx_pool(tx)->dp_spa; zfeature_info_t *feature = arg; + uint64_t refcount; - spa_feature_decr(spa, feature, tx); + VERIFY0(feature_get_refcount(spa, feature, &refcount)); + feature_sync(spa, feature, refcount - 1, tx); spa_history_log_internal(spa, "zhack feature decr", tx, "name=%s", feature->fi_guid); } @@ -385,7 +399,7 @@ zhack_do_feature_ref(int argc, char **ar spa_t *spa; objset_t *mos; zfeature_info_t feature; - zfeature_info_t *nodeps[] = { NULL }; + spa_feature_t nodeps[] = { SPA_FEATURE_NONE }; /* * fi_desc does not matter here because it was written to disk @@ -423,13 +437,15 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid = argv[1]; if (!zfeature_is_valid_guid(feature.fi_guid)) - fatal("invalid feature guid: %s", feature.fi_guid); + fatal(NULL, FTAG, "invalid feature guid: %s", feature.fi_guid); zhack_spa_open(target, B_FALSE, FTAG, &spa); mos = spa->spa_meta_objset; - if (0 == zfeature_lookup_guid(feature.fi_guid, NULL)) - fatal("'%s' is a real feature, will not change refcount"); + if (zfeature_is_supported(feature.fi_guid)) { + fatal(spa, FTAG, + "'%s' is a real feature, will not change refcount"); + } if (0 == zap_contains(mos, spa->spa_feat_for_read_obj, feature.fi_guid)) { @@ -438,11 +454,17 @@ zhack_do_feature_ref(int argc, char **ar feature.fi_guid)) { feature.fi_can_readonly = B_TRUE; } else { - fatal("feature is not enabled: %s", feature.fi_guid); + fatal(spa, FTAG, "feature is not enabled: %s", feature.fi_guid); } - if (decr && !spa_feature_is_active(spa, &feature)) - fatal("feature refcount already 0: %s", feature.fi_guid); + if (decr) { + uint64_t count; + if (feature_get_refcount(spa, &feature, &count) == 0 && + count != 0) { + fatal(spa, FTAG, "feature refcount already 0: %s", + feature.fi_guid); + } + } VERIFY0(dsl_sync_task(spa_name(spa), NULL, decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); @@ -530,8 +552,8 @@ main(int argc, char **argv) usage(); } - if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_TRUE) != 0) { - fatal("pool export failed; " + if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_FALSE) != 0) { + fatal(NULL, FTAG, "pool export failed; " "changes may not be committed to disk\n"); } Modified: user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Dec 24 15:44:09 2013 (r259824) @@ -269,6 +269,23 @@ an existing space map is upgraded to the Once the feature is .Sy active , it will remain in that state until the pool is destroyed. +.It Sy extensible_dataset +.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:extensible_dataset" +.It GUID Ta com.delphix:extensible_dataset +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta none +.El +.Pp +This feature allows more flexible use of internal ZFS data structures, +and exists for other features to depend on. +.Pp +This feature will be +.Sy active +when the first dependent feature uses it, +and will be returned to the +.Sy enabled +state when all datasets that use +this feature are destroyed. .El .Sh SEE ALSO .Xr zpool 8 Modified: user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Tue Dec 24 15:44:09 2013 (r259824) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. @@ -1004,7 +1004,7 @@ zpool_do_create(int argc, char **argv) * Hand off to libzfs. */ if (enable_all_pool_feat) { - int i; + spa_feature_t i; for (i = 0; i < SPA_FEATURES; i++) { char propname[MAXPATHLEN]; zfeature_info_t *feat = &spa_feature_table[i]; Modified: user/ae/inet6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Tue Dec 24 15:44:09 2013 (r259824) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -443,10 +443,9 @@ zpool_valid_proplist(libzfs_handle_t *hd prop = zpool_name_to_prop(propname); if (prop == ZPROP_INVAL && zpool_prop_feature(propname)) { int err; - zfeature_info_t *feature; char *fname = strchr(propname, '@') + 1; - err = zfeature_lookup_name(fname, &feature); + err = zfeature_lookup_name(fname, NULL); if (err != 0) { ASSERT3U(err, ==, ENOENT); zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, @@ -839,14 +838,14 @@ zpool_prop_get_feature(zpool_handle_t *z */ if (supported) { int ret; - zfeature_info_t *fi; + spa_feature_t fid; - ret = zfeature_lookup_name(feature, &fi); + ret = zfeature_lookup_name(feature, &fid); if (ret != 0) { (void) strlcpy(buf, "-", len); return (ENOTSUP); } - feature = fi->fi_guid; + feature = spa_feature_table[fid].fi_guid; } if (nvlist_lookup_uint64(features, feature, &refcount) == 0) Modified: user/ae/inet6/contrib/file/compress.c ============================================================================== --- user/ae/inet6/contrib/file/compress.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/file/compress.c Tue Dec 24 15:44:09 2013 (r259824) @@ -480,7 +480,7 @@ uncompressbuf(struct magic_set *ms, int #endif free(*newch); n = 0; - newch[0] = '\0'; + *newch = NULL; goto err; } else { n = r; Modified: user/ae/inet6/contrib/gcc/ChangeLog.gcc43 ============================================================================== --- user/ae/inet6/contrib/gcc/ChangeLog.gcc43 Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/ChangeLog.gcc43 Tue Dec 24 15:44:09 2013 (r259824) @@ -45,6 +45,20 @@ * flags.h (force_align_functions_log): Delete. * toplev.c (force_align_functions_log): Delete. +2007-07-06 Josh Conner <jconner@apple.com> (r126422) + + PR middle-end/32602 + PR middle-end/32603 + * calls.c (store_one_arg): Handle arguments which are partially + on the stack when detecting argument overlap. + +2007-07-03 Eric Christopher <echristo@apple.com> (r126278) + + * doc/cppopts.texi: Add conflicting option note to -dM. + * doc/invoke.texi: Add note about possible conflicts with + -E for -dCHARS and note that -dM will not produce + any results if there is no machine dependent reorg. + 2007-06-28 Geoffrey Keating <geoffk@apple.com> (r126088) * doc/invoke.texi (C++ Dialect Options): Document @@ -94,6 +108,14 @@ regs_invalidated_by_call, rather than just checking the membership of REGNO (REG). +2007-05-18 Geoffrey Keating <geoffk@apple.com> (r124839) + + * dwarf2out.c (print_die): Use '%ld' not '%lu' to print a 'long'. + (output_die): Use 'unsigned long' with %x. + * sched-vis.c (print_value): Use 'unsigned HOST_WIDE_INT' and + HOST_WIDE_INT_PRINT_HEX to print HOST_WIDE_INT. + * tree-dump.c (dump_pointer): Use 'unsigned long' for %lx. + 2007-05-16 Eric Christopher <echristo@apple.com> (r124763) * config/rs6000/rs6000.c (rs6000_emit_prologue): Move altivec register @@ -399,6 +421,12 @@ (override_options): Add PTA_CX16 flag. Set x86_cmpxchg16b for CPUs that have PTA_CX16 set. +2007-01-18 Josh Conner <jconner@apple.com> (r120902) + + PR target/30485 + * config/rs6000/rs6000.c (rs6000_emit_vector_compare): Add + support for UNLE, UNLT, UNGE, and UNGT. + 2007-01-17 Eric Christopher <echristo@apple.com> (r120846) * config.gcc: Support core2 processor. @@ -408,6 +436,14 @@ * c-common.c (vector_types_convertible_p): Treat opaque types as always convertible if they have the same size, but not otherwise. +2007-01-08 Geoffrey Keating <geoffk@apple.com> (r120611) + + * target.h (struct gcc_target): New field library_rtti_comdat. + * target-def.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): New. + (TARGET_CXX): Add TARGET_CXX_LIBRARY_RTTI_COMDAT. + * doc/tm.texi (C++ ABI): Document TARGET_CXX_LIBRARY_RTTI_COMDAT. + * config/darwin.h (TARGET_CXX_LIBRARY_RTTI_COMDAT): Define. + 2007-01-08 Mark Shinwell <shinwell@codesourcery.com> (r120572) * c.opt: Add -flax-vector-conversions. Modified: user/ae/inet6/contrib/gcc/c-common.c ============================================================================== --- user/ae/inet6/contrib/gcc/c-common.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c-common.c Tue Dec 24 15:44:09 2013 (r259824) @@ -6014,11 +6014,11 @@ c_parse_error (const char *gmsgid, enum message = NULL; } else - error (gmsgid); + error (gmsgid, ""); if (message) { - error (message); + error (message, ""); free (message); } #undef catenate_messages Modified: user/ae/inet6/contrib/gcc/c-convert.c ============================================================================== --- user/ae/inet6/contrib/gcc/c-convert.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c-convert.c Tue Dec 24 15:44:09 2013 (r259824) @@ -80,7 +80,7 @@ convert (tree type, tree expr) if ((invalid_conv_diag = targetm.invalid_conversion (TREE_TYPE (expr), type))) { - error (invalid_conv_diag); + error (invalid_conv_diag, ""); return error_mark_node; } Modified: user/ae/inet6/contrib/gcc/c-incpath.c ============================================================================== --- user/ae/inet6/contrib/gcc/c-incpath.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c-incpath.c Tue Dec 24 15:44:09 2013 (r259824) @@ -72,7 +72,7 @@ free_path (struct cpp_dir *path, int rea case REASON_DUP_SYS: fprintf (stderr, _("ignoring duplicate directory \"%s\"\n"), path->name); if (reason == REASON_DUP_SYS) - fprintf (stderr, + fprintf (stderr, "%s", _(" as it is a non-system directory that duplicates a system directory\n")); break; @@ -292,16 +292,16 @@ merge_include_chains (cpp_reader *pfile, { struct cpp_dir *p; - fprintf (stderr, _("#include \"...\" search starts here:\n")); + fprintf (stderr, "%s", _("#include \"...\" search starts here:\n")); for (p = heads[QUOTE];; p = p->next) { if (p == heads[BRACKET]) - fprintf (stderr, _("#include <...> search starts here:\n")); + fprintf (stderr, "%s", _("#include <...> search starts here:\n")); if (!p) break; fprintf (stderr, " %s\n", p->name); } - fprintf (stderr, _("End of search list.\n")); + fprintf (stderr, "%s", _("End of search list.\n")); } } Modified: user/ae/inet6/contrib/gcc/c-opts.c ============================================================================== --- user/ae/inet6/contrib/gcc/c-opts.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c-opts.c Tue Dec 24 15:44:09 2013 (r259824) @@ -487,6 +487,12 @@ c_common_handle_option (size_t scode, co cpp_opts->warn_multichar = value; break; + /* APPLE LOCAL begin -Wnewline-eof */ + case OPT_Wnewline_eof: + cpp_opts->warn_newline_at_eof = value; + break; + /* APPLE LOCAL end -Wnewline-eof */ + case OPT_Wnormalized_: if (!value || (arg && strcasecmp (arg, "none") == 0)) cpp_opts->warn_normalize = normalized_none; Modified: user/ae/inet6/contrib/gcc/c-typeck.c ============================================================================== --- user/ae/inet6/contrib/gcc/c-typeck.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c-typeck.c Tue Dec 24 15:44:09 2013 (r259824) @@ -2584,7 +2584,7 @@ convert_arguments (tree typelist, tree v else if ((invalid_func_diag = targetm.calls.invalid_arg_for_unprototyped_fn (typelist, fundecl, val))) { - error (invalid_func_diag); + error (invalid_func_diag, ""); return error_mark_node; } else @@ -2781,7 +2781,7 @@ build_unary_op (enum tree_code code, tre if ((invalid_op_diag = targetm.invalid_unary_op (code, TREE_TYPE (xarg)))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } @@ -7819,7 +7819,7 @@ build_binary_op (enum tree_code code, tr if ((invalid_op_diag = targetm.invalid_binary_op (code, type0, type1))) { - error (invalid_op_diag); + error (invalid_op_diag, ""); return error_mark_node; } Modified: user/ae/inet6/contrib/gcc/c.opt ============================================================================== --- user/ae/inet6/contrib/gcc/c.opt Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/c.opt Tue Dec 24 15:44:09 2013 (r259824) @@ -292,6 +292,12 @@ Wnested-externs C ObjC Var(warn_nested_externs) Warn about \"extern\" declarations not at file scope +; APPLE LOCAL begin -Wnewline-eof +Wnewline-eof +C ObjC C++ ObjC++ +Warn about files missing a newline at the end of the file +; APPLE LOCAL end -Wnewline-eof + Wnon-template-friend C++ ObjC++ Var(warn_nontemplate_friend) Init(1) Warn when non-templatized friend functions are declared within a template Modified: user/ae/inet6/contrib/gcc/calls.c ============================================================================== --- user/ae/inet6/contrib/gcc/calls.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/calls.c Tue Dec 24 15:44:09 2013 (r259824) @@ -4297,6 +4297,7 @@ store_one_arg (struct arg_data *arg, rtx /* expand_call should ensure this. */ gcc_assert (!arg->locate.offset.var + && arg->locate.size.var == 0 && GET_CODE (size_rtx) == CONST_INT); if (arg->locate.offset.constant > i) @@ -4306,7 +4307,21 @@ store_one_arg (struct arg_data *arg, rtx } else if (arg->locate.offset.constant < i) { - if (i < arg->locate.offset.constant + INTVAL (size_rtx)) + /* Use arg->locate.size.constant instead of size_rtx + because we only care about the part of the argument + on the stack. */ + if (i < (arg->locate.offset.constant + + arg->locate.size.constant)) + sibcall_failure = 1; + } + else + { + /* Even though they appear to be at the same location, + if part of the outgoing argument is in registers, + they aren't really at the same location. Check for + this by making sure that the incoming size is the + same as the outgoing size. */ + if (arg->locate.size.constant != INTVAL (size_rtx)) sibcall_failure = 1; } } Modified: user/ae/inet6/contrib/gcc/cfg.c ============================================================================== --- user/ae/inet6/contrib/gcc/cfg.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/cfg.c Tue Dec 24 15:44:09 2013 (r259824) @@ -830,7 +830,7 @@ dump_cfg_bb_info (FILE *file, basic_bloc else fprintf (file, ", "); first = false; - fputs (bb_bitnames[i], file); + fprintf (file, "%s", bb_bitnames[i]); } if (!first) fprintf (file, ")"); Modified: user/ae/inet6/contrib/gcc/collect2.c ============================================================================== --- user/ae/inet6/contrib/gcc/collect2.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/collect2.c Tue Dec 24 15:44:09 2013 (r259824) @@ -1562,10 +1562,10 @@ collect_execute (const char *prog, char if (err != 0) { errno = err; - fatal_perror (errmsg); + fatal_perror ("%s", errmsg); } else - fatal (errmsg); + fatal ("%s", errmsg); } return pex; @@ -2050,10 +2050,10 @@ scan_prog_file (const char *prog_name, e if (err != 0) { errno = err; - fatal_perror (errmsg); + fatal_perror ("%s", errmsg); } else - fatal (errmsg); + fatal ("%s", errmsg); } int_handler = (void (*) (int)) signal (SIGINT, SIG_IGN); Modified: user/ae/inet6/contrib/gcc/config/darwin.h ============================================================================== --- user/ae/inet6/contrib/gcc/config/darwin.h Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/config/darwin.h Tue Dec 24 15:44:09 2013 (r259824) @@ -467,6 +467,10 @@ extern GTY(()) int darwin_ms_struct; with names, so it's safe to make the class data not comdat. */ #define TARGET_CXX_CLASS_DATA_ALWAYS_COMDAT hook_bool_void_false +/* For efficiency, on Darwin the RTTI information that is always + emitted in the standard C++ library should not be COMDAT. */ +#define TARGET_CXX_LIBRARY_RTTI_COMDAT hook_bool_void_false + /* We make exception information linkonce. */ #undef TARGET_USES_WEAK_UNWIND_INFO #define TARGET_USES_WEAK_UNWIND_INFO 1 Modified: user/ae/inet6/contrib/gcc/config/rs6000/rs6000.c ============================================================================== --- user/ae/inet6/contrib/gcc/config/rs6000/rs6000.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/config/rs6000/rs6000.c Tue Dec 24 15:44:09 2013 (r259824) @@ -11738,11 +11738,20 @@ rs6000_emit_vector_compare (enum rtx_cod try_again = true; break; case NE: - /* Treat A != B as ~(A==B). */ + case UNLE: + case UNLT: + case UNGE: + case UNGT: + /* Invert condition and try again. + e.g., A != B becomes ~(A==B). */ { + enum rtx_code rev_code; enum insn_code nor_code; - rtx eq_rtx = rs6000_emit_vector_compare (EQ, op0, op1, - dest_mode); + rtx eq_rtx; + + rev_code = reverse_condition_maybe_unordered (rcode); + eq_rtx = rs6000_emit_vector_compare (rev_code, op0, op1, + dest_mode); nor_code = one_cmpl_optab->handlers[(int)dest_mode].insn_code; gcc_assert (nor_code != CODE_FOR_nothing); Modified: user/ae/inet6/contrib/gcc/cp/ChangeLog.gcc43 ============================================================================== --- user/ae/inet6/contrib/gcc/cp/ChangeLog.gcc43 Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/cp/ChangeLog.gcc43 Tue Dec 24 15:44:09 2013 (r259824) @@ -29,6 +29,16 @@ * typeck.c (build_binary_op): Include types in error. +2007-05-18 Geoffrey Keating <geoffk@apple.com> (r124839) + + * mangle.c (write_real_cst): Use 'unsigned long' for %lx. + +2007-05-14 Paolo Carlini <pcarlini@suse.de> (r124724) + + PR c++/29928 + * rtti.c (get_tinfo_decl_dynamic, get_typeid): Try to complete the + type only if is a class type (5.2.8/4). + 2007-05-05 Geoffrey Keating <geoffk@apple.com> (r124467) PR 31775 @@ -62,6 +72,18 @@ * semantics.c (finish_unary_op_expr): Warn only if result overflowed and operands did not. +2006-12-01 Geoffrey Keating <geoffk@apple.com> (r119427) + + * decl.c (poplevel): Check DECL_INITIAL invariant. + (duplicate_decls): Preserve DECL_INITIAL when eliminating + a new definition in favour of an old declaration. + (start_preparsed_function): Define and document value of + DECL_INITIAL before and after routine. + (finish_function): Check DECL_INITIAL invariant. + * parser.c + (cp_parser_function_definition_from_specifiers_and_declarator): + Skip duplicate function definitions. + 2006-10-31 Geoffrey Keating <geoffk@apple.com> (r118360) * name-lookup.c (get_anonymous_namespace_name): New. Modified: user/ae/inet6/contrib/gcc/cp/Make-lang.in ============================================================================== --- user/ae/inet6/contrib/gcc/cp/Make-lang.in Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/cp/Make-lang.in Tue Dec 24 15:44:09 2013 (r259824) @@ -265,7 +265,7 @@ cp/tree.o: cp/tree.c $(CXX_TREE_H) $(TM_ $(TARGET_H) debug.h cp/ptree.o: cp/ptree.c $(CXX_TREE_H) $(TM_H) cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h convert.h \ - gt-cp-rtti.h + $(TARGET_H) gt-cp-rtti.h cp/except.o: cp/except.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) $(RTL_H) except.h \ toplev.h cp/cfns.h $(EXPR_H) libfuncs.h $(TREE_INLINE_H) $(TARGET_H) cp/expr.o: cp/expr.c $(CXX_TREE_H) $(TM_H) $(RTL_H) $(FLAGS_H) $(EXPR_H) \ Modified: user/ae/inet6/contrib/gcc/cp/cvt.c ============================================================================== --- user/ae/inet6/contrib/gcc/cp/cvt.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/cp/cvt.c Tue Dec 24 15:44:09 2013 (r259824) @@ -615,7 +615,7 @@ ocp_convert (tree type, tree expr, int c if ((invalid_conv_diag = targetm.invalid_conversion (TREE_TYPE (expr), type))) { - error (invalid_conv_diag); + error (invalid_conv_diag, ""); return error_mark_node; } Modified: user/ae/inet6/contrib/gcc/cp/decl.c ============================================================================== --- user/ae/inet6/contrib/gcc/cp/decl.c Tue Dec 24 14:48:52 2013 (r259823) +++ user/ae/inet6/contrib/gcc/cp/decl.c Tue Dec 24 15:44:09 2013 (r259824) @@ -758,7 +758,12 @@ poplevel (int keep, int reverse, int fun leave_scope (); if (functionbody) - DECL_INITIAL (current_function_decl) = block; + { + /* The current function is being defined, so its DECL_INITIAL + should be error_mark_node. */ + gcc_assert (DECL_INITIAL (current_function_decl) == error_mark_node); + DECL_INITIAL (current_function_decl) = block; + } else if (block) current_binding_level->blocks = chainon (current_binding_level->blocks, block); @@ -1635,13 +1640,15 @@ duplicate_decls (tree newdecl, tree oldd } /* If the new declaration is a definition, update the file and - line information on the declaration. */ + line information on the declaration, and also make + the old declaration the same definition. */ if (DECL_INITIAL (old_result) == NULL_TREE && DECL_INITIAL (new_result) != NULL_TREE) { DECL_SOURCE_LOCATION (olddecl) = DECL_SOURCE_LOCATION (old_result) = DECL_SOURCE_LOCATION (newdecl); + DECL_INITIAL (old_result) = DECL_INITIAL (new_result); if (DECL_FUNCTION_TEMPLATE_P (newdecl)) DECL_ARGUMENTS (old_result) = DECL_ARGUMENTS (new_result); @@ -10509,7 +10516,13 @@ check_function_type (tree decl, tree cur For C++, we must first check whether that datum makes any sense. For example, "class A local_a(1,2);" means that variable local_a is an aggregate of type A, which should have a constructor - applied to it with the argument list [1, 2]. */ + applied to it with the argument list [1, 2]. + + On entry, DECL_INITIAL (decl1) should be NULL_TREE or error_mark_node, + or may be a BLOCK if the function has been defined previously + in this translation unit. On exit, DECL_INITIAL (decl1) will be + error_mark_node if the function has never been defined, or + a BLOCK if the function has been defined somewhere. */ void start_preparsed_function (tree decl1, tree attrs, int flags) @@ -10638,24 +10651,6 @@ start_preparsed_function (tree decl1, tr cp_apply_type_quals_to_decl (cp_type_quals (restype), resdecl); } - /* Initialize RTL machinery. We cannot do this until - CURRENT_FUNCTION_DECL and DECL_RESULT are set up. We do this - even when processing a template; this is how we get - CFUN set up, and our per-function variables initialized. - FIXME factor out the non-RTL stuff. */ - bl = current_binding_level; - allocate_struct_function (decl1); - current_binding_level = bl; - - /* Even though we're inside a function body, we still don't want to - call expand_expr to calculate the size of a variable-sized array. - We haven't necessarily assigned RTL to all variables yet, so it's - not safe to try to expand expressions involving them. */ - cfun->x_dont_save_pending_sizes_p = 1; - - /* Start the statement-tree, start the tree now. */ - DECL_SAVED_TREE (decl1) = push_stmt_list (); - /* Let the user know we're compiling this function. */ announce_function (decl1); @@ -10701,9 +10696,33 @@ start_preparsed_function (tree decl1, tr maybe_apply_pragma_weak (decl1); } - /* Reset these in case the call to pushdecl changed them. */ + /* Reset this in case the call to pushdecl changed it. */ current_function_decl = decl1; - cfun->decl = decl1; + + gcc_assert (DECL_INITIAL (decl1)); + + /* This function may already have been parsed, in which case just + return; our caller will skip over the body without parsing. */ + if (DECL_INITIAL (decl1) != error_mark_node) + return; + + /* Initialize RTL machinery. We cannot do this until + CURRENT_FUNCTION_DECL and DECL_RESULT are set up. We do this + even when processing a template; this is how we get + CFUN set up, and our per-function variables initialized. + FIXME factor out the non-RTL stuff. */ + bl = current_binding_level; + allocate_struct_function (decl1); + current_binding_level = bl; + + /* Even though we're inside a function body, we still don't want to + call expand_expr to calculate the size of a variable-sized array. + We haven't necessarily assigned RTL to all variables yet, so it's + not safe to try to expand expressions involving them. */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312241544.rBOFiBDo052333>