Date: Mon, 4 Apr 2016 23:55:33 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297567 - in projects/release-pkg: . bin/csh bin/freebsd-version bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common cdd... Message-ID: <201604042355.u34NtXUR065558@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Apr 4 23:55:32 2016 New Revision: 297567 URL: https://svnweb.freebsd.org/changeset/base/297567 Log: MFH Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/bin/sh/tests/builtins/trap17.0 - copied unchanged from r297566, head/bin/sh/tests/builtins/trap17.0 - copied unchanged from r297566, head/contrib/libxo/libxo/xo_config.h.in projects/release-pkg/lib/libxo/xo_config.h - copied unchanged from r297566, head/lib/libxo/xo_config.h projects/release-pkg/share/dtrace/mbuf.d - copied unchanged from r297566, head/share/dtrace/mbuf.d projects/release-pkg/sys/arm/conf/JETSON-TK1 - copied unchanged from r297566, head/sys/arm/conf/JETSON-TK1 projects/release-pkg/sys/arm/conf/TEGRA124 - copied unchanged from r297566, head/sys/arm/conf/TEGRA124 projects/release-pkg/sys/arm/nvidia/ - copied from r297566, head/sys/arm/nvidia/ projects/release-pkg/sys/arm/ti/ti_spi.c - copied unchanged from r297566, head/sys/arm/ti/ti_spi.c projects/release-pkg/sys/arm/ti/ti_spireg.h - copied unchanged from r297566, head/sys/arm/ti/ti_spireg.h projects/release-pkg/sys/arm/ti/ti_spivar.h - copied unchanged from r297566, head/sys/arm/ti/ti_spivar.h projects/release-pkg/sys/arm64/arm64/bzero.S - copied unchanged from r297566, head/sys/arm64/arm64/bzero.S projects/release-pkg/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts - copied unchanged from r297566, head/sys/boot/fdt/dts/arm/tegra124-jetson-tk1-fbsd.dts projects/release-pkg/sys/boot/geli/ - copied from r297566, head/sys/boot/geli/ projects/release-pkg/sys/contrib/cloudabi/cloudabi64_types.h - copied unchanged from r297566, head/sys/contrib/cloudabi/cloudabi64_types.h projects/release-pkg/sys/contrib/cloudabi/cloudabi_types_common.h - copied unchanged from r297566, head/sys/contrib/cloudabi/cloudabi_types_common.h projects/release-pkg/sys/contrib/cloudabi/syscalls.master - copied unchanged from r297566, head/sys/contrib/cloudabi/syscalls.master projects/release-pkg/sys/dev/extres/clk/clk_bus.c - copied unchanged from r297566, head/sys/dev/extres/clk/clk_bus.c projects/release-pkg/sys/dev/extres/phy/ - copied from r297566, head/sys/dev/extres/phy/ projects/release-pkg/sys/dev/extres/regulator/ - copied from r297566, head/sys/dev/extres/regulator/ projects/release-pkg/sys/dev/nctgpio/ - copied from r297566, head/sys/dev/nctgpio/ projects/release-pkg/sys/dev/ofw/ofwpci.c - copied unchanged from r297566, head/sys/dev/ofw/ofwpci.c projects/release-pkg/sys/dev/ofw/ofwpci.h - copied unchanged from r297566, head/sys/dev/ofw/ofwpci.h projects/release-pkg/sys/dev/uart/uart_dev_snps.c - copied unchanged from r297566, head/sys/dev/uart/uart_dev_snps.c projects/release-pkg/sys/dev/urtwn/ - copied from r297566, head/sys/dev/urtwn/ projects/release-pkg/sys/modules/nctgpio/ - copied from r297566, head/sys/modules/nctgpio/ projects/release-pkg/sys/modules/urtwn/ - copied from r297566, head/sys/modules/urtwn/ projects/release-pkg/sys/modules/urtwnfw/ - copied from r297566, head/sys/modules/urtwnfw/ projects/release-pkg/sys/x86/x86/autoconf.c - copied unchanged from r297566, head/sys/x86/x86/autoconf.c projects/release-pkg/targets/pseudo/hosttools/Makefile.depend.host - copied unchanged from r297566, head/targets/pseudo/hosttools/Makefile.depend.host Directory Properties: projects/release-pkg/contrib/libxo/libxo/xo_config.h.in (props changed) Deleted: projects/release-pkg/contrib/libxo/bin/ projects/release-pkg/contrib/libxo/build/ projects/release-pkg/contrib/libxo/libxo/xo_config.h projects/release-pkg/lib/libstand/bswap.c projects/release-pkg/sbin/casperd/ projects/release-pkg/sys/amd64/amd64/autoconf.c projects/release-pkg/sys/compat/cloudabi/cloudabi_syscalldefs.h projects/release-pkg/sys/compat/cloudabi64/cloudabi64_syscalldefs.h projects/release-pkg/sys/compat/cloudabi64/syscalls.master projects/release-pkg/sys/contrib/cloudabi/syscalldefs_md.h projects/release-pkg/sys/contrib/cloudabi/syscalldefs_mi.h projects/release-pkg/sys/dev/filemon/filemon_lock.c projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c projects/release-pkg/sys/dev/usb/wlan/if_urtwnreg.h projects/release-pkg/sys/dev/usb/wlan/if_urtwnvar.h projects/release-pkg/sys/i386/i386/autoconf.c projects/release-pkg/sys/modules/usb/urtwn/ projects/release-pkg/sys/modules/usb/urtwnfw/ projects/release-pkg/targets/pseudo/hosttools/Makefile.depend projects/release-pkg/tools/build/options/WITHOUT_FAST_DEPEND projects/release-pkg/tools/build/options/WITH_FAST_DEPEND projects/release-pkg/tools/tools/vt/setfont/ Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 projects/release-pkg/Makefile.libcompat projects/release-pkg/ObsoleteFiles.inc projects/release-pkg/UPDATING projects/release-pkg/bin/csh/Makefile projects/release-pkg/bin/freebsd-version/freebsd-version.1 projects/release-pkg/bin/sh/tests/builtins/Makefile projects/release-pkg/bin/sh/trap.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/release-pkg/contrib/bmake/ChangeLog projects/release-pkg/contrib/bmake/Makefile projects/release-pkg/contrib/bmake/bmake.1 projects/release-pkg/contrib/bmake/bmake.cat1 projects/release-pkg/contrib/bmake/make.1 projects/release-pkg/contrib/bmake/meta.c projects/release-pkg/contrib/bmake/mk/ChangeLog projects/release-pkg/contrib/bmake/mk/dirdeps.mk projects/release-pkg/contrib/bmake/mk/install-mk projects/release-pkg/contrib/bmake/mk/meta.autodep.mk projects/release-pkg/contrib/bmake/mk/meta.stage.mk projects/release-pkg/contrib/bmake/mk/sys.dependfile.mk projects/release-pkg/contrib/bmake/parse.c projects/release-pkg/contrib/bmake/suff.c projects/release-pkg/contrib/bmake/var.c projects/release-pkg/contrib/bsnmp/snmp_mibII/mibII_tcp.c projects/release-pkg/contrib/byacc/CHANGES projects/release-pkg/contrib/byacc/MANIFEST projects/release-pkg/contrib/byacc/VERSION projects/release-pkg/contrib/byacc/aclocal.m4 projects/release-pkg/contrib/byacc/config.guess projects/release-pkg/contrib/byacc/config.sub projects/release-pkg/contrib/byacc/main.c projects/release-pkg/contrib/byacc/package/byacc.spec projects/release-pkg/contrib/byacc/package/debian/changelog projects/release-pkg/contrib/byacc/package/debian/copyright projects/release-pkg/contrib/byacc/package/mingw-byacc.spec projects/release-pkg/contrib/byacc/package/pkgsrc/Makefile projects/release-pkg/contrib/byacc/reader.c projects/release-pkg/contrib/elftoolchain/elfcopy/elfcopy.h projects/release-pkg/contrib/elftoolchain/elfcopy/segments.c projects/release-pkg/contrib/libc++/include/__config projects/release-pkg/contrib/libcxxrt/guard.cc projects/release-pkg/contrib/libxo/install-sh projects/release-pkg/contrib/llvm/include/llvm/Support/ThreadPool.h projects/release-pkg/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/release-pkg/contrib/ofed/libcxgb4/src/cq.c projects/release-pkg/contrib/ofed/libcxgb4/src/dev.c projects/release-pkg/contrib/ofed/libcxgb4/src/libcxgb4.h projects/release-pkg/contrib/ofed/libcxgb4/src/qp.c projects/release-pkg/contrib/ofed/libcxgb4/src/t4.h projects/release-pkg/contrib/ofed/libcxgb4/src/verbs.c projects/release-pkg/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c projects/release-pkg/contrib/ofed/management/opensm/include/vendor/osm_vendor.h projects/release-pkg/etc/autofs/special_hosts projects/release-pkg/etc/autofs/special_media projects/release-pkg/etc/mtree/BSD.usr.dist projects/release-pkg/etc/rc.d/msgs projects/release-pkg/etc/rc.d/pf projects/release-pkg/gnu/lib/csu/Makefile projects/release-pkg/include/paths.h projects/release-pkg/include/stdlib.h projects/release-pkg/kerberos5/Makefile projects/release-pkg/kerberos5/lib/libroken/Makefile projects/release-pkg/lib/clang/libllvmsupport/Makefile projects/release-pkg/lib/csu/powerpc64/Makefile projects/release-pkg/lib/libc/Makefile projects/release-pkg/lib/libc/aarch64/Symbol.map projects/release-pkg/lib/libc/amd64/Symbol.map projects/release-pkg/lib/libc/arm/Symbol.map projects/release-pkg/lib/libc/db/mpool/Makefile.inc projects/release-pkg/lib/libc/gen/Makefile.inc projects/release-pkg/lib/libc/i386/Symbol.map projects/release-pkg/lib/libc/iconv/Makefile.inc projects/release-pkg/lib/libc/locale/euc.c projects/release-pkg/lib/libc/locale/mskanji.c projects/release-pkg/lib/libc/mips/Symbol.map projects/release-pkg/lib/libc/net/Makefile.inc projects/release-pkg/lib/libc/posix1e/Makefile.inc projects/release-pkg/lib/libc/powerpc/Symbol.map projects/release-pkg/lib/libc/powerpc64/Symbol.map projects/release-pkg/lib/libc/riscv/Symbol.map projects/release-pkg/lib/libc/secure/Makefile.inc projects/release-pkg/lib/libc/sparc64/Symbol.map projects/release-pkg/lib/libc/stdio/open_memstream.3 projects/release-pkg/lib/libc/stdtime/Makefile.inc projects/release-pkg/lib/libc/sys/aio_return.2 projects/release-pkg/lib/libc/sys/aio_waitcomplete.2 projects/release-pkg/lib/libc/sys/ktrace.2 projects/release-pkg/lib/libc/sys/modfind.2 projects/release-pkg/lib/libc/sys/ptrace.2 projects/release-pkg/lib/libc/tests/ssp/Makefile projects/release-pkg/lib/libclang_rt/asan_dynamic/Makefile projects/release-pkg/lib/libcxxrt/Makefile projects/release-pkg/lib/libdevinfo/Makefile projects/release-pkg/lib/libfetch/fetch.3 projects/release-pkg/lib/libkvm/kvm_amd64.c projects/release-pkg/lib/libstand/Makefile projects/release-pkg/lib/libstand/bootp.c projects/release-pkg/lib/libstand/bootp.h projects/release-pkg/lib/libstand/globals.c projects/release-pkg/lib/libstand/net.h projects/release-pkg/lib/libstand/stand.h projects/release-pkg/lib/libsysdecode/errno.c projects/release-pkg/lib/libthr/Makefile projects/release-pkg/lib/libthr/thread/thr_fork.c projects/release-pkg/lib/libthr/thread/thr_init.c projects/release-pkg/lib/libthr/thread/thr_mutex.c projects/release-pkg/lib/libthr/thread/thr_private.h projects/release-pkg/lib/libthr/thread/thr_pshared.c projects/release-pkg/lib/libthr/thread/thr_pspinlock.c projects/release-pkg/lib/libthr/thread/thr_rtld.c projects/release-pkg/lib/libxo/Makefile projects/release-pkg/lib/libxo/tests/Makefile projects/release-pkg/lib/libz/Makefile projects/release-pkg/lib/msun/arm/Makefile.inc projects/release-pkg/lib/ncurses/ncurses/Makefile projects/release-pkg/libexec/dma/Makefile.inc projects/release-pkg/libexec/dma/dmagent/Makefile projects/release-pkg/libexec/rtld-elf/Makefile projects/release-pkg/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/release-pkg/release/picobsd/build/Makefile.conf projects/release-pkg/sbin/atm/atmconfig/atmconfig.8 projects/release-pkg/sbin/devd/devd.cc projects/release-pkg/sbin/devd/devd.conf.5 projects/release-pkg/sbin/ifconfig/ifieee80211.c projects/release-pkg/sbin/ifconfig/sfp.c projects/release-pkg/sbin/kldstat/Makefile.depend projects/release-pkg/sbin/kldstat/kldstat.8 projects/release-pkg/sbin/kldstat/kldstat.c projects/release-pkg/sbin/ping/ping.c projects/release-pkg/sbin/restore/tape.c projects/release-pkg/secure/Makefile projects/release-pkg/share/dtrace/Makefile projects/release-pkg/share/man/man4/amdsbwd.4 projects/release-pkg/share/man/man4/capsicum.4 projects/release-pkg/share/man/man4/cfi.4 projects/release-pkg/share/man/man4/cyapa.4 projects/release-pkg/share/man/man4/ddb.4 projects/release-pkg/share/man/man4/filemon.4 projects/release-pkg/share/man/man4/iscsi_initiator.4 projects/release-pkg/share/man/man4/lagg.4 projects/release-pkg/share/man/man4/pcm.4 projects/release-pkg/share/man/man4/sppp.4 projects/release-pkg/share/man/man4/uart.4 projects/release-pkg/share/man/man4/udl.4 projects/release-pkg/share/man/man4/vxlan.4 projects/release-pkg/share/man/man4/wbwd.4 projects/release-pkg/share/man/man5/make.conf.5 projects/release-pkg/share/man/man5/periodic.conf.5 projects/release-pkg/share/man/man5/src.conf.5 projects/release-pkg/share/man/man7/build.7 projects/release-pkg/share/man/man7/hier.7 projects/release-pkg/share/man/man7/ports.7 projects/release-pkg/share/man/man9/Makefile projects/release-pkg/share/man/man9/SYSCALL_MODULE.9 projects/release-pkg/share/man/man9/counter.9 projects/release-pkg/share/man/man9/fail.9 projects/release-pkg/share/man/man9/kqueue.9 projects/release-pkg/share/man/man9/netisr.9 projects/release-pkg/share/man/man9/osd.9 projects/release-pkg/share/man/man9/rwlock.9 projects/release-pkg/share/man/man9/sx.9 projects/release-pkg/share/misc/bsd-family-tree projects/release-pkg/share/misc/pci_vendors projects/release-pkg/share/mk/bsd.README projects/release-pkg/share/mk/bsd.clang-analyze.mk projects/release-pkg/share/mk/bsd.cpu.mk projects/release-pkg/share/mk/bsd.dep.mk projects/release-pkg/share/mk/bsd.lib.mk projects/release-pkg/share/mk/bsd.opts.mk projects/release-pkg/share/mk/bsd.prog.mk projects/release-pkg/share/mk/bsd.progs.mk projects/release-pkg/share/mk/bsd.sys.mk projects/release-pkg/share/mk/dirdeps.mk projects/release-pkg/share/mk/local.dirdeps.mk projects/release-pkg/share/mk/local.meta.sys.mk projects/release-pkg/share/mk/local.sys.mk projects/release-pkg/share/mk/meta.stage.mk projects/release-pkg/share/mk/src.opts.mk projects/release-pkg/sys/amd64/amd64/sys_machdep.c projects/release-pkg/sys/amd64/amd64/vm_machdep.c projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/release-pkg/sys/amd64/conf/GENERIC.hints projects/release-pkg/sys/amd64/include/intr_machdep.h projects/release-pkg/sys/amd64/include/md_var.h projects/release-pkg/sys/amd64/linux32/linux32_dummy.c projects/release-pkg/sys/amd64/linux32/linux32_proto.h projects/release-pkg/sys/amd64/linux32/linux32_syscall.h projects/release-pkg/sys/amd64/linux32/linux32_syscalls.c projects/release-pkg/sys/amd64/linux32/linux32_sysent.c projects/release-pkg/sys/amd64/linux32/linux32_systrace_args.c projects/release-pkg/sys/amd64/linux32/syscalls.master projects/release-pkg/sys/arm/allwinner/a10_gpio.c projects/release-pkg/sys/arm/allwinner/a10_hdmi.c projects/release-pkg/sys/arm/allwinner/a10_mmc.c projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c projects/release-pkg/sys/arm/amlogic/aml8726/aml8726_mmc.c projects/release-pkg/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c projects/release-pkg/sys/arm/arm/gic.c projects/release-pkg/sys/arm/arm/machdep.c projects/release-pkg/sys/arm/arm/machdep_intr.c projects/release-pkg/sys/arm/arm/mp_machdep.c projects/release-pkg/sys/arm/arm/nexus.c projects/release-pkg/sys/arm/arm/vm_machdep.c projects/release-pkg/sys/arm/at91/at91.c projects/release-pkg/sys/arm/at91/at91_mci.c projects/release-pkg/sys/arm/at91/at91_pinctrl.c projects/release-pkg/sys/arm/at91/board_tsc4370.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/release-pkg/sys/arm/broadcom/bcm2835/std.rpi projects/release-pkg/sys/arm/cavium/cns11xx/econa.c projects/release-pkg/sys/arm/conf/A10 projects/release-pkg/sys/arm/conf/A20 projects/release-pkg/sys/arm/conf/ARMADA38X projects/release-pkg/sys/arm/conf/ATMEL projects/release-pkg/sys/arm/conf/BEAGLEBONE projects/release-pkg/sys/arm/conf/CNS11XXNAS projects/release-pkg/sys/arm/conf/EFIKA_MX projects/release-pkg/sys/arm/conf/ETHERNUT5 projects/release-pkg/sys/arm/conf/IMX53 projects/release-pkg/sys/arm/conf/NOTES projects/release-pkg/sys/arm/conf/RK3188 projects/release-pkg/sys/arm/conf/SAM9260EK projects/release-pkg/sys/arm/conf/std.arm projects/release-pkg/sys/arm/conf/std.armv6 projects/release-pkg/sys/arm/freescale/imx/imx_gpio.c projects/release-pkg/sys/arm/freescale/imx/imx_sdhci.c projects/release-pkg/sys/arm/include/atags.h projects/release-pkg/sys/arm/include/intr.h projects/release-pkg/sys/arm/include/machdep.h projects/release-pkg/sys/arm/include/smp.h projects/release-pkg/sys/arm/lpc/lpc_mmc.c projects/release-pkg/sys/arm/mv/files.mv projects/release-pkg/sys/arm/mv/mpic.c projects/release-pkg/sys/arm/mv/mv_localbus.c projects/release-pkg/sys/arm/ti/aintc.c projects/release-pkg/sys/arm/ti/am335x/am335x_prcm.c projects/release-pkg/sys/arm/ti/cpsw/if_cpsw.c projects/release-pkg/sys/arm/ti/cpsw/if_cpswreg.h projects/release-pkg/sys/arm/ti/cpsw/if_cpswvar.h projects/release-pkg/sys/arm/ti/files.ti projects/release-pkg/sys/arm/ti/omap4/omap4_gpio.c projects/release-pkg/sys/arm/ti/omap4/omap4_wugen.c projects/release-pkg/sys/arm/ti/ti_adc.c projects/release-pkg/sys/arm/ti/ti_gpio.c projects/release-pkg/sys/arm/ti/ti_gpio.h projects/release-pkg/sys/arm/ti/ti_hwmods.c projects/release-pkg/sys/arm/ti/ti_prcm.h projects/release-pkg/sys/arm/ti/ti_sdhci.c projects/release-pkg/sys/arm/xscale/ixp425/avila_ata.c projects/release-pkg/sys/arm/xscale/ixp425/ixp425.c projects/release-pkg/sys/arm/xscale/pxa/pxa_obio.c projects/release-pkg/sys/arm/xscale/pxa/pxa_smi.c projects/release-pkg/sys/arm64/arm64/copyinout.S projects/release-pkg/sys/arm64/arm64/exception.S projects/release-pkg/sys/arm64/arm64/genassym.c projects/release-pkg/sys/arm64/arm64/gic.c projects/release-pkg/sys/arm64/arm64/intr_machdep.c projects/release-pkg/sys/arm64/arm64/locore.S projects/release-pkg/sys/arm64/arm64/machdep.c projects/release-pkg/sys/arm64/arm64/minidump_machdep.c projects/release-pkg/sys/arm64/arm64/mp_machdep.c projects/release-pkg/sys/arm64/arm64/nexus.c projects/release-pkg/sys/arm64/arm64/pmap.c projects/release-pkg/sys/arm64/arm64/support.S projects/release-pkg/sys/arm64/arm64/swtch.S projects/release-pkg/sys/arm64/arm64/vm_machdep.c projects/release-pkg/sys/arm64/cloudabi64/cloudabi64_sysvec.c projects/release-pkg/sys/arm64/include/armreg.h projects/release-pkg/sys/arm64/include/cpu.h projects/release-pkg/sys/arm64/include/intr.h projects/release-pkg/sys/arm64/include/machdep.h projects/release-pkg/sys/arm64/include/pcb.h projects/release-pkg/sys/arm64/include/pmap.h projects/release-pkg/sys/arm64/include/pte.h projects/release-pkg/sys/arm64/include/smp.h projects/release-pkg/sys/arm64/include/vmparam.h projects/release-pkg/sys/boot/Makefile.amd64 projects/release-pkg/sys/boot/Makefile.i386 projects/release-pkg/sys/boot/common/dev_net.c projects/release-pkg/sys/boot/common/disk.c projects/release-pkg/sys/boot/common/disk.h projects/release-pkg/sys/boot/common/gpt.c projects/release-pkg/sys/boot/common/gpt.h projects/release-pkg/sys/boot/efi/Makefile projects/release-pkg/sys/boot/fdt/dts/arm/bcm2836.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/beaglebone-black.dts projects/release-pkg/sys/boot/i386/boot0/Makefile projects/release-pkg/sys/boot/i386/boot2/Makefile projects/release-pkg/sys/boot/i386/btx/btx/Makefile projects/release-pkg/sys/boot/i386/btx/btxldr/Makefile projects/release-pkg/sys/boot/i386/cdboot/Makefile projects/release-pkg/sys/boot/i386/common/bootargs.h projects/release-pkg/sys/boot/i386/common/cons.c projects/release-pkg/sys/boot/i386/common/drv.c projects/release-pkg/sys/boot/i386/common/drv.h projects/release-pkg/sys/boot/i386/gptboot/Makefile projects/release-pkg/sys/boot/i386/gptboot/Makefile.depend projects/release-pkg/sys/boot/i386/gptboot/gptboot.c projects/release-pkg/sys/boot/i386/gptzfsboot/Makefile projects/release-pkg/sys/boot/i386/gptzfsboot/Makefile.depend projects/release-pkg/sys/boot/i386/libi386/Makefile projects/release-pkg/sys/boot/i386/libi386/Makefile.depend projects/release-pkg/sys/boot/i386/libi386/biosdisk.c projects/release-pkg/sys/boot/i386/libi386/pxe.c projects/release-pkg/sys/boot/i386/loader/Makefile projects/release-pkg/sys/boot/i386/loader/Makefile.depend projects/release-pkg/sys/boot/i386/loader/main.c projects/release-pkg/sys/boot/i386/pxeldr/Makefile projects/release-pkg/sys/boot/i386/zfsboot/Makefile projects/release-pkg/sys/boot/i386/zfsboot/zfsboot.c projects/release-pkg/sys/boot/i386/zfsloader/Makefile.depend projects/release-pkg/sys/boot/pc98/boot2/Makefile projects/release-pkg/sys/boot/pc98/btx/btx/Makefile projects/release-pkg/sys/boot/pc98/btx/btxldr/Makefile projects/release-pkg/sys/boot/pc98/cdboot/Makefile projects/release-pkg/sys/boot/zfs/libzfs.h projects/release-pkg/sys/cam/ata/ata_da.c projects/release-pkg/sys/cam/cam_ccb.h projects/release-pkg/sys/cam/scsi/scsi_ch.c projects/release-pkg/sys/cam/scsi/scsi_da.c projects/release-pkg/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/release-pkg/sys/cddl/compat/opensolaris/sys/vfs.h projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/release-pkg/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/arm/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/release-pkg/sys/compat/cloudabi/cloudabi_clock.c projects/release-pkg/sys/compat/cloudabi/cloudabi_errno.c projects/release-pkg/sys/compat/cloudabi/cloudabi_fd.c projects/release-pkg/sys/compat/cloudabi/cloudabi_file.c projects/release-pkg/sys/compat/cloudabi/cloudabi_futex.c projects/release-pkg/sys/compat/cloudabi/cloudabi_mem.c projects/release-pkg/sys/compat/cloudabi/cloudabi_proc.c projects/release-pkg/sys/compat/cloudabi/cloudabi_proto.h projects/release-pkg/sys/compat/cloudabi/cloudabi_sock.c projects/release-pkg/sys/compat/cloudabi/cloudabi_thread.c projects/release-pkg/sys/compat/cloudabi/cloudabi_util.h projects/release-pkg/sys/compat/cloudabi64/Makefile projects/release-pkg/sys/compat/cloudabi64/cloudabi64_fd.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_module.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_poll.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_proto.h projects/release-pkg/sys/compat/cloudabi64/cloudabi64_sock.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_syscall.h projects/release-pkg/sys/compat/cloudabi64/cloudabi64_syscalls.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_sysent.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_systrace_args.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_thread.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_util.h projects/release-pkg/sys/compat/freebsd32/freebsd32_misc.c projects/release-pkg/sys/compat/linux/linux_event.c projects/release-pkg/sys/compat/linux/linux_mib.c projects/release-pkg/sys/compat/linux/linux_misc.c projects/release-pkg/sys/compat/linux/linux_socket.c projects/release-pkg/sys/compat/linux/linux_stats.c projects/release-pkg/sys/compat/linuxkpi/common/include/linux/bitops.h projects/release-pkg/sys/compat/linuxkpi/common/include/linux/jiffies.h projects/release-pkg/sys/compat/linuxkpi/common/include/linux/list.h projects/release-pkg/sys/compat/linuxkpi/common/include/linux/wait.h projects/release-pkg/sys/compat/linuxkpi/common/src/linux_compat.c projects/release-pkg/sys/compat/ndis/kern_ndis.c projects/release-pkg/sys/conf/NOTES projects/release-pkg/sys/conf/files projects/release-pkg/sys/conf/files.amd64 projects/release-pkg/sys/conf/files.arm projects/release-pkg/sys/conf/files.arm64 projects/release-pkg/sys/conf/files.i386 projects/release-pkg/sys/conf/files.mips projects/release-pkg/sys/conf/files.pc98 projects/release-pkg/sys/conf/files.powerpc projects/release-pkg/sys/conf/files.sparc64 projects/release-pkg/sys/conf/kern.opts.mk projects/release-pkg/sys/conf/kern.post.mk projects/release-pkg/sys/conf/kern.pre.mk projects/release-pkg/sys/conf/kmod.mk projects/release-pkg/sys/contrib/rdma/krping/krping.c projects/release-pkg/sys/ddb/db_ps.c projects/release-pkg/sys/dev/acpica/acpi.c projects/release-pkg/sys/dev/acpica/acpi_hpet.c projects/release-pkg/sys/dev/acpica/acpi_timer.c projects/release-pkg/sys/dev/advansys/adv_isa.c projects/release-pkg/sys/dev/ahci/ahci.c projects/release-pkg/sys/dev/ahci/ahci.h projects/release-pkg/sys/dev/ahci/ahci_pci.c projects/release-pkg/sys/dev/amdsbwd/amdsbwd.c projects/release-pkg/sys/dev/arcmsr/arcmsr.c projects/release-pkg/sys/dev/ata/ata-lowlevel.c projects/release-pkg/sys/dev/ath/if_ath_lna_div.c projects/release-pkg/sys/dev/atkbdc/atkbdc_subr.c projects/release-pkg/sys/dev/bhnd/bhnd.c projects/release-pkg/sys/dev/bhnd/bhndb/bhndb.c projects/release-pkg/sys/dev/bwn/if_bwn.c projects/release-pkg/sys/dev/bxe/bxe.c projects/release-pkg/sys/dev/bxe/bxe.h projects/release-pkg/sys/dev/cardbus/cardbus_cis.c projects/release-pkg/sys/dev/ctau/if_ct.c projects/release-pkg/sys/dev/cxgb/cxgb_sge.c projects/release-pkg/sys/dev/cxgbe/adapter.h projects/release-pkg/sys/dev/cxgbe/common/t4_hw.c projects/release-pkg/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/release-pkg/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/cm.c projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/cq.c projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/mem.c projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/qp.c projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/t4.h projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/user.h projects/release-pkg/sys/dev/cxgbe/offload.h projects/release-pkg/sys/dev/cxgbe/t4_main.c projects/release-pkg/sys/dev/cxgbe/t4_sge.c projects/release-pkg/sys/dev/drm2/i915/i915_gem.c projects/release-pkg/sys/dev/drm2/i915/intel_pm.c projects/release-pkg/sys/dev/drm2/ttm/ttm_bo_vm.c projects/release-pkg/sys/dev/e1000/if_igb.c projects/release-pkg/sys/dev/e1000/if_igb.h projects/release-pkg/sys/dev/ed/if_ed_3c503.c projects/release-pkg/sys/dev/ed/if_ed_cbus.c projects/release-pkg/sys/dev/extres/clk/clk.c projects/release-pkg/sys/dev/extres/clk/clk.h projects/release-pkg/sys/dev/extres/clk/clk_div.c projects/release-pkg/sys/dev/extres/clk/clk_fixed.c projects/release-pkg/sys/dev/extres/clk/clk_fixed.h projects/release-pkg/sys/dev/extres/clk/clk_gate.c projects/release-pkg/sys/dev/extres/clk/clk_mux.c projects/release-pkg/sys/dev/extres/clk/clkdev_if.m projects/release-pkg/sys/dev/fdt/fdt_common.c projects/release-pkg/sys/dev/fdt/fdt_common.h projects/release-pkg/sys/dev/fdt/simplebus.c projects/release-pkg/sys/dev/filemon/filemon.c projects/release-pkg/sys/dev/filemon/filemon_wrapper.c projects/release-pkg/sys/dev/flash/mx25l.c projects/release-pkg/sys/dev/flash/mx25lreg.h projects/release-pkg/sys/dev/gpio/gpiobus.c projects/release-pkg/sys/dev/gpio/ofw_gpiobus.c projects/release-pkg/sys/dev/hyperv/include/hyperv.h projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/utilities/hv_heartbeat.c projects/release-pkg/sys/dev/hyperv/utilities/hv_kvp.c projects/release-pkg/sys/dev/hyperv/utilities/hv_shutdown.c projects/release-pkg/sys/dev/hyperv/utilities/hv_timesync.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_connection.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_et.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_hv.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/release-pkg/sys/dev/ichwd/ichwd.c projects/release-pkg/sys/dev/iicbus/iicbus.c projects/release-pkg/sys/dev/iir/iir.c projects/release-pkg/sys/dev/iir/iir_pci.c projects/release-pkg/sys/dev/ipmi/ipmi.c projects/release-pkg/sys/dev/isci/isci_controller.c projects/release-pkg/sys/dev/isci/isci_io_request.c projects/release-pkg/sys/dev/iscsi/iscsi.c projects/release-pkg/sys/dev/iwn/if_iwn.c projects/release-pkg/sys/dev/ixgbe/if_ix.c projects/release-pkg/sys/dev/ixgbe/ix_txrx.c projects/release-pkg/sys/dev/ixl/ixl_txrx.c projects/release-pkg/sys/dev/le/lebuffer_sbus.c projects/release-pkg/sys/dev/mca/mca_bus.c projects/release-pkg/sys/dev/mfi/mfi.c projects/release-pkg/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/release-pkg/sys/dev/mmc/host/dwmmc.c projects/release-pkg/sys/dev/mmc/mmc.c projects/release-pkg/sys/dev/mmc/mmcreg.h projects/release-pkg/sys/dev/mvs/mvs_pci.c projects/release-pkg/sys/dev/mvs/mvs_soc.c projects/release-pkg/sys/dev/mxge/if_mxge.c projects/release-pkg/sys/dev/ncr/ncr.c projects/release-pkg/sys/dev/netmap/netmap_generic.c projects/release-pkg/sys/dev/oce/oce_if.c projects/release-pkg/sys/dev/ofw/ofw_iicbus.c projects/release-pkg/sys/dev/ofw/ofwbus.c projects/release-pkg/sys/dev/pccard/pccard.c projects/release-pkg/sys/dev/pccard/pccard_cis.c projects/release-pkg/sys/dev/pccbb/pccbb.c projects/release-pkg/sys/dev/pccbb/pccbb_pci.c projects/release-pkg/sys/dev/pci/pci.c projects/release-pkg/sys/dev/pci/pci_host_generic.c projects/release-pkg/sys/dev/pci/pci_pci.c projects/release-pkg/sys/dev/pci/pci_subr.c projects/release-pkg/sys/dev/ppbus/vpo.c projects/release-pkg/sys/dev/ppc/ppc.c projects/release-pkg/sys/dev/proto/proto_bus_isa.c projects/release-pkg/sys/dev/qlxgb/qla_isr.c projects/release-pkg/sys/dev/qlxge/qls_isr.c projects/release-pkg/sys/dev/random/random_harvestq.c projects/release-pkg/sys/dev/sdhci/sdhci_fdt.c projects/release-pkg/sys/dev/sdhci/sdhci_pci.c projects/release-pkg/sys/dev/sfxge/sfxge_mcdi.c projects/release-pkg/sys/dev/sfxge/sfxge_nvram.c projects/release-pkg/sys/dev/siba/siba.c projects/release-pkg/sys/dev/siis/siis.c projects/release-pkg/sys/dev/sound/isa/ad1816.c projects/release-pkg/sys/dev/sound/isa/ess.c projects/release-pkg/sys/dev/sound/isa/mss.c projects/release-pkg/sys/dev/sound/isa/sb16.c projects/release-pkg/sys/dev/sound/isa/sb8.c projects/release-pkg/sys/dev/sound/pci/als4000.c projects/release-pkg/sys/dev/sound/pci/atiixp.c projects/release-pkg/sys/dev/sound/pci/aureal.c projects/release-pkg/sys/dev/sound/pci/cmi.c projects/release-pkg/sys/dev/sound/pci/cs4281.c projects/release-pkg/sys/dev/sound/pci/csapcm.c projects/release-pkg/sys/dev/sound/pci/ds1.c projects/release-pkg/sys/dev/sound/pci/emu10k1.c projects/release-pkg/sys/dev/sound/pci/emu10kx.c projects/release-pkg/sys/dev/sound/pci/envy24.c projects/release-pkg/sys/dev/sound/pci/envy24ht.c projects/release-pkg/sys/dev/sound/pci/es137x.c projects/release-pkg/sys/dev/sound/pci/fm801.c projects/release-pkg/sys/dev/sound/pci/hda/hdac.c projects/release-pkg/sys/dev/sound/pci/hda/hdac.h projects/release-pkg/sys/dev/sound/pci/hdspe-pcm.c projects/release-pkg/sys/dev/sound/pci/ich.c projects/release-pkg/sys/dev/sound/pci/maestro.c projects/release-pkg/sys/dev/sound/pci/maestro3.c projects/release-pkg/sys/dev/sound/pci/neomagic.c projects/release-pkg/sys/dev/sound/pci/solo.c projects/release-pkg/sys/dev/sound/pci/t4dwave.c projects/release-pkg/sys/dev/sound/pci/via8233.c projects/release-pkg/sys/dev/sound/pci/via82c686.c projects/release-pkg/sys/dev/sound/pci/vibes.c projects/release-pkg/sys/dev/uart/uart_dev_ns8250.c projects/release-pkg/sys/dev/usb/controller/ehci_pci.c projects/release-pkg/sys/dev/usb/controller/ohci_pci.c projects/release-pkg/sys/dev/usb/controller/uhci_pci.c projects/release-pkg/sys/dev/usb/controller/xhci_pci.c projects/release-pkg/sys/dev/usb/usb_busdma.c projects/release-pkg/sys/dev/usb/usbdevs projects/release-pkg/sys/dev/usb/video/udl.c projects/release-pkg/sys/dev/usb/wlan/if_rum.c projects/release-pkg/sys/dev/usb/wlan/if_rumreg.h projects/release-pkg/sys/dev/usb/wlan/if_rumvar.h projects/release-pkg/sys/dev/vnic/nic_main.c projects/release-pkg/sys/dev/vnic/nicvf_main.c projects/release-pkg/sys/dev/vnic/nicvf_queues.c projects/release-pkg/sys/dev/vnic/nicvf_queues.h projects/release-pkg/sys/dev/vnic/thunder_bgx_fdt.c projects/release-pkg/sys/dev/vt/hw/vga/vt_vga.c projects/release-pkg/sys/dev/vxge/vxge.c projects/release-pkg/sys/dev/wbwd/wbwd.c projects/release-pkg/sys/dev/wl/if_wl.c projects/release-pkg/sys/dev/wpi/if_wpi.c projects/release-pkg/sys/dev/wpi/if_wpivar.h projects/release-pkg/sys/dev/xe/if_xe.c projects/release-pkg/sys/dev/xe/if_xe_pccard.c projects/release-pkg/sys/dev/xen/blkfront/blkfront.c projects/release-pkg/sys/dev/xen/blkfront/block.h projects/release-pkg/sys/dev/xen/netfront/netfront.c projects/release-pkg/sys/fs/autofs/autofs.c projects/release-pkg/sys/fs/autofs/autofs.h projects/release-pkg/sys/fs/autofs/autofs_vfsops.c projects/release-pkg/sys/fs/autofs/autofs_vnops.c projects/release-pkg/sys/fs/cd9660/cd9660_vnops.c projects/release-pkg/sys/fs/ext2fs/ext2_alloc.c projects/release-pkg/sys/fs/ext2fs/ext2_dinode.h projects/release-pkg/sys/fs/ext2fs/ext2fs.h projects/release-pkg/sys/geom/sched/g_sched.c projects/release-pkg/sys/i386/conf/GENERIC.hints projects/release-pkg/sys/i386/i386/vm_machdep.c projects/release-pkg/sys/i386/include/intr_machdep.h projects/release-pkg/sys/i386/include/md_var.h projects/release-pkg/sys/i386/linux/linux_dummy.c projects/release-pkg/sys/i386/linux/linux_proto.h projects/release-pkg/sys/i386/linux/linux_syscall.h projects/release-pkg/sys/i386/linux/linux_syscalls.c projects/release-pkg/sys/i386/linux/linux_sysent.c projects/release-pkg/sys/i386/linux/linux_systrace_args.c projects/release-pkg/sys/i386/linux/syscalls.master projects/release-pkg/sys/isa/isa_common.c projects/release-pkg/sys/kern/imgact_binmisc.c projects/release-pkg/sys/kern/imgact_elf.c projects/release-pkg/sys/kern/init_sysent.c projects/release-pkg/sys/kern/kern_condvar.c projects/release-pkg/sys/kern/kern_descrip.c projects/release-pkg/sys/kern/kern_exec.c projects/release-pkg/sys/kern/kern_fail.c projects/release-pkg/sys/kern/kern_linker.c projects/release-pkg/sys/kern/kern_mbuf.c projects/release-pkg/sys/kern/kern_osd.c projects/release-pkg/sys/kern/kern_racct.c projects/release-pkg/sys/kern/kern_rctl.c projects/release-pkg/sys/kern/kern_sendfile.c projects/release-pkg/sys/kern/kern_synch.c projects/release-pkg/sys/kern/pic_if.m projects/release-pkg/sys/kern/subr_bus.c projects/release-pkg/sys/kern/subr_counter.c projects/release-pkg/sys/kern/subr_intr.c projects/release-pkg/sys/kern/subr_rman.c projects/release-pkg/sys/kern/subr_sleepqueue.c projects/release-pkg/sys/kern/subr_smp.c projects/release-pkg/sys/kern/sys_generic.c projects/release-pkg/sys/kern/syscalls.c projects/release-pkg/sys/kern/syscalls.master projects/release-pkg/sys/kern/systrace_args.c projects/release-pkg/sys/kern/uipc_mbuf.c projects/release-pkg/sys/kern/uipc_socket.c projects/release-pkg/sys/kern/vfs_aio.c projects/release-pkg/sys/kern/vfs_export.c projects/release-pkg/sys/kern/vfs_mountroot.c projects/release-pkg/sys/mips/atheros/apb.c projects/release-pkg/sys/mips/beri/beri_simplebus.c projects/release-pkg/sys/mips/mips/mips_pic.c projects/release-pkg/sys/mips/mips/nexus.c projects/release-pkg/sys/mips/nlm/xlp_pci.c projects/release-pkg/sys/mips/nlm/xlp_simplebus.c projects/release-pkg/sys/mips/rmi/iodi.c projects/release-pkg/sys/mips/rmi/xlr_pci.c projects/release-pkg/sys/mips/rt305x/obio.c projects/release-pkg/sys/modules/Makefile projects/release-pkg/sys/modules/pflog/Makefile projects/release-pkg/sys/modules/pfsync/Makefile projects/release-pkg/sys/modules/usb/Makefile projects/release-pkg/sys/modules/wtap/Makefile projects/release-pkg/sys/net/ethernet.h projects/release-pkg/sys/net/if_debug.c projects/release-pkg/sys/net/route.c projects/release-pkg/sys/net/route.h projects/release-pkg/sys/net/route_var.h projects/release-pkg/sys/net/rtsock.c projects/release-pkg/sys/net80211/ieee80211.h projects/release-pkg/sys/net80211/ieee80211_amrr.c projects/release-pkg/sys/net80211/ieee80211_dfs.c projects/release-pkg/sys/net80211/ieee80211_freebsd.h projects/release-pkg/sys/net80211/ieee80211_ht.c projects/release-pkg/sys/net80211/ieee80211_hwmp.c projects/release-pkg/sys/net80211/ieee80211_input.c projects/release-pkg/sys/net80211/ieee80211_ioctl.h projects/release-pkg/sys/net80211/ieee80211_node.c projects/release-pkg/sys/net80211/ieee80211_power.c projects/release-pkg/sys/net80211/ieee80211_proto.c projects/release-pkg/sys/net80211/ieee80211_ratectl.c projects/release-pkg/sys/net80211/ieee80211_ratectl.h projects/release-pkg/sys/net80211/ieee80211_scan_sta.c projects/release-pkg/sys/net80211/ieee80211_scan_sw.c projects/release-pkg/sys/net80211/ieee80211_sta.c projects/release-pkg/sys/net80211/ieee80211_wds.c projects/release-pkg/sys/netinet/in_pcb.c projects/release-pkg/sys/netinet/in_pcb.h projects/release-pkg/sys/netinet/in_pcbgroup.c projects/release-pkg/sys/netinet/ip_output.c projects/release-pkg/sys/netinet/sctp_cc_functions.c projects/release-pkg/sys/netinet/sctp_constants.h projects/release-pkg/sys/netinet/sctp_indata.c projects/release-pkg/sys/netinet/sctp_input.c projects/release-pkg/sys/netinet/sctp_output.c projects/release-pkg/sys/netinet/sctp_pcb.c projects/release-pkg/sys/netinet/sctp_ss_functions.c projects/release-pkg/sys/netinet/sctp_timer.c projects/release-pkg/sys/netinet/sctp_usrreq.c projects/release-pkg/sys/netinet/sctputil.c projects/release-pkg/sys/netinet/sctputil.h projects/release-pkg/sys/netinet/tcp_input.c projects/release-pkg/sys/netinet/tcp_lro.c projects/release-pkg/sys/netinet/tcp_lro.h projects/release-pkg/sys/netinet/tcp_output.c projects/release-pkg/sys/netinet/tcp_subr.c projects/release-pkg/sys/netinet/tcp_syncache.c projects/release-pkg/sys/netinet/tcp_timer.c projects/release-pkg/sys/netinet/tcp_timewait.c projects/release-pkg/sys/netinet/tcp_usrreq.c projects/release-pkg/sys/netinet/tcp_var.h projects/release-pkg/sys/netinet/udp_usrreq.c projects/release-pkg/sys/netinet6/in6.c projects/release-pkg/sys/netinet6/in6_ifattach.c projects/release-pkg/sys/netinet6/in6_ifattach.h projects/release-pkg/sys/netinet6/in6_pcb.c projects/release-pkg/sys/netinet6/in6_pcbgroup.c projects/release-pkg/sys/netinet6/in6_src.c projects/release-pkg/sys/netinet6/ip6_input.c projects/release-pkg/sys/netinet6/ip6_output.c projects/release-pkg/sys/netinet6/nd6.c projects/release-pkg/sys/netinet6/nd6.h projects/release-pkg/sys/netinet6/nd6_nbr.c projects/release-pkg/sys/netinet6/nd6_rtr.c projects/release-pkg/sys/netinet6/udp6_usrreq.c projects/release-pkg/sys/netipsec/ipsec_output.c projects/release-pkg/sys/netpfil/pf/pf.c projects/release-pkg/sys/nfs/bootp_subr.c projects/release-pkg/sys/nfs/nfs_diskless.c projects/release-pkg/sys/ofed/drivers/infiniband/core/iwcm.c projects/release-pkg/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/release-pkg/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/release-pkg/sys/ofed/drivers/net/mlx4/en_port.c projects/release-pkg/sys/ofed/drivers/net/mlx4/en_rx.c projects/release-pkg/sys/ofed/drivers/net/mlx4/en_tx.c projects/release-pkg/sys/pc98/pc98/canbus.c projects/release-pkg/sys/powerpc/include/bus.h projects/release-pkg/sys/powerpc/mpc85xx/fsl_sdhc.c projects/release-pkg/sys/powerpc/mpc85xx/lbc.c projects/release-pkg/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/release-pkg/sys/powerpc/ofw/ofw_pci.c projects/release-pkg/sys/powerpc/powermac/cpcht.c projects/release-pkg/sys/powerpc/powermac/grackle.c projects/release-pkg/sys/powerpc/powermac/macgpio.c projects/release-pkg/sys/powerpc/powermac/macio.c projects/release-pkg/sys/powerpc/powermac/uninorth.c projects/release-pkg/sys/powerpc/powermac/uninorthpci.c projects/release-pkg/sys/powerpc/powermac/uninorthvar.h projects/release-pkg/sys/powerpc/powerpc/nexus.c projects/release-pkg/sys/powerpc/ps3/ps3bus.c projects/release-pkg/sys/powerpc/pseries/rtas_pci.c projects/release-pkg/sys/powerpc/pseries/vdevice.c projects/release-pkg/sys/powerpc/psim/iobus.c projects/release-pkg/sys/rpc/rpc_generic.c projects/release-pkg/sys/rpc/svc.c projects/release-pkg/sys/sparc64/central/central.c projects/release-pkg/sys/sparc64/ebus/ebus.c projects/release-pkg/sys/sparc64/fhc/fhc.c projects/release-pkg/sys/sparc64/pci/apb.c projects/release-pkg/sys/sparc64/sbus/dma_sbus.c projects/release-pkg/sys/sparc64/sbus/sbus.c projects/release-pkg/sys/sparc64/sparc64/nexus.c projects/release-pkg/sys/sparc64/sparc64/upa.c projects/release-pkg/sys/sys/_types.h projects/release-pkg/sys/sys/aio.h projects/release-pkg/sys/sys/bus.h projects/release-pkg/sys/sys/fail.h projects/release-pkg/sys/sys/file.h projects/release-pkg/sys/sys/intr.h projects/release-pkg/sys/sys/libkern.h projects/release-pkg/sys/sys/mbuf.h projects/release-pkg/sys/sys/osd.h projects/release-pkg/sys/sys/param.h projects/release-pkg/sys/sys/proc.h projects/release-pkg/sys/sys/racct.h projects/release-pkg/sys/sys/sleepqueue.h projects/release-pkg/sys/sys/smp.h projects/release-pkg/sys/sys/socket.h projects/release-pkg/sys/sys/syscall.h projects/release-pkg/sys/sys/syscall.mk projects/release-pkg/sys/sys/sysctl.h projects/release-pkg/sys/sys/sysproto.h projects/release-pkg/sys/sys/systm.h projects/release-pkg/sys/ufs/ffs/ffs_alloc.c projects/release-pkg/sys/ufs/ffs/ffs_softdep.c projects/release-pkg/sys/ufs/ffs/ffs_vfsops.c projects/release-pkg/sys/ufs/ufs/ufs_extattr.c projects/release-pkg/sys/ufs/ufs/ufsmount.h projects/release-pkg/sys/x86/include/apicreg.h projects/release-pkg/sys/x86/include/specialreg.h projects/release-pkg/sys/x86/include/x86_var.h projects/release-pkg/sys/x86/x86/intr_machdep.c projects/release-pkg/sys/x86/x86/io_apic.c projects/release-pkg/sys/x86/x86/local_apic.c projects/release-pkg/sys/x86/x86/mp_x86.c projects/release-pkg/sys/x86/x86/nexus.c projects/release-pkg/targets/Makefile.xtras projects/release-pkg/targets/pseudo/userland/misc/Makefile.depend projects/release-pkg/tests/sys/aio/aio_test.c projects/release-pkg/tests/sys/geom/class/geom_subr.sh projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc projects/release-pkg/tools/build/options/WITH_CCACHE_BUILD projects/release-pkg/tools/tinder.sh projects/release-pkg/tools/tools/nanobsd/defaults.sh projects/release-pkg/tools/tools/nanobsd/nanobsd.sh projects/release-pkg/tools/tools/net80211/wlanstats/main.c projects/release-pkg/tools/tools/net80211/wlanstats/wlanstats.c projects/release-pkg/usr.bin/bmake/Makefile projects/release-pkg/usr.bin/fetch/fetch.1 projects/release-pkg/usr.bin/finger/sprint.c projects/release-pkg/usr.bin/ktrace/ktrace.1 projects/release-pkg/usr.bin/localedef/ctype.c projects/release-pkg/usr.bin/netstat/inet.c projects/release-pkg/usr.bin/netstat/main.c projects/release-pkg/usr.bin/netstat/netstat.h projects/release-pkg/usr.bin/netstat/nlist_symbols projects/release-pkg/usr.bin/netstat/route.c projects/release-pkg/usr.bin/showmount/showmount.8 projects/release-pkg/usr.bin/showmount/showmount.c projects/release-pkg/usr.bin/truss/syscalls.c projects/release-pkg/usr.bin/vtfontcvt/vtfontcvt.c projects/release-pkg/usr.bin/whois/whois.c projects/release-pkg/usr.bin/xo/Makefile projects/release-pkg/usr.sbin/Makefile projects/release-pkg/usr.sbin/autofs/log.c projects/release-pkg/usr.sbin/bhyve/pci_emul.c projects/release-pkg/usr.sbin/bluetooth/bthidd/kbd.c projects/release-pkg/usr.sbin/bsdinstall/scripts/zfsboot projects/release-pkg/usr.sbin/ctld/log.c projects/release-pkg/usr.sbin/devinfo/devinfo.c projects/release-pkg/usr.sbin/iscsid/iscsid.c projects/release-pkg/usr.sbin/iscsid/log.c projects/release-pkg/usr.sbin/kbdcontrol/kbdcontrol.1 projects/release-pkg/usr.sbin/kbdcontrol/kbdcontrol.c projects/release-pkg/usr.sbin/mtest/mtest.c projects/release-pkg/usr.sbin/ndiscvt/ndisgen.sh projects/release-pkg/usr.sbin/pciconf/cap.c projects/release-pkg/usr.sbin/pw/cpdir.c projects/release-pkg/usr.sbin/pw/pw.8 projects/release-pkg/usr.sbin/pw/pw_user.c projects/release-pkg/usr.sbin/pw/pw_utils.c projects/release-pkg/usr.sbin/pw/pw_vpw.c projects/release-pkg/usr.sbin/sesutil/eltsub.c projects/release-pkg/usr.sbin/sesutil/sesutil.c projects/release-pkg/usr.sbin/uathload/Makefile projects/release-pkg/usr.sbin/uathload/uathload.c Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/cddl/ (props changed) projects/release-pkg/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/release-pkg/contrib/bmake/ (props changed) projects/release-pkg/contrib/byacc/ (props changed) projects/release-pkg/contrib/elftoolchain/ (props changed) projects/release-pkg/contrib/libc++/ (props changed) projects/release-pkg/contrib/libcxxrt/ (props changed) projects/release-pkg/contrib/libxo/ (props changed) projects/release-pkg/contrib/llvm/ (props changed) projects/release-pkg/gnu/lib/ (props changed) projects/release-pkg/include/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/lib/libc/stdtime/ (props changed) projects/release-pkg/lib/libz/ (props changed) projects/release-pkg/sbin/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/share/man/man4/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/dev/hyperv/ (props changed) projects/release-pkg/targets/ (props changed) projects/release-pkg/usr.sbin/bhyve/ (props changed) projects/release-pkg/usr.sbin/ndiscvt/ (props changed) Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/Makefile Mon Apr 4 23:55:32 2016 (r297567) @@ -124,7 +124,7 @@ TGTS= all all-man buildenv buildenvvars installworld kernel-toolchain libraries lint maninstall \ obj objlink rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend \ + _build-tools _cross-tools _includes _libraries \ build32 distribute32 install32 build32 distribute32 install32 \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools stageworld stagekernel stage-packages \ Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/Makefile.inc1 Mon Apr 4 23:55:32 2016 (r297567) @@ -7,10 +7,9 @@ # -DDB_FROM_SRC use the user/group databases in src/etc instead of # the system database when installing. # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel -# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_ROOT install without using root privilege @@ -145,16 +144,6 @@ CLEANDIR= clean cleandepend CLEANDIR= cleandir .endif -# FAST_DEPEND can skip depend tree-walks. -.if ${MK_FAST_DEPEND} == "yes" -NO_DEPEND= t -NO_KERNELDEPEND=t -.endif -# Ensure shell checks later have a value. -.if defined(NO_DEPEND) -NO_DEPEND= t -.endif - LOCAL_TOOL_DIRS?= PACKAGEDIR?= ${DESTDIR}/${DISTDIR} @@ -380,7 +369,6 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB # world stage WMAKEENV= ${CROSSENV} \ - _LDSCRIPTROOT= \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} @@ -427,22 +415,22 @@ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ - DEPFLAGS="${DEPFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ SIZE="${XSIZE}" -.if ${XCC:N${CCACHE_BIN}:M/*} -.if defined(CROSS_BINUTILS_PREFIX) +.if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX}) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a -# directory, but the compiler will look in the right place for it's +# directory, but the compiler will look in the right place for its # tools so we don't need to tell it where to look. -.if exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif -.else + +# External compiler needs sysroot and target flags. +.if ${XCC:N${CCACHE_BIN}:M/*} || ${MK_CROSS_COMPILER} == "no" +.if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" @@ -453,26 +441,23 @@ TARGET_ABI= gnueabi .endif .endif .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +# GCC requires -isystem and -L when using a cross-compiler. XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib -XCXXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++ -# XXX: DEPFLAGS is a workaround for not properly passing CXXFLAGS to sub-makes -# due to CXX="${XCXX} ${XCXXFLAGS}". bsd.dep.mk does use CXXFLAGS when -# building C++ files so this can come out if passing CXXFLAGS down is fixed. -DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 +# Force using libc++ for external GCC. +XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ + -nostdinc++ -L${WORLDTMP}/../lib/libc++ .else TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} .endif -XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} -XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCFLAGS+= --sysroot=${WORLDTMP} .else -.if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX}) -BFLAGS+= -B${CROSS_BINUTILS_PREFIX} +.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no" + +.if !empty(BFLAGS) XCFLAGS+= ${BFLAGS} -XCXXFLAGS+= ${BFLAGS} .endif -.endif # ${XCC:M/*} .if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \ ${TARGET_ARCH} == "powerpc64") @@ -645,9 +630,9 @@ _includes: # Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need # headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last. ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ - includes + MK_INCLUDES=yes includes .if !empty(SUBDIR_OVERRIDE) && make(buildworld) - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes + ${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes .endif _libraries: @echo @@ -657,16 +642,10 @@ _libraries: ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \ MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries -_depend: - @echo - @echo "--------------------------------------------------------------" - @echo ">>> stage 4.3: make dependencies" - @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} depend everything: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 4.4: building everything" + @echo ">>> stage 4.3: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all @@ -677,9 +656,6 @@ WMAKE_TGTS+= _bootstrap-tools .endif WMAKE_TGTS+= _cleanobj _obj _build-tools _cross-tools WMAKE_TGTS+= _includes _libraries -.if !defined(NO_DEPEND) -WMAKE_TGTS+= _depend -.endif WMAKE_TGTS+= everything .if defined(LIBCOMPAT) && empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= build${libcompat} @@ -722,7 +698,7 @@ buildenv: .PHONY @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \ || true -TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild${libcompat}} +TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} toolchain: ${TOOLCHAIN_TGTS} kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} @@ -1034,7 +1010,6 @@ distrib-dirs distribution: .MAKE .PHONY .if defined(KERNFAST) NO_KERNELCLEAN= t NO_KERNELCONFIG= t -NO_KERNELDEPEND= t NO_KERNELOBJ= t # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah .if !defined(KERNCONF) && ${KERNFAST} != "1" @@ -1116,16 +1091,9 @@ buildkernel: .MAKE .PHONY @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools -.if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 3.1: making dependencies" - @echo "--------------------------------------------------------------" - ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ -.endif - @echo - @echo "--------------------------------------------------------------" - @echo ">>> stage 3.2: building everything" + @echo ">>> stage 3.1: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @@ -1459,11 +1427,10 @@ legacy: false .endif .for _tool in tools/build ${_elftoolchain_libs} - ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1533,6 +1500,11 @@ _crunch= usr.sbin/crunch _awk= usr.bin/awk .endif +# r296926 -P keymap search path +.if ${BOOTSTRAPPING} < 1100103 +_kbdcontrol= usr.sbin/kbdcontrol +.endif + _yacc= lib/liby \ usr.bin/yacc @@ -1597,6 +1569,7 @@ bootstrap-tools: .PHONY ${_awk} \ ${_cat} \ ${_dd} \ + ${_kbdcontrol} \ usr.bin/lorder \ ${_libopenbsd} \ ${_makewhatis} \ @@ -1613,10 +1586,9 @@ bootstrap-tools: .PHONY ${_vtfontcvt} \ usr.bin/localedef ${_bt}-${_tool}: .PHONY .MAKE - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install @@ -1662,10 +1634,9 @@ build-tools: build-tools_${_tool} .for _tool in \ ${_gcc_tools} build-tools_${_tool}: .PHONY - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \ ${MAKE} DIRPRFX=${_tool}/ all build-tools: build-tools_${_tool} .endfor @@ -1746,10 +1717,9 @@ cross-tools: .MAKE .PHONY ${_btxld} \ ${_crunchide} \ ${_usb_tools} - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1778,10 +1748,9 @@ NXBMAKE= ${NXBENV} ${MAKE} \ native-xtools: .PHONY .if ${MK_GCC_BOOTSTRAP} != "no" mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin - ${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_gperf} (obj,all,install)"; \ cd ${.CURDIR}/${_gperf}; \ ${NXBMAKE} DIRPRFX=${_gperf}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_gperf}/ depend; fi; \ ${NXBMAKE} DIRPRFX=${_gperf}/ all; \ ${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install .endif @@ -1853,10 +1822,9 @@ native-xtools: .PHONY usr.bin/xz \ usr.bin/yacc \ usr.sbin/chown - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${NXBMAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_tool}/ depend; fi; \ ${NXBMAKE} DIRPRFX=${_tool}/ all; \ ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install .endfor @@ -2092,10 +2060,9 @@ gnu/lib/libdialog__L: lib/msun__L lib/nc .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) - ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \ @@ -2106,10 +2073,9 @@ ${_lib}__PL: .PHONY .MAKE .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) - ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_lib} (obj,all,install)"; \ cd ${.CURDIR}/${_lib}; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \ ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install .endif @@ -2119,10 +2085,9 @@ ${_lib}__L: .PHONY .MAKE # static PAM library, and dynamic PAM library before dynamic PAM # modules. lib/libpam__L: .PHONY .MAKE - ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> lib/libpam (obj,all,install)"; \ cd ${.CURDIR}/lib/libpam; \ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; fi; \ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \ @@ -2417,10 +2382,9 @@ _xb-bootstrap-tools: .PHONY .for _tool in \ ${_clang_tblgen} \ ${_gperf} - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all; \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -2437,10 +2401,9 @@ _xb-cross-tools: .PHONY ${_clang_libs} \ ${_clang} \ ${_cc} - ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ + ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor Modified: projects/release-pkg/Makefile.libcompat ============================================================================== --- projects/release-pkg/Makefile.libcompat Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/Makefile.libcompat Mon Apr 4 23:55:32 2016 (r297567) @@ -52,7 +52,8 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTF # Generic code for each type. # Set defaults based on type. libcompat= ${LIBCOMPAT:tl} -_LIBCOMPAT_MAKEVARS= _OBJTREE TMP CPUFLAGS CFLAGS WMAKEENV WMAKEFLAGS WMAKE +_LIBCOMPAT_MAKEVARS= _OBJTREE TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \ + WMAKEFLAGS WMAKE .for _var in ${_LIBCOMPAT_MAKEVARS} .if !empty(LIB${LIBCOMPAT}${_var}) LIBCOMPAT${_var}?= ${LIB${LIBCOMPAT}${_var}} @@ -64,22 +65,32 @@ LIBCOMPAT_OBJTREE?= ${OBJTREE}${.CURDIR} LIBCOMPATTMP?= ${OBJTREE}${.CURDIR}/lib${libcompat} LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ - -isystem ${LIBCOMPATTMP}/usr/include/ \ -L${LIBCOMPATTMP}/usr/lib${libcompat} \ - -B${LIBCOMPATTMP}/usr/lib${libcompat} + --sysroot=${LIBCOMPATTMP} \ + ${BFLAGS} + +# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for +# Clang/GCC. +LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} +# GCC requires -isystem when using a cross-compiler. +LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include + +.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +# Force using libc++ for external GCC. +LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ + -nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++ +.endif # Yes, the flags are redundant. LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \ - _LDSCRIPTROOT=${LIBCOMPATTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ LIBDIR=/usr/lib${libcompat} \ SHLIBDIR=/usr/lib${libcompat} \ DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}" LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ - CXX="${XCXX} ${LIBCOMPATCFLAGS}" \ + CXX="${XCXX} ${LIBCOMPATCFLAGS} ${LIBCOMPATCXXFLAGS}" \ DESTDIR=${LIBCOMPATTMP} \ - -DLIBRARIES_ONLY \ -DNO_CPU_CFLAGS \ MK_CTF=no \ -DNO_LINT \ @@ -87,17 +98,19 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCO LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \ - MK_TOOLCHAIN=no ${IMAKE_INSTALL} - -.if ${XCC:N${CCACHE_BIN}:M/*} -LIBCOMPATCFLAGS+= --sysroot=${WORLDTMP} -.endif + MK_TOOLCHAIN=no ${IMAKE_INSTALL} \ + -DLIBRARIES_ONLY _LC_LIBDIRS.yes= lib gnu/lib _LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib _LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib _LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib +_LC_INCDIRS= \ + include \ + lib/ncurses/ncursesw \ + ${_LC_LIBDIRS.yes} + # Shared logic build${libcompat}: .PHONY @echo @@ -120,13 +133,10 @@ build${libcompat}: .PHONY mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} .for _t in obj includes - ${_+_}cd ${.CURDIR}/include; ${LIBCOMPATWMAKE} DIRPRFX=include/ ${_t} -.for _dir in ${_LC_LIBDIRS.yes} - ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ ${_t} -.endfor +.for _dir in ${_LC_INCDIRS} + ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \ + DIRPRFX=${_dir}/ ${_t} .endfor -.for _dir in usr.bin/lex/lib - ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ obj .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic ${_+_}cd ${.CURDIR}/${_dir}; \ @@ -139,7 +149,7 @@ build${libcompat}: .PHONY ${_+_}cd ${.CURDIR}; \ ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries .if ${libcompat} == "32" -.for _t in obj depend all +.for _t in obj all ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \ -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t} ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \ Modified: projects/release-pkg/ObsoleteFiles.inc ============================================================================== --- projects/release-pkg/ObsoleteFiles.inc Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/ObsoleteFiles.inc Mon Apr 4 23:55:32 2016 (r297567) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20160317: rman_res_t size bump to uintmax_t +OLD_LIBS+=usr/lib/libdevinfo.so.5 +OLD_LIBS+=usr/lib32/libdevinfo.so.5 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0. OLD_FILES+=usr/bin/macho-dump OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h Modified: projects/release-pkg/UPDATING ============================================================================== --- projects/release-pkg/UPDATING Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/UPDATING Mon Apr 4 23:55:32 2016 (r297567) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160330: + The FAST_DEPEND build option has been removed and its functionality is + now the one true way. The old mkdep(1) style of 'make depend' has + been removed. See 20160311 for further details. + +20160317: + Resource range types have grown from unsigned long to uintmax_t. All + drivers, and anything using libdevinfo, need to be recompiled. + 20160311: WITH_FAST_DEPEND is now enabled by default for in-tree and out-of-tree builds. It no longer runs mkdep(1) during 'make depend', and the Modified: projects/release-pkg/bin/csh/Makefile ============================================================================== --- projects/release-pkg/bin/csh/Makefile Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/bin/csh/Makefile Mon Apr 4 23:55:32 2016 (r297567) @@ -141,7 +141,7 @@ tc.const.h: tc.const.c sh.char.h config. @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} @echo '#ifndef _h_tc_const' >> ${.TARGET} @echo '#define _h_tc_const' >> ${.TARGET} - ${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \ + ${CC:N${CCACHE_BIN}} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \ grep 'Char STR' | \ sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} Modified: projects/release-pkg/bin/freebsd-version/freebsd-version.1 ============================================================================== --- projects/release-pkg/bin/freebsd-version/freebsd-version.1 Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/bin/freebsd-version/freebsd-version.1 Mon Apr 4 23:55:32 2016 (r297567) @@ -110,8 +110,7 @@ env ROOT=/mnt /mnt/bin/freebsd-version - .Ed .Sh SEE ALSO .Xr uname 1 , -.Xr loader.conf 5 , -.Xr freebsd-version 8 +.Xr loader.conf 5 .Sh HISTORY The .Nm Modified: projects/release-pkg/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/release-pkg/bin/sh/tests/builtins/Makefile Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/bin/sh/tests/builtins/Makefile Mon Apr 4 23:55:32 2016 (r297567) @@ -152,6 +152,7 @@ FILES+= trap13.0 FILES+= trap14.0 FILES+= trap15.0 FILES+= trap16.0 +FILES+= trap17.0 FILES+= trap2.0 FILES+= trap3.0 FILES+= trap4.0 Copied: projects/release-pkg/bin/sh/tests/builtins/trap17.0 (from r297566, head/bin/sh/tests/builtins/trap17.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/bin/sh/tests/builtins/trap17.0 Mon Apr 4 23:55:32 2016 (r297567, copy of r297566, head/bin/sh/tests/builtins/trap17.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ +# This use-after-free bug probably needs non-default settings to show up. + +v1=nothing v2=nothing +trap 'trap "echo bad" USR1 +v1=trap_received +v2=trap_invoked +:' USR1 +kill -USR1 "$$" +[ "$v1.$v2" = trap_received.trap_invoked ] Modified: projects/release-pkg/bin/sh/trap.c ============================================================================== --- projects/release-pkg/bin/sh/trap.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/bin/sh/trap.c Mon Apr 4 23:55:32 2016 (r297567) @@ -412,6 +412,7 @@ onsig(int signo) void dotrap(void) { + struct stackmark smark; int i; int savestatus, prev_evalskip, prev_skipcount; @@ -445,7 +446,9 @@ dotrap(void) last_trapsig = i; savestatus = exitstatus; - evalstring(trap[i], 0); + setstackmark(&smark); + evalstring(stsavestr(trap[i]), 0); + popstackmark(&smark); /* * If such a command was not Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Apr 4 23:55:32 2016 (r297567) @@ -1633,8 +1633,9 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl * its canmount property to 'on' or 'noauto'. We only use * the changelist logic to unmount when setting canmount=off. */ - if (!(prop == ZFS_PROP_CANMOUNT && - fnvpair_value_uint64(elem) != ZFS_CANMOUNT_OFF)) { + if (prop != ZFS_PROP_CANMOUNT || + (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF && + zfs_is_mounted(zhp, NULL))) { cls[cl_idx] = changelist_gather(zhp, prop, 0, 0); if (cls[cl_idx] == NULL) goto error; Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Apr 4 23:55:32 2016 (r297567) @@ -3479,7 +3479,8 @@ zfs_receive_one(libzfs_handle_t *hdl, in } if (clp) { - err |= changelist_postfix(clp); + if (!flags->nomount) + err |= changelist_postfix(clp); changelist_free(clp); } Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Apr 4 23:55:32 2016 (r297567) @@ -366,10 +366,13 @@ cv_timedwait_hires(kcondvar_t *cv, kmute timestruc_t ts; hrtime_t delta; - ASSERT(flag == 0); + ASSERT(flag == 0 || flag == CALLOUT_FLAG_ABSOLUTE); top: - delta = tim - gethrtime(); + delta = tim; + if (flag & CALLOUT_FLAG_ABSOLUTE) + delta -= gethrtime(); + if (delta <= 0) return (-1); Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Mon Apr 4 23:55:32 2016 (r297567) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ /* @@ -324,6 +324,7 @@ extern gid_t *crgetgroups(cred_t *cr); typedef cond_t kcondvar_t; #define CV_DEFAULT USYNC_THREAD +#define CALLOUT_FLAG_ABSOLUTE 0x2 extern void cv_init(kcondvar_t *cv, char *name, int type, void *arg); extern void cv_destroy(kcondvar_t *cv); Modified: projects/release-pkg/contrib/bmake/ChangeLog ============================================================================== --- projects/release-pkg/contrib/bmake/ChangeLog Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/ChangeLog Mon Apr 4 23:55:32 2016 (r297567) @@ -1,3 +1,20 @@ +2016-03-15 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20160315 + Merge with NetBSD make, pick up + o fix handling of archive members + +2016-03-13 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): rename variable to avoid interference + with checks for ${MAKE_VERSION} + +2016-03-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20160310 + Merge with NetBSD make, pick up + o meta.c: treat missing Read file same as Write, incase we Delete it. + 2016-03-07 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (MAKE_VERSION): 20160307 Modified: projects/release-pkg/contrib/bmake/Makefile ============================================================================== --- projects/release-pkg/contrib/bmake/Makefile Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/Makefile Mon Apr 4 23:55:32 2016 (r297567) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $ +# $Id: Makefile,v 1.58 2016/03/15 23:39:12 sjg Exp $ # Base version on src date -MAKE_VERSION= 20160307 +_MAKE_VERSION= 20160315 PROG= bmake @@ -76,7 +76,7 @@ CFLAGS+= ${CPPFLAGS} CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}} -COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\"" +COPTS.main.c+= "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" # meta mode can be useful even without filemon FILEMON_H ?= /usr/include/dev/filemon/filemon.h Modified: projects/release-pkg/contrib/bmake/bmake.1 ============================================================================== --- projects/release-pkg/contrib/bmake/bmake.1 Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/bmake.1 Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $ +.\" $NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -685,6 +685,9 @@ or it will not be recognized. .It Va .TARGET The name of the target; also known as .Ql Va @ . +For compatibility with other makes this is an alias for +.Ic .ARCHIVE +in archive member rules. .El .Pp The shorter forms Modified: projects/release-pkg/contrib/bmake/bmake.cat1 ============================================================================== --- projects/release-pkg/contrib/bmake/bmake.cat1 Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/bmake.cat1 Mon Apr 4 23:55:32 2016 (r297567) @@ -438,7 +438,9 @@ VVAARRIIAABBLLEE AASSSSIIGG suffixes declared with ..SSUUFFFFIIXXEESS or it will not be recog- nized. - _._T_A_R_G_E_T The name of the target; also known as `_@'. + _._T_A_R_G_E_T The name of the target; also known as `_@'. For compati- + bility with other makes this is an alias for ..AARRCCHHIIVVEE in + archive member rules. The shorter forms (`_>', `_!', `_<', `_%', `_?', `_*', and `_@') are permitted for backward compatibility with historical makefiles and legacy POSIX Modified: projects/release-pkg/contrib/bmake/make.1 ============================================================================== --- projects/release-pkg/contrib/bmake/make.1 Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/make.1 Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $ +.\" $NetBSD: make.1,v 1.255 2016/03/14 07:42:15 matthias Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -685,6 +685,9 @@ or it will not be recognized. .It Va .TARGET The name of the target; also known as .Ql Va @ . +For compatibility with other makes this is an alias for +.Ic .ARCHIVE +in archive member rules. .El .Pp The shorter forms Modified: projects/release-pkg/contrib/bmake/meta.c ============================================================================== --- projects/release-pkg/contrib/bmake/meta.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/meta.c Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.53 2016/03/07 21:45:43 christos Exp $ */ +/* $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */ /* * Implement 'meta' mode. @@ -1190,7 +1190,8 @@ meta_oodate(GNode *gn, Boolean oodate) if ((link_src != NULL && lstat(p, &fs) < 0) || (link_src == NULL && stat(p, &fs) < 0)) { - Lst_AtEnd(missingFiles, bmake_strdup(p)); + if (Lst_Find(missingFiles, p, string_match) == NULL) + Lst_AtEnd(missingFiles, bmake_strdup(p)); } break; check_link_src: @@ -1281,9 +1282,8 @@ meta_oodate(GNode *gn, Boolean oodate) * A referenced file outside of CWD is missing. * We cannot catch every eventuality here... */ - if (DEBUG(META)) - fprintf(debug_file, "%s: %d: file '%s' may have moved?...\n", fname, lineno, p); - oodate = TRUE; + if (Lst_Find(missingFiles, p, string_match) == NULL) + Lst_AtEnd(missingFiles, bmake_strdup(p)); } } if (buf[0] == 'E') { Modified: projects/release-pkg/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/release-pkg/contrib/bmake/mk/ChangeLog Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/ChangeLog Mon Apr 4 23:55:32 2016 (r297567) @@ -1,3 +1,26 @@ +2016-03-15 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20160315 + + * meta.stage.mk (LN_CP_SCRIPT): do not ln(1) if we have to chmod(1) + normally only applies to scripts. + + * dirdeps.mk: NO_DIRDEPS_BELOW to supress DIRDEPS below RELDIR as + well as outside it. + +2016-03-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20160310 + + * dirdeps.mk: use targets rather than a list to track DIRDEPS that + we have processed; the list gets very inefficient as number of + DIRDEPS gets large. + + * sys.dependfile.mk: fix comment wrt MACHINE + + * meta.autodep.mk: ignore staged DPADDs when bootstrapping. + patch from Bryan Drewery + 2016-03-02 Simon J. Gerraty <sjg@bad.crufty.net> * meta2deps.sh: don't ignore subdirs. Modified: projects/release-pkg/contrib/bmake/mk/dirdeps.mk ============================================================================== --- projects/release-pkg/contrib/bmake/mk/dirdeps.mk Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/dirdeps.mk Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.59 2016/02/26 23:32:29 sjg Exp $ +# $Id: dirdeps.mk,v 1.62 2016/03/16 00:11:53 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -135,7 +135,6 @@ start_utc := ${now_utc} # make sure these are empty to start with _DEP_TARGET_SPEC = -_DIRDEP_CHECKED = # If TARGET_SPEC_VARS is other than just MACHINE # it should be set by sys.mk or similar by now. @@ -225,7 +224,7 @@ _DEP_TARGET_SPEC = ${_last_dependfile:${ .endif .if !empty(_last_dependfile) # record that we've read dependfile for this -_DIRDEP_CHECKED += ${_CURDIR}.${TARGET_SPEC} +_dirdeps_checked.${_CURDIR}.${TARGET_SPEC}: .endif .endif @@ -306,8 +305,10 @@ DEP_SKIP_DIR = ${SKIP_DIR} \ NSkipDir = ${DEP_SKIP_DIR:${M_ListToSkip}} .if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS) -# confine ourselves to the original dir +# confine ourselves to the original dir and below. DIRDEPS_FILTER += M${_DEP_RELDIR}* +.elif defined(NO_DIRDEPS_BELOW) +DIRDEPS_FILTER += M${_DEP_RELDIR} .endif # this is what we run below @@ -597,9 +598,9 @@ ${_this_dir}.$m: ${_build_dirs:M*.$m:N${ # Now find more dependencies - and recurse. .for d in ${_build_all_dirs} -.if ${_DIRDEP_CHECKED:M$d} == "" +.if !target(_dirdeps_checked.$d) # once only -_DIRDEP_CHECKED += $d +_dirdeps_checked.$d: .if ${_debug_search} .info checking $d .endif Modified: projects/release-pkg/contrib/bmake/mk/install-mk ============================================================================== --- projects/release-pkg/contrib/bmake/mk/install-mk Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/install-mk Mon Apr 4 23:55:32 2016 (r297567) @@ -55,7 +55,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: install-mk,v 1.121 2016/02/27 00:23:02 sjg Exp $ +# $Id: install-mk,v 1.123 2016/03/16 00:13:16 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20160226 +MK_VERSION=20160315 OWNER= GROUP= MODE=444 Modified: projects/release-pkg/contrib/bmake/mk/meta.autodep.mk ============================================================================== --- projects/release-pkg/contrib/bmake/mk/meta.autodep.mk Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/meta.autodep.mk Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.40 2016/02/22 22:44:58 sjg Exp $ +# $Id: meta.autodep.mk,v 1.41 2016/03/11 01:29:38 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -195,7 +195,7 @@ gendirdeps: ${_DEPENDFILE} # The pseudo machine "host" is used for HOST_TARGET DIRDEPS += \ ${DPADD:M${_OBJTOP}*:H:C,${_OBJTOP}[^/]*/,,:N.:O:u} \ - ${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u} + ${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:N${STAGE_ROOT:U${_OBJTOP}}/*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u} .endif .endif Modified: projects/release-pkg/contrib/bmake/mk/meta.stage.mk ============================================================================== --- projects/release-pkg/contrib/bmake/mk/meta.stage.mk Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/meta.stage.mk Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -# $Id: meta.stage.mk,v 1.43 2016/02/24 18:46:32 sjg Exp $ +# $Id: meta.stage.mk,v 1.44 2016/03/16 18:21:23 sjg Exp $ # # @(#) Copyright (c) 2011, Simon J. Gerraty # @@ -58,7 +58,7 @@ GENDIRDEPS_FILTER += Nnot-empty-is-impor LN_CP_SCRIPT = LnCp() { \ rm -f $$2 2> /dev/null; \ - ln $$1 $$2 2> /dev/null || \ + { [ -z "$$mode" ] && ln $$1 $$2 2> /dev/null; } || \ cp -p $$1 $$2; } # a staging conflict should cause an error Modified: projects/release-pkg/contrib/bmake/mk/sys.dependfile.mk ============================================================================== --- projects/release-pkg/contrib/bmake/mk/sys.dependfile.mk Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/mk/sys.dependfile.mk Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -# $Id: sys.dependfile.mk,v 1.7 2016/02/20 01:57:39 sjg Exp $ +# $Id: sys.dependfile.mk,v 1.8 2016/03/11 01:34:13 sjg Exp $ # # @(#) Copyright (c) 2012, Simon J. Gerraty # @@ -48,7 +48,7 @@ _e := ${.MAKE.DEPENDFILE_PREFERENCE:@m@$ # MACHINE specific depend files are supported, but *not* default. # If any already exist, we should follow suit. _aml = ${ALL_MACHINE_LIST:Uarm amd64 i386 powerpc:N${MACHINE}} ${MACHINE} -# MACHINE must be the last entry in _aml ;-) +# make sure we restore MACHINE _m := ${MACHINE} _e := ${_aml:@MACHINE@${.MAKE.DEPENDFILE_PREFERENCE:@m@${exists($m):?$m:}@}@} MACHINE := ${_m} Modified: projects/release-pkg/contrib/bmake/parse.c ============================================================================== --- projects/release-pkg/contrib/bmake/parse.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/parse.c Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $ */ +/* $NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.212 2016/02/19 06:19:06 sjg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.213 2016/03/11 13:54:47 matthias Exp $"); #endif #endif /* not lint */ #endif @@ -1261,6 +1261,7 @@ ParseDoDependency(char *line) goto out; } else { /* Done with this word; on to the next. */ + cp = line; continue; } } Modified: projects/release-pkg/contrib/bmake/suff.c ============================================================================== --- projects/release-pkg/contrib/bmake/suff.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/suff.c Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.78 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $"); #endif #endif /* not lint */ #endif @@ -1894,6 +1894,7 @@ SuffFindArchiveDeps(GNode *gn, Lst slst) TARGET, /* Must be first */ PREFIX, /* Must be second */ }; + LstNode ln, nln; /* Next suffix node to check */ int i; /* Index into copy and vals */ Suff *ms; /* Suffix descriptor for member */ char *name; /* Start of member's name */ @@ -1955,6 +1956,20 @@ SuffFindArchiveDeps(GNode *gn, Lst slst) Var_Set(MEMBER, name, gn, 0); Var_Set(ARCHIVE, gn->name, gn, 0); + /* + * Set $@ for compatibility with other makes + */ + Var_Set(TARGET, gn->name, gn, 0); + + /* + * Now we've got the important local variables set, expand any sources + * that still contain variables or wildcards in their names. + */ + for (ln = Lst_First(gn->children); ln != NULL; ln = nln) { + nln = Lst_Succ(ln); + SuffExpandChildren(ln, gn); + } + if (ms != NULL) { /* * Member has a known suffix, so look for a transformation rule from @@ -1962,7 +1977,6 @@ SuffFindArchiveDeps(GNode *gn, Lst slst) * through the entire list, we just look at suffixes to which the * member's suffix may be transformed... */ - LstNode ln; SuffixCmpData sd; /* Search string data */ /* @@ -2002,9 +2016,10 @@ SuffFindArchiveDeps(GNode *gn, Lst slst) /* * Flag the member as such so we remember to look in the archive for - * its modification time. + * its modification time. The OP_JOIN | OP_MADE is needed because this + * target should never get made. */ - mem->type |= OP_MEMBER; + mem->type |= OP_MEMBER | OP_JOIN | OP_MADE; } /*- Modified: projects/release-pkg/contrib/bmake/var.c ============================================================================== --- projects/release-pkg/contrib/bmake/var.c Mon Apr 4 23:15:57 2016 (r297566) +++ projects/release-pkg/contrib/bmake/var.c Mon Apr 4 23:55:32 2016 (r297567) @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.206 2016/03/07 20:20:35 sjg Exp $ */ +/* $NetBSD: var.c,v 1.207 2016/03/11 15:12:39 matthias Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.206 2016/03/07 20:20:35 sjg Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.207 2016/03/11 15:12:39 matthias Exp $"; #else #include <sys/cdefs.h> #ifndef lint *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604042355.u34NtXUR065558>