Date: Fri, 21 Oct 2016 16:29:41 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r307736 - in projects/clang390-import: . bin/pkill/tests cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/usr.sbin/dtrace/tests/tools contrib/mdocml contrib/netbsd-tests/fs/... Message-ID: <201610211629.u9LGTfQO064294@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Oct 21 16:29:40 2016 New Revision: 307736 URL: https://svnweb.freebsd.org/changeset/base/307736 Log: Merge ^/head r307383 through r307735. Added: projects/clang390-import/lib/libsysdecode/flags.c - copied unchanged from r307735, head/lib/libsysdecode/flags.c projects/clang390-import/lib/libsysdecode/mktables - copied unchanged from r307735, head/lib/libsysdecode/mktables projects/clang390-import/lib/libsysdecode/signal.c - copied unchanged from r307735, head/lib/libsysdecode/signal.c projects/clang390-import/lib/libsysdecode/sysdecode_cap_rights.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_cap_rights.3 projects/clang390-import/lib/libsysdecode/sysdecode_enum.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_enum.3 projects/clang390-import/lib/libsysdecode/sysdecode_fcntl_arg.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_fcntl_arg.3 projects/clang390-import/lib/libsysdecode/sysdecode_mask.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_mask.3 projects/clang390-import/lib/libsysdecode/sysdecode_quotactl_cmd.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_quotactl_cmd.3 projects/clang390-import/lib/libsysdecode/sysdecode_sigcode.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_sigcode.3 projects/clang390-import/lib/libsysdecode/sysdecode_sockopt_name.3 - copied unchanged from r307735, head/lib/libsysdecode/sysdecode_sockopt_name.3 projects/clang390-import/share/man/man4/rtwn_pci.4 - copied unchanged from r307735, head/share/man/man4/rtwn_pci.4 projects/clang390-import/share/man/man4/rtwn_usb.4 - copied unchanged from r307735, head/share/man/man4/rtwn_usb.4 projects/clang390-import/sys/arm/annapurna/alpine/alpine_pci_msix.c - copied unchanged from r307735, head/sys/arm/annapurna/alpine/alpine_pci_msix.c projects/clang390-import/sys/arm/annapurna/alpine/alpine_serdes.c - copied unchanged from r307735, head/sys/arm/annapurna/alpine/alpine_serdes.c projects/clang390-import/sys/arm/annapurna/alpine/alpine_serdes.h - copied unchanged from r307735, head/sys/arm/annapurna/alpine/alpine_serdes.h projects/clang390-import/sys/arm64/conf/GENERIC-UP - copied unchanged from r307735, head/sys/arm64/conf/GENERIC-UP projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8188eufw.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8188eufw.fw.uu projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8192cfwE.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8192cfwE.fw.uu projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8192cfwE_B.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8192cfwE_B.fw.uu projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8192cfwT.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8192cfwT.fw.uu projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8812aufw.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8812aufw.fw.uu projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8821aufw.fw.uu - copied unchanged from r307735, head/sys/contrib/dev/rtwn/rtwn-rtl8821aufw.fw.uu projects/clang390-import/sys/dev/al_eth/ - copied from r307735, head/sys/dev/al_eth/ projects/clang390-import/sys/dev/dpaa/fman_mdio.c - copied unchanged from r307735, head/sys/dev/dpaa/fman_mdio.c projects/clang390-import/sys/dev/netmap/if_ptnet.c - copied unchanged from r307735, head/sys/dev/netmap/if_ptnet.c projects/clang390-import/sys/dev/netmap/netmap_pt.c - copied unchanged from r307735, head/sys/dev/netmap/netmap_pt.c projects/clang390-import/sys/dev/rtwn/if_rtwn_beacon.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_beacon.c projects/clang390-import/sys/dev/rtwn/if_rtwn_beacon.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_beacon.h projects/clang390-import/sys/dev/rtwn/if_rtwn_calib.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_calib.c projects/clang390-import/sys/dev/rtwn/if_rtwn_calib.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_calib.h projects/clang390-import/sys/dev/rtwn/if_rtwn_cam.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_cam.c projects/clang390-import/sys/dev/rtwn/if_rtwn_cam.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_cam.h projects/clang390-import/sys/dev/rtwn/if_rtwn_debug.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_debug.h projects/clang390-import/sys/dev/rtwn/if_rtwn_efuse.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_efuse.c projects/clang390-import/sys/dev/rtwn/if_rtwn_efuse.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_efuse.h projects/clang390-import/sys/dev/rtwn/if_rtwn_fw.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_fw.c projects/clang390-import/sys/dev/rtwn/if_rtwn_fw.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_fw.h projects/clang390-import/sys/dev/rtwn/if_rtwn_nop.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_nop.h projects/clang390-import/sys/dev/rtwn/if_rtwn_ridx.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_ridx.h projects/clang390-import/sys/dev/rtwn/if_rtwn_rx.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_rx.c projects/clang390-import/sys/dev/rtwn/if_rtwn_rx.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_rx.h projects/clang390-import/sys/dev/rtwn/if_rtwn_task.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_task.c projects/clang390-import/sys/dev/rtwn/if_rtwn_task.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_task.h projects/clang390-import/sys/dev/rtwn/if_rtwn_tx.c - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_tx.c projects/clang390-import/sys/dev/rtwn/if_rtwn_tx.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwn_tx.h projects/clang390-import/sys/dev/rtwn/if_rtwnvar.h - copied unchanged from r307735, head/sys/dev/rtwn/if_rtwnvar.h projects/clang390-import/sys/dev/rtwn/pci/ - copied from r307735, head/sys/dev/rtwn/pci/ projects/clang390-import/sys/dev/rtwn/rtl8188e/ - copied from r307735, head/sys/dev/rtwn/rtl8188e/ projects/clang390-import/sys/dev/rtwn/rtl8192c/ - copied from r307735, head/sys/dev/rtwn/rtl8192c/ projects/clang390-import/sys/dev/rtwn/rtl8812a/ - copied from r307735, head/sys/dev/rtwn/rtl8812a/ projects/clang390-import/sys/dev/rtwn/rtl8821a/ - copied from r307735, head/sys/dev/rtwn/rtl8821a/ projects/clang390-import/sys/dev/rtwn/usb/ - copied from r307735, head/sys/dev/rtwn/usb/ projects/clang390-import/sys/modules/dtb/omap4/ - copied from r307735, head/sys/modules/dtb/omap4/ projects/clang390-import/sys/modules/rtwn_pci/ - copied from r307735, head/sys/modules/rtwn_pci/ projects/clang390-import/sys/modules/rtwn_usb/ - copied from r307735, head/sys/modules/rtwn_usb/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8188eu/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8188eu/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8192cE/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8192cE/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8192cEB/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8192cEB/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8192cT/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8192cT/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8812au/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8812au/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8821au/ - copied from r307735, head/sys/modules/rtwnfw/rtwnrtl8821au/ projects/clang390-import/sys/net/netmap_virt.h - copied unchanged from r307735, head/sys/net/netmap_virt.h projects/clang390-import/tests/sys/fs/ - copied from r307735, head/tests/sys/fs/ projects/clang390-import/tests/sys/geom/class/uzip/1_endian_big.img.uzip.uue - copied unchanged from r307735, head/tests/sys/geom/class/uzip/1_endian_big.img.uzip.uue projects/clang390-import/tests/sys/geom/class/uzip/1_endian_little.img.uzip.uue - copied unchanged from r307735, head/tests/sys/geom/class/uzip/1_endian_little.img.uzip.uue projects/clang390-import/tools/build/options/WITHOUT_GNU_DIFF - copied unchanged from r307735, head/tools/build/options/WITHOUT_GNU_DIFF projects/clang390-import/tools/build/options/WITHOUT_GNU_GREP - copied unchanged from r307735, head/tools/build/options/WITHOUT_GNU_GREP projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0085.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0085.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0086.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0086.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0087.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0087.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0088.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0088.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0089.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0089.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0090.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0090.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0091.h - copied unchanged from r307735, head/tools/regression/bpf/bpf_filter/tests/test0091.h projects/clang390-import/tools/tools/git/ - copied from r307735, head/tools/tools/git/ projects/clang390-import/tools/tools/nanobsd/embedded/pandaboard.cfg - copied unchanged from r307735, head/tools/tools/nanobsd/embedded/pandaboard.cfg projects/clang390-import/tools/tools/nanobsd/embedded/rpi3.cfg - copied unchanged from r307735, head/tools/tools/nanobsd/embedded/rpi3.cfg projects/clang390-import/tools/tools/netmap/ctrs.h - copied unchanged from r307735, head/tools/tools/netmap/ctrs.h projects/clang390-import/tools/tools/netmap/nmreplay.8 - copied unchanged from r307735, head/tools/tools/netmap/nmreplay.8 projects/clang390-import/tools/tools/netmap/nmreplay.c - copied unchanged from r307735, head/tools/tools/netmap/nmreplay.c projects/clang390-import/usr.bin/mkimg/uuid.c - copied unchanged from r307735, head/usr.bin/mkimg/uuid.c Replaced: projects/clang390-import/sys/sys/apm.h - copied unchanged from r307735, head/sys/sys/apm.h projects/clang390-import/sys/sys/disk/ - copied from r307735, head/sys/sys/disk/ projects/clang390-import/sys/sys/disklabel.h - copied unchanged from r307735, head/sys/sys/disklabel.h projects/clang390-import/sys/sys/diskmbr.h - copied unchanged from r307735, head/sys/sys/diskmbr.h projects/clang390-import/sys/sys/diskpc98.h - copied unchanged from r307735, head/sys/sys/diskpc98.h projects/clang390-import/sys/sys/gpt.h - copied unchanged from r307735, head/sys/sys/gpt.h projects/clang390-import/sys/sys/vtoc.h - copied unchanged from r307735, head/sys/sys/vtoc.h Deleted: projects/clang390-import/share/man/man4/urtwn.4 projects/clang390-import/share/man/man4/urtwnfw.4 projects/clang390-import/sys/arm64/conf/RPI3 projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8192cfwU_B.fw.uu projects/clang390-import/sys/contrib/dev/urtwn/ projects/clang390-import/sys/dev/urtwn/ projects/clang390-import/sys/modules/rtwnfw/rtwnrtl8192cUB/ projects/clang390-import/sys/modules/urtwn/ projects/clang390-import/sys/modules/urtwnfw/ projects/clang390-import/tests/sys/geom/class/uzip/test-1.img.uzip.uue projects/clang390-import/usr.bin/kdump/mksubr Modified: projects/clang390-import/Makefile.inc1 projects/clang390-import/ObsoleteFiles.inc projects/clang390-import/UPDATING projects/clang390-import/bin/pkill/tests/pgrep-j_test.sh projects/clang390-import/bin/pkill/tests/pkill-j_test.sh projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c projects/clang390-import/cddl/usr.sbin/dtrace/tests/tools/exclude.sh projects/clang390-import/contrib/mdocml/mandocdb.c projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_link.sh projects/clang390-import/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c projects/clang390-import/etc/devd.conf projects/clang390-import/etc/devd/usb.conf projects/clang390-import/etc/mtree/BSD.tests.dist projects/clang390-import/etc/rc projects/clang390-import/gnu/lib/Makefile projects/clang390-import/gnu/usr.bin/Makefile projects/clang390-import/lib/libc/sys/kldsym.2 projects/clang390-import/lib/libc/tests/Makefile projects/clang390-import/lib/libmd/md4.h projects/clang390-import/lib/libmd/md5.h projects/clang390-import/lib/libmd/mdXhl.c projects/clang390-import/lib/libmd/ripemd.h projects/clang390-import/lib/libmd/sha.h projects/clang390-import/lib/libsysdecode/Makefile projects/clang390-import/lib/libsysdecode/errno.c projects/clang390-import/lib/libsysdecode/mkioctls projects/clang390-import/lib/libsysdecode/syscallnames.c projects/clang390-import/lib/libsysdecode/sysdecode.3 projects/clang390-import/lib/libsysdecode/sysdecode.h projects/clang390-import/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 projects/clang390-import/lib/libsysdecode/sysdecode_ioctlname.3 projects/clang390-import/lib/libsysdecode/sysdecode_syscallnames.3 projects/clang390-import/lib/libsysdecode/sysdecode_utrace.3 projects/clang390-import/lib/libsysdecode/utrace.c projects/clang390-import/libexec/ypxfr/ypxfr_getmap.c projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml projects/clang390-import/sbin/camcontrol/camcontrol.c projects/clang390-import/sbin/ipfw/ipfw.8 projects/clang390-import/sbin/ipfw/ipv6.c projects/clang390-import/sbin/md5/md5.c projects/clang390-import/share/doc/legal/realtek/Makefile projects/clang390-import/share/man/man4/Makefile projects/clang390-import/share/man/man4/bpf.4 projects/clang390-import/share/man/man4/netmap.4 projects/clang390-import/share/man/man4/rtwn.4 projects/clang390-import/share/man/man4/rtwnfw.4 projects/clang390-import/share/man/man4/tcp.4 projects/clang390-import/share/man/man4/wlan.4 projects/clang390-import/share/man/man7/arch.7 projects/clang390-import/share/man/man9/fpu_kern.9 projects/clang390-import/share/mk/bsd.lib.mk projects/clang390-import/share/mk/bsd.suffixes.mk projects/clang390-import/share/mk/src.opts.mk projects/clang390-import/share/mk/sys.mk projects/clang390-import/sys/amd64/amd64/bpf_jit_machdep.c projects/clang390-import/sys/amd64/amd64/bpf_jit_machdep.h projects/clang390-import/sys/amd64/amd64/efirt.c (contents, props changed) projects/clang390-import/sys/amd64/amd64/minidump_machdep.c projects/clang390-import/sys/arm/allwinner/a10_ehci.c projects/clang390-import/sys/arm/allwinner/aw_ccu.c projects/clang390-import/sys/arm/at91/at91_ohci.c projects/clang390-import/sys/arm/at91/at91_ohci_fdt.c projects/clang390-import/sys/arm/cavium/cns11xx/ehci_ebus.c projects/clang390-import/sys/arm/cavium/cns11xx/ohci_ec.c projects/clang390-import/sys/arm/conf/ALPINE projects/clang390-import/sys/arm/conf/PANDABOARD projects/clang390-import/sys/arm/nvidia/as3722_regulators.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_coretemp.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_cpufreq.c projects/clang390-import/sys/arm/nvidia/tegra124/tegra124_machdep.c projects/clang390-import/sys/arm/samsung/exynos/exynos5_xhci.c projects/clang390-import/sys/arm/ti/am335x/am335x_musb.c projects/clang390-import/sys/arm/ti/usb/omap_ehci.c projects/clang390-import/sys/arm/xilinx/zy7_ehci.c projects/clang390-import/sys/arm64/arm64/machdep.c projects/clang390-import/sys/arm64/arm64/trap.c projects/clang390-import/sys/arm64/arm64/vfp.c projects/clang390-import/sys/arm64/conf/GENERIC projects/clang390-import/sys/arm64/include/pcb.h projects/clang390-import/sys/arm64/include/vfp.h projects/clang390-import/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/clang390-import/sys/boot/kshim/bsd_kernel.c projects/clang390-import/sys/cam/ata/ata_da.c projects/clang390-import/sys/cam/scsi/scsi_da.c projects/clang390-import/sys/cam/scsi/scsi_pass.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/clang390-import/sys/compat/ia32/ia32_sysvec.c projects/clang390-import/sys/conf/Makefile.arm projects/clang390-import/sys/conf/WITHOUT_SOURCELESS_UCODE projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/files.arm projects/clang390-import/sys/conf/files.arm64 projects/clang390-import/sys/conf/makeLINT.mk projects/clang390-import/sys/conf/options projects/clang390-import/sys/contrib/dev/rtwn/LICENSE projects/clang390-import/sys/contrib/dev/rtwn/rtwn-rtl8192cfwU.fw.uu projects/clang390-import/sys/contrib/ncsw/Peripherals/BM/bman_low.c projects/clang390-import/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c projects/clang390-import/sys/contrib/ncsw/Peripherals/QM/qman_low.h projects/clang390-import/sys/contrib/ncsw/inc/Peripherals/bm_ext.h projects/clang390-import/sys/contrib/ncsw/inc/Peripherals/fm_ext.h projects/clang390-import/sys/contrib/ncsw/inc/Peripherals/qm_ext.h projects/clang390-import/sys/contrib/ncsw/inc/error_ext.h projects/clang390-import/sys/contrib/ncsw/inc/xx_ext.h projects/clang390-import/sys/contrib/ncsw/user/env/xx.c projects/clang390-import/sys/crypto/aesni/aesni.h projects/clang390-import/sys/crypto/sha1.h projects/clang390-import/sys/crypto/sha2/sha256.h projects/clang390-import/sys/crypto/sha2/sha384.h projects/clang390-import/sys/crypto/sha2/sha512.h projects/clang390-import/sys/crypto/sha2/sha512t.h projects/clang390-import/sys/crypto/siphash/siphash.h projects/clang390-import/sys/crypto/skein/skein_freebsd.h projects/clang390-import/sys/crypto/skein/skein_port.h projects/clang390-import/sys/dev/atkbdc/atkbdc.c projects/clang390-import/sys/dev/bhnd/cores/usb/bhnd_ehci.c projects/clang390-import/sys/dev/bhnd/cores/usb/bhnd_ohci.c projects/clang390-import/sys/dev/bxe/bxe.c projects/clang390-import/sys/dev/bxe/bxe.h projects/clang390-import/sys/dev/bxe/bxe_stats.h projects/clang390-import/sys/dev/cxgbe/t4_main.c projects/clang390-import/sys/dev/dpaa/bman.c projects/clang390-import/sys/dev/dpaa/bman_portals.c projects/clang390-import/sys/dev/dpaa/fman.c projects/clang390-import/sys/dev/dpaa/fman.h projects/clang390-import/sys/dev/dpaa/fman_fdt.c projects/clang390-import/sys/dev/dpaa/if_dtsec.c projects/clang390-import/sys/dev/dpaa/if_dtsec.h projects/clang390-import/sys/dev/dpaa/if_dtsec_fdt.c projects/clang390-import/sys/dev/dpaa/portals_common.c projects/clang390-import/sys/dev/dpaa/qman.c projects/clang390-import/sys/dev/dpaa/qman_portals.c projects/clang390-import/sys/dev/e1000/if_lem.c projects/clang390-import/sys/dev/efidev/efidev.c projects/clang390-import/sys/dev/extres/regulator/regulator.c projects/clang390-import/sys/dev/extres/regulator/regulator.h projects/clang390-import/sys/dev/hyperv/include/vmbus.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang390-import/sys/dev/hyperv/netvsc/if_hnreg.h projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h projects/clang390-import/sys/dev/hyperv/netvsc/ndis.h projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_chan.c projects/clang390-import/sys/dev/netmap/if_ixl_netmap.h projects/clang390-import/sys/dev/netmap/if_lem_netmap.h projects/clang390-import/sys/dev/netmap/if_vtnet_netmap.h projects/clang390-import/sys/dev/netmap/ixgbe_netmap.h projects/clang390-import/sys/dev/netmap/netmap.c projects/clang390-import/sys/dev/netmap/netmap_freebsd.c projects/clang390-import/sys/dev/netmap/netmap_generic.c projects/clang390-import/sys/dev/netmap/netmap_kern.h projects/clang390-import/sys/dev/netmap/netmap_mbq.c projects/clang390-import/sys/dev/netmap/netmap_mbq.h projects/clang390-import/sys/dev/netmap/netmap_mem2.c projects/clang390-import/sys/dev/netmap/netmap_mem2.h projects/clang390-import/sys/dev/netmap/netmap_monitor.c projects/clang390-import/sys/dev/netmap/netmap_offloadings.c projects/clang390-import/sys/dev/netmap/netmap_pipe.c projects/clang390-import/sys/dev/netmap/netmap_vale.c projects/clang390-import/sys/dev/pci/pci.c projects/clang390-import/sys/dev/puc/puc.c projects/clang390-import/sys/dev/rtwn/if_rtwn.c projects/clang390-import/sys/dev/rtwn/if_rtwnreg.h projects/clang390-import/sys/dev/sound/usb/uaudio.c projects/clang390-import/sys/dev/usb/controller/at91dci_atmelarm.c projects/clang390-import/sys/dev/usb/controller/at91dci_fdt.c projects/clang390-import/sys/dev/usb/controller/atmegadci_atmelarm.c projects/clang390-import/sys/dev/usb/controller/dwc_otg_fdt.c projects/clang390-import/sys/dev/usb/controller/ehci_ixp4xx.c projects/clang390-import/sys/dev/usb/controller/ehci_mv.c projects/clang390-import/sys/dev/usb/controller/ehci_pci.c projects/clang390-import/sys/dev/usb/controller/generic_ehci.c projects/clang390-import/sys/dev/usb/controller/generic_ohci.c projects/clang390-import/sys/dev/usb/controller/musb_otg_atmelarm.c projects/clang390-import/sys/dev/usb/controller/ohci_pci.c projects/clang390-import/sys/dev/usb/controller/ohci_s3c24x0.c projects/clang390-import/sys/dev/usb/controller/saf1761_otg_boot.c projects/clang390-import/sys/dev/usb/controller/saf1761_otg_fdt.c projects/clang390-import/sys/dev/usb/controller/uhci_pci.c projects/clang390-import/sys/dev/usb/controller/uss820dci_atmelarm.c projects/clang390-import/sys/dev/usb/controller/xhci_mv.c projects/clang390-import/sys/dev/usb/controller/xhci_pci.c projects/clang390-import/sys/dev/usb/usb_device.c projects/clang390-import/sys/dev/usb/video/udl.c projects/clang390-import/sys/fs/nfsserver/nfs_nfsdstate.c projects/clang390-import/sys/geom/mirror/g_mirror.c projects/clang390-import/sys/i386/i386/bpf_jit_machdep.c projects/clang390-import/sys/i386/i386/bpf_jit_machdep.h projects/clang390-import/sys/kern/init_main.c projects/clang390-import/sys/kern/kern_exec.c projects/clang390-import/sys/kern/kern_mib.c projects/clang390-import/sys/kern/makesyscalls.sh projects/clang390-import/sys/kern/subr_bus.c projects/clang390-import/sys/kern/subr_gtaskqueue.c projects/clang390-import/sys/kern/sys_capability.c projects/clang390-import/sys/kern/vfs_cache.c projects/clang390-import/sys/mips/atheros/ar71xx_ehci.c projects/clang390-import/sys/mips/atheros/ar71xx_ohci.c projects/clang390-import/sys/mips/cavium/usb/octusb_octeon.c projects/clang390-import/sys/mips/conf/std.AR933X projects/clang390-import/sys/mips/conf/std.AR934X projects/clang390-import/sys/mips/conf/std.QCA955X projects/clang390-import/sys/mips/mediatek/mtk_dotg.c projects/clang390-import/sys/mips/mediatek/mtk_ehci.c projects/clang390-import/sys/mips/mediatek/mtk_ohci.c projects/clang390-import/sys/mips/mediatek/mtk_xhci.c projects/clang390-import/sys/mips/rmi/xls_ehci.c projects/clang390-import/sys/mips/rt305x/rt305x_dotg.c projects/clang390-import/sys/mips/rt305x/rt305x_ehci.c projects/clang390-import/sys/mips/rt305x/rt305x_ohci.c projects/clang390-import/sys/modules/Makefile projects/clang390-import/sys/modules/geom/Makefile projects/clang390-import/sys/modules/gpio/gpiospi/Makefile projects/clang390-import/sys/modules/netmap/Makefile projects/clang390-import/sys/modules/rtwn/Makefile projects/clang390-import/sys/modules/rtwnfw/Makefile projects/clang390-import/sys/modules/rtwnfw/Makefile.inc projects/clang390-import/sys/net/bpf_filter.c projects/clang390-import/sys/net/if_loop.c projects/clang390-import/sys/net/if_var.h projects/clang390-import/sys/net/iflib.c projects/clang390-import/sys/net/netmap.h projects/clang390-import/sys/net/netmap_user.h projects/clang390-import/sys/net/rndis.h projects/clang390-import/sys/net80211/ieee80211_freebsd.h projects/clang390-import/sys/net80211/ieee80211_scan_sw.c projects/clang390-import/sys/net80211/ieee80211_var.h projects/clang390-import/sys/netinet/ip_icmp.c projects/clang390-import/sys/netinet/tcp_input.c projects/clang390-import/sys/netinet/tcp_subr.c projects/clang390-import/sys/netinet/tcp_timewait.c projects/clang390-import/sys/netinet/tcp_usrreq.c projects/clang390-import/sys/netinet6/icmp6.c projects/clang390-import/sys/netinet6/ip6_input.c projects/clang390-import/sys/netinet6/ip6_output.c projects/clang390-import/sys/netpfil/ipfw/ip_fw_table.c projects/clang390-import/sys/opencrypto/crypto.c projects/clang390-import/sys/powerpc/conf/dpaa/files.dpaa projects/clang390-import/sys/powerpc/fpu/fpu_emu.c projects/clang390-import/sys/powerpc/powerpc/machdep.c projects/clang390-import/sys/riscv/conf/GENERIC projects/clang390-import/sys/sys/cdefs.h projects/clang390-import/sys/sys/efi.h projects/clang390-import/sys/sys/md4.h projects/clang390-import/sys/sys/md5.h projects/clang390-import/sys/sys/param.h projects/clang390-import/sys/ufs/ffs/ffs_vnops.c projects/clang390-import/sys/vm/uma_core.c projects/clang390-import/sys/vm/vm_fault.c projects/clang390-import/sys/vm/vm_page.c projects/clang390-import/sys/vm/vm_page.h projects/clang390-import/sys/vm/vnode_pager.c projects/clang390-import/sys/x86/x86/identcpu.c projects/clang390-import/tests/sys/Makefile projects/clang390-import/tests/sys/geom/class/uzip/1_test.sh projects/clang390-import/tests/sys/geom/class/uzip/Makefile projects/clang390-import/tests/sys/kern/kern_copyin.c projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang390-import/tools/regression/bpf/bpf_filter/Makefile projects/clang390-import/tools/regression/bpf/bpf_filter/bpf_test.c projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0001.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0002.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0003.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0004.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0005.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0006.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0007.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0008.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0009.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0010.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0011.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0012.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0013.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0014.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0015.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0016.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0017.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0018.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0019.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0020.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0021.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0022.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0023.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0024.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0025.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0026.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0027.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0028.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0029.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0030.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0031.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0032.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0033.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0034.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0035.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0036.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0037.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0038.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0039.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0040.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0041.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0042.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0043.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0044.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0045.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0046.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0047.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0048.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0049.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0050.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0051.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0052.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0053.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0054.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0055.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0056.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0057.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0058.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0059.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0060.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0061.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0062.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0063.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0064.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0065.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0066.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0067.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0068.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0069.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0070.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0071.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0072.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0073.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0074.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0075.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0076.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0077.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0078.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0079.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0080.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0081.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0082.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0083.h projects/clang390-import/tools/regression/bpf/bpf_filter/tests/test0084.h projects/clang390-import/tools/tools/README projects/clang390-import/tools/tools/nanobsd/embedded/beaglebone.cfg projects/clang390-import/tools/tools/nanobsd/embedded/common projects/clang390-import/tools/tools/netmap/Makefile projects/clang390-import/tools/tools/netmap/bridge.c projects/clang390-import/tools/tools/netmap/pkt-gen.c projects/clang390-import/tools/tools/netmap/vale-ctl.c projects/clang390-import/usr.bin/elfdump/elfdump.c projects/clang390-import/usr.bin/jot/jot.c projects/clang390-import/usr.bin/kdump/Makefile projects/clang390-import/usr.bin/kdump/kdump.c projects/clang390-import/usr.bin/mkimg/Makefile projects/clang390-import/usr.bin/mkimg/apm.c projects/clang390-import/usr.bin/mkimg/bsd.c projects/clang390-import/usr.bin/mkimg/ebr.c projects/clang390-import/usr.bin/mkimg/gpt.c projects/clang390-import/usr.bin/mkimg/mbr.c projects/clang390-import/usr.bin/mkimg/mkimg.1 projects/clang390-import/usr.bin/mkimg/mkimg.c projects/clang390-import/usr.bin/mkimg/mkimg.h projects/clang390-import/usr.bin/mkimg/pc98.c projects/clang390-import/usr.bin/mkimg/vhd.c projects/clang390-import/usr.bin/mkimg/vtoc8.c projects/clang390-import/usr.bin/printenv/printenv.c projects/clang390-import/usr.bin/truss/Makefile projects/clang390-import/usr.bin/truss/aarch64-cloudabi64.c projects/clang390-import/usr.bin/truss/aarch64-freebsd.c projects/clang390-import/usr.bin/truss/amd64-cloudabi64.c projects/clang390-import/usr.bin/truss/amd64-freebsd.c projects/clang390-import/usr.bin/truss/amd64-freebsd32.c projects/clang390-import/usr.bin/truss/amd64-linux.c projects/clang390-import/usr.bin/truss/amd64-linux32.c projects/clang390-import/usr.bin/truss/arm-freebsd.c projects/clang390-import/usr.bin/truss/extern.h projects/clang390-import/usr.bin/truss/i386-freebsd.c projects/clang390-import/usr.bin/truss/i386-linux.c projects/clang390-import/usr.bin/truss/main.c projects/clang390-import/usr.bin/truss/mips-freebsd.c projects/clang390-import/usr.bin/truss/powerpc-freebsd.c projects/clang390-import/usr.bin/truss/powerpc64-freebsd.c projects/clang390-import/usr.bin/truss/powerpc64-freebsd32.c projects/clang390-import/usr.bin/truss/setup.c projects/clang390-import/usr.bin/truss/sparc64-freebsd.c projects/clang390-import/usr.bin/truss/syscall.h projects/clang390-import/usr.bin/truss/syscalls.c projects/clang390-import/usr.sbin/bhyve/bhyve.8 projects/clang390-import/usr.sbin/bsdconfig/share/sysrc.subr projects/clang390-import/usr.sbin/efivar/efivar.c projects/clang390-import/usr.sbin/fstyp/Makefile projects/clang390-import/usr.sbin/pciconf/pciconf.c projects/clang390-import/usr.sbin/pmcstat/pmcstat_log.h Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/cddl/ (props changed) projects/clang390-import/cddl/contrib/opensolaris/ (props changed) projects/clang390-import/contrib/mdocml/ (props changed) projects/clang390-import/contrib/netbsd-tests/ (props changed) projects/clang390-import/gnu/lib/ (props changed) projects/clang390-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang390-import/Makefile.inc1 ============================================================================== --- projects/clang390-import/Makefile.inc1 Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/Makefile.inc1 Fri Oct 21 16:29:40 2016 (r307736) @@ -1586,7 +1586,7 @@ _strfile= usr.bin/fortune/strfile _gperf= gnu/usr.bin/gperf .endif -.if ${MK_SHAREDOCS} != "no" || ${MK_GROFF} != "no" +.if ${MK_SHAREDOCS} != "no" && ${MK_GROFF} != "no" _groff= gnu/usr.bin/groff \ usr.bin/soelim .endif @@ -1982,7 +1982,10 @@ libraries: .MAKE .PHONY # # static libgcc.a prerequisite for shared libc # -_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt +_prereq_libs= gnu/lib/libgcc lib/libcompiler_rt +.if ${MK_SSP} != "no" +_prereq_libs+= gnu/lib/libssp/libssp_nonshared +.endif # These dependencies are not automatically generated: # Modified: projects/clang390-import/ObsoleteFiles.inc ============================================================================== --- projects/clang390-import/ObsoleteFiles.inc Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/ObsoleteFiles.inc Fri Oct 21 16:29:40 2016 (r307736) @@ -130,6 +130,9 @@ OLD_FILES+=usr/lib/clang/3.8.0/lib/freeb OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.8.0/lib OLD_DIRS+=usr/lib/clang/3.8.0 +# 20161017: urtwn(4) was merged into rtwn(4) +OLD_FILES+=usr/share/man/man4/urtwn.4.gz +OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz # 20161015: Remove GNU rcs OLD_FILES+=usr/bin/ci OLD_FILES+=usr/bin/co Modified: projects/clang390-import/UPDATING ============================================================================== --- projects/clang390-import/UPDATING Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/UPDATING Fri Oct 21 16:29:40 2016 (r307736) @@ -31,6 +31,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) + +****************************** SPECIAL WARNING: ****************************** + + Due to a bug in some versions of clang that's very hard to workaround in + the upgrade process, to upgrade to -current you must first upgrade + either stable/9 after r286035 or stable/10 after r286033 (including + 10.3-RELEASE) or current after r286007 (including stable/11 and + 11.0-RELEASE). These revisions post-date the 10.2 and 9.3 releases, so + you'll need to take the unusual step of upgrading to the tip of the + stable branch before moving to 11 or -current via a source upgrade. + stable/11 and 11.0-RELEASE post-date the fix so you can move from them + to -current. This differs from the historical situation where one could + upgrade from anywhere on the last couple of stable branches, so be + careful. + +****************************** SPECIAL WARNING: ****************************** + +20161017: + The urtwn(4) driver was merged into rtwn(4) and now consists of + rtwn(4) main module + rtwn_usb(4) and rtwn_pci(4) bus-specific + parts. + Also, firmware for RTL8188CE was renamed due to possible name + conflict (rtwnrtl8192cU(B) -> rtwnrtl8192cE(B)) + 20161015: GNU rcs has been removed from base. It is available as packages: - rcs: Latest GPLv3 GNU rcs version. @@ -1460,11 +1484,15 @@ COMMON ITEMS: your build attempts in an "environmental clean room", prefix all make commands with 'env -i '. See the env(1) manual page for more details. - When upgrading from one major version to another it is generally best - to upgrade to the latest code in the currently installed branch first, - then do an upgrade to the new branch. This is the best-tested upgrade - path, and has the highest probability of being successful. Please try - this approach before reporting problems with a major version upgrade. + When upgrading from one major version to another it is generally best to + upgrade to the latest code in the currently installed branch first, then + do an upgrade to the new branch. This is the best-tested upgrade path, + and has the highest probability of being successful. Please try this + approach if you encounter problems with a major version upgrade. Since + the stable 4.x branch point, one has generally been able to upgade from + anywhere in the most recent stable branch to head / current (or even the + last couple of stable branches). See the top of this file when there's + an exception. When upgrading a live system, having a root shell around before installing anything can help undo problems. Not having a root shell Modified: projects/clang390-import/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/clang390-import/bin/pkill/tests/pgrep-j_test.sh Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/bin/pkill/tests/pgrep-j_test.sh Fri Oct 21 16:29:40 2016 (r307736) @@ -20,12 +20,13 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep name="pgrep -j <jid>" -sleep_amount=5 +sleep_amount=15 jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & +sleep 0.5 for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) @@ -53,7 +54,7 @@ fi wait name="pgrep -j any" -sleep_amount=6 +sleep_amount=16 jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & @@ -74,7 +75,7 @@ fi wait name="pgrep -j none" -sleep_amount=7 +sleep_amount=17 daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount & jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & @@ -91,7 +92,7 @@ wait # test 4 is like test 1 except with jname instead of jid. name="pgrep -j <jname>" -sleep_amount=8 +sleep_amount=18 jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount & Modified: projects/clang390-import/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/clang390-import/bin/pkill/tests/pkill-j_test.sh Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/bin/pkill/tests/pkill-j_test.sh Fri Oct 21 16:29:40 2016 (r307736) @@ -20,7 +20,7 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep name="pkill -j <jid>" -sleep_amount=5 +sleep_amount=15 jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & @@ -54,7 +54,7 @@ fi 2>/dev/null wait name="pkill -j any" -sleep_amount=6 +sleep_amount=16 jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & @@ -76,7 +76,7 @@ fi 2>/dev/null wait name="pkill -j none" -sleep_amount=7 +sleep_amount=17 daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & @@ -94,7 +94,7 @@ wait # test 4 is like test 1 except with jname instead of jid. name="pkill -j <jname>" -sleep_amount=8 +sleep_amount=18 jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount & Modified: projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c ============================================================================== --- projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Fri Oct 21 16:29:40 2016 (r307736) @@ -31,8 +31,8 @@ #include <unistd.h> int -go(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, - int arg7, int arg8, int arg9) +go(long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, + long arg7, long arg8, long arg9) { return (arg1); } Modified: projects/clang390-import/cddl/usr.sbin/dtrace/tests/tools/exclude.sh ============================================================================== --- projects/clang390-import/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Fri Oct 21 16:29:40 2016 (r307736) @@ -72,6 +72,7 @@ exclude EXFAIL common/mib/tst.udp.ksh exclude SKIP common/privs/tst.fds.ksh exclude SKIP common/privs/tst.func_access.ksh exclude SKIP common/privs/tst.getf.ksh +exclude SKIP common/privs/tst.kpriv.ksh exclude SKIP common/privs/tst.op_access.ksh exclude SKIP common/privs/tst.procpriv.ksh exclude SKIP common/privs/tst.providers.ksh Modified: projects/clang390-import/contrib/mdocml/mandocdb.c ============================================================================== --- projects/clang390-import/contrib/mdocml/mandocdb.c Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/contrib/mdocml/mandocdb.c Fri Oct 21 16:29:40 2016 (r307736) @@ -1146,10 +1146,8 @@ mpages_merge(struct mparse *mp) for (mpage = mpage_head; mpage != NULL; mpage = mpage->next) { mlinks_undupe(mpage); - if ((mlink = mpage->mlinks) == NULL) { - mpage = mpage->next; + if ((mlink = mpage->mlinks) == NULL) continue; - } name_mask = NAME_MASK; mandoc_ohash_init(&names, 4, offsetof(struct str, key)); Modified: projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_link.sh ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_link.sh Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/contrib/netbsd-tests/fs/tmpfs/t_link.sh Fri Oct 21 16:29:40 2016 (r307736) @@ -93,7 +93,18 @@ subdirs_body() { test_unmount } +# Begin FreeBSD +if true; then +atf_test_case kqueue cleanup +kqueue_cleanup() { + Mount_Point=$(pwd)/mntpt test_unmount || : +} +else +# End FreeBSD atf_test_case kqueue +# Begin FreeBSD +fi +# End FreeBSD kqueue_head() { atf_set "descr" "Verifies that creating a link raises the correct" \ "kqueue events" @@ -102,6 +113,10 @@ kqueue_head() { kqueue_body() { test_mount + # Begin FreeBSD + atf_expect_fail "fails with: dir/b did not receive NOTE_LINK - bug 213662" + # End FreeBSD + atf_check -s eq:0 -o empty -e empty mkdir dir atf_check -s eq:0 -o empty -e empty touch dir/a echo 'ln dir/a dir/b' | kqueue_monitor 2 dir dir/a Modified: projects/clang390-import/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c Fri Oct 21 16:29:40 2016 (r307736) @@ -97,6 +97,15 @@ ATF_TC_BODY(swapcontext1, tc) { pthread_t thread; +#if defined(__FreeBSD__) && defined(__mips__) + /* + * MIPS modifies TLS pointer in set_mcontext(), so + * swapping contexts obtained from different threads + * gives us different pthread_self() return value. + */ + atf_tc_skip("Platform is not supported."); +#endif + oself = (void *)&val1; nself = (void *)&val2; Modified: projects/clang390-import/etc/devd.conf ============================================================================== --- projects/clang390-import/etc/devd.conf Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/etc/devd.conf Fri Oct 21 16:29:40 2016 (r307736) @@ -24,7 +24,7 @@ options { [0-9]+"; set wifi-driver-regex "(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\ - upgt|ural|urtw|urtwn|wi|wpi|wtap|zyd)[0-9]+"; + upgt|ural|urtw|rtwn_usb|wi|wpi|wtap|zyd)[0-9]+"; }; # Note that the attach/detach with the highest value wins, so that one can Modified: projects/clang390-import/etc/devd/usb.conf ============================================================================== --- projects/clang390-import/etc/devd/usb.conf Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/etc/devd/usb.conf Fri Oct 21 16:29:40 2016 (r307736) @@ -185,6 +185,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0409"; + match "product" "0x0408"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0409"; match "product" "(0x8024|0x8025)"; action "kldload -n uipaq"; }; @@ -304,6 +312,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0411"; + match "product" "(0x0242|0x025d)"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0413"; match "product" "0x2101"; action "kldload -n uplcom"; @@ -553,6 +569,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x04bb"; + match "product" "0x0952"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x04bb"; match "product" "(0x0a03|0x0a0e)"; action "kldload -n uplcom"; }; @@ -682,7 +706,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x04f2"; match "product" "(0xaff7|0xaff8|0xaff9|0xaffa|0xaffa)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -754,7 +778,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "0x1102"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -778,7 +802,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x050d"; match "product" "(0x2102|0x2103)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -1050,7 +1074,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x056e"; match "product" "0x4008"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -1146,7 +1170,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0586"; match "product" "0x341f"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -1160,6 +1184,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0586"; + match "product" "0x3426"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x058f"; match "product" "0x9720"; action "kldload -n uplcom"; @@ -1442,7 +1474,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x06f8"; match "product" "0xe033"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -1658,7 +1690,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x07aa"; match "product" "0x0056"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -1722,7 +1754,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x07b8"; match "product" "(0x8178|0x8179|0x8188|0x8189)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2026,7 +2058,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0846"; match "product" "0x9021"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2041,8 +2073,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0846"; - match "product" "0x9041"; - action "kldload -n if_urtwn"; + match "product" "(0x9041|0x9052)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2498,7 +2530,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0b05"; match "product" "0x17ab"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2522,7 +2554,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0b05"; match "product" "0x17ba"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2537,6 +2569,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0b05"; + match "product" "0x17d2"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0b05"; match "product" "(0x4200|0x4201|0x4202|0x420f|0x9200|0x9202)"; action "kldload -n uipaq"; }; @@ -2658,7 +2698,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0bda"; match "product" "(0x0179|0x018a|0x317f)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2682,7 +2722,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0bda"; match "product" "0x8170"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2698,7 +2738,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0bda"; match "product" "(0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2714,7 +2754,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0bda"; match "product" "(0x818a|0x8191)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -2738,7 +2778,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0bda"; match "product" "0x8754"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3162,7 +3202,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0df6"; match "product" "0x0052"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3178,7 +3218,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0df6"; match "product" "(0x005c|0x0061)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3193,6 +3233,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0df6"; + match "product" "0x0074"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0df6"; match "product" "0x061c"; action "kldload -n if_axe"; }; @@ -3257,8 +3305,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0e66"; - match "product" "0x0019"; - action "kldload -n if_urtwn"; + match "product" "(0x0019|0x0023)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3330,7 +3378,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x0eb0"; match "product" "0x9071"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3490,7 +3538,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x103c"; match "product" "0x1629"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -3976,6 +4024,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x13b1"; + match "product" "0x003f"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x13d2"; match "product" "0x0400"; action "kldload -n if_kue"; @@ -4018,7 +4074,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x13d3"; match "product" "(0x3357|0x3358|0x3359)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -4569,6 +4625,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x1740"; + match "product" "0x0100"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x1740"; match "product" "(0x0605|0x0615)"; action "kldload -n if_run"; }; @@ -4961,8 +5025,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; - match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310)"; - action "kldload -n if_urtwn"; + match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310|0x3314|0x3315|0x3316|0x3318)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5042,7 +5106,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x2019"; match "product" "(0x1201|0x4902)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5089,8 +5153,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2019"; - match "product" "(0xab2a|0xab2b|0xab2e)"; - action "kldload -n if_urtwn"; + match "product" "(0xab2a|0xab2b|0xab2e|0xab30)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5130,7 +5194,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x2019"; match "product" "0xed17"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5170,7 +5234,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x20f4"; match "product" "0x624d"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5185,8 +5249,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x20f4"; - match "product" "0x648b"; - action "kldload -n if_urtwn"; + match "product" "(0x648b|0x805b)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5232,6 +5296,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x2357"; + match "product" "0x0101"; + action "kldload -n if_rtwn_usb"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x2405"; match "product" "0x0003"; action "kldload -n uslcom"; @@ -5354,7 +5426,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x4855"; match "product" "(0x0090|0x0091)"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5465,8 +5537,8 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x7392"; - match "product" "(0x7811|0x7822)"; - action "kldload -n if_urtwn"; + match "product" "(0x7811|0x7822|0xa811|0xa812|0xa822)"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5522,7 +5594,7 @@ nomatch 32 { match "mode" "host"; match "vendor" "0x9846"; match "product" "0x9041"; - action "kldload -n if_urtwn"; + action "kldload -n if_rtwn_usb"; }; nomatch 32 { @@ -5817,5 +5889,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2722 USB entries processed +# 2743 USB entries processed Modified: projects/clang390-import/etc/mtree/BSD.tests.dist ============================================================================== --- projects/clang390-import/etc/mtree/BSD.tests.dist Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/etc/mtree/BSD.tests.dist Fri Oct 21 16:29:40 2016 (r307736) @@ -396,6 +396,10 @@ .. file .. + fs + tmpfs + .. + .. geom class concat Modified: projects/clang390-import/etc/rc ============================================================================== --- projects/clang390-import/etc/rc Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/etc/rc Fri Oct 21 16:29:40 2016 (r307736) @@ -135,16 +135,16 @@ done # Note: this assumes firstboot_sentinel is on / when we have # a read-only /, or that it is on media that's writable. if [ -e ${firstboot_sentinel} ]; then - [ ${root_rw_mount} = "yes" ] || mount -uw / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw / chflags -R 0 ${firstboot_sentinel} rm -rf ${firstboot_sentinel} if [ -e ${firstboot_sentinel}-reboot ]; then chflags -R 0 ${firstboot_sentinel}-reboot rm -rf ${firstboot_sentinel}-reboot - [ ${root_rw_mount} = "yes" ] || mount -ur / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / kill -INT 1 fi - [ ${root_rw_mount} = "yes" ] || mount -ur / + [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / fi echo '' Modified: projects/clang390-import/gnu/lib/Makefile ============================================================================== --- projects/clang390-import/gnu/lib/Makefile Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/gnu/lib/Makefile Fri Oct 21 16:29:40 2016 (r307736) @@ -2,26 +2,23 @@ .include <src.opts.mk> -SUBDIR= csu libgcc libregex +SUBDIR= csu +SUBDIR+= libgcc SUBDIR.${MK_DIALOG}+= libdialog - -.if ${MK_GCC} != "no" -SUBDIR+= libgcov libgomp -.endif - -.if ${MK_SSP} != "no" -SUBDIR+= libssp -.endif - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_GCC}+= libgcov libgomp +SUBDIR.${MK_SSP}+= libssp +SUBDIR.${MK_TESTS}+= tests .if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no" SUBDIR+= libreadline .endif +.if ${MK_GNU_DIFF} != "no" || ${MK_GNU_GREP} != "no" || \ + ${MK_GNU_GREP_COMPAT} != "no" || ${MK_GDB} != "no" +SUBDIR+= libregex +.endif + # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. .if ${MK_GNUCXX} != "no" Modified: projects/clang390-import/gnu/usr.bin/Makefile ============================================================================== --- projects/clang390-import/gnu/usr.bin/Makefile Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/gnu/usr.bin/Makefile Fri Oct 21 16:29:40 2016 (r307736) @@ -2,48 +2,25 @@ .include <src.opts.mk> -SUBDIR= ${_binutils} \ - ${_cc} \ - diff \ - diff3 \ - ${_dtc} \ - ${_gdb} \ - ${_gperf} \ - grep \ - ${_groff} \ - ${_tests} - SUBDIR_DEPEND_gdb= ${_binutils} .if ${MK_CXX} != "no" -.if ${MK_GCC} != "no" -_gperf= gperf -.endif -.if ${MK_GROFF} != "no" -_groff= groff -.endif +SUBDIR.${MK_GCC}+= gperf +SUBDIR.${MK_GROFF}+= groff .endif -.if ${MK_GPL_DTC} != "no" -_dtc= dtc -.endif - -.if ${MK_TESTS} != "no" -_tests= tests -.endif +SUBDIR.${MK_BINUTILS}+= binutils +SUBDIR.${MK_DIALOG}+= dialog .if ${MK_BINUTILS} != "no" -_binutils= binutils -.if ${MK_GDB} != "no" -_gdb= gdb -.endif +SUBDIR.${MK_GDB}+= gdb .endif -.if ${MK_GCC} != "no" -_cc= cc -.endif - -SUBDIR.${MK_DIALOG}+= dialog +SUBDIR.${MK_GCC}+= cc +SUBDIR.${MK_GNU_DIFF}+= diff diff3 +SUBDIR.${MK_GNU_GREP}+= grep +SUBDIR.${MK_GPL_DTC}+= dtc +SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= Modified: projects/clang390-import/lib/libc/sys/kldsym.2 ============================================================================== --- projects/clang390-import/lib/libc/sys/kldsym.2 Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/lib/libc/sys/kldsym.2 Fri Oct 21 16:29:40 2016 (r307736) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 26, 2001 +.Dd October 17, 2016 .Dt KLDSYM 2 .Os .Sh NAME @@ -36,7 +36,7 @@ .In sys/param.h .In sys/linker.h .Ft int -.Fn kldsym "int fileid" "int command" "void *data" +.Fn kldsym "int fileid" "int cmd" "void *data" .Sh DESCRIPTION The .Fn kldsym @@ -48,7 +48,7 @@ If .Fa fileid is 0, all loaded modules are searched. Currently, the only -.Fa command +.Fa cmd implemented is .Dv KLDSYM_LOOKUP . .Pp @@ -96,7 +96,7 @@ system call will fail if: Invalid value in .Fa data->version or -.Fa command . +.Fa cmd . .It Bq Er ENOENT The .Fa fileid Modified: projects/clang390-import/lib/libc/tests/Makefile ============================================================================== --- projects/clang390-import/lib/libc/tests/Makefile Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/lib/libc/tests/Makefile Fri Oct 21 16:29:40 2016 (r307736) @@ -8,7 +8,6 @@ TESTS_SUBDIRS= c063 TESTS_SUBDIRS+= db TESTS_SUBDIRS+= gen TESTS_SUBDIRS+= hash -TESTS_SUBDIRS+= iconv TESTS_SUBDIRS+= inet TESTS_SUBDIRS+= net TESTS_SUBDIRS+= nss @@ -26,6 +25,10 @@ TESTS_SUBDIRS+= ttyio SUBDIR_DEPEND_tls= tls_dso +.if ${MK_ICONV} != "no" +TESTS_SUBDIRS+= iconv +.endif + .if ${MK_LOCALES} != "no" TESTS_SUBDIRS+= locale .endif Modified: projects/clang390-import/lib/libmd/md4.h ============================================================================== --- projects/clang390-import/lib/libmd/md4.h Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/lib/libmd/md4.h Fri Oct 21 16:29:40 2016 (r307736) @@ -53,6 +53,12 @@ __BEGIN_DECLS #ifndef MD4End #define MD4End _libmd_MD4End #endif +#ifndef MD4Fd +#define MD4Fd _libmd_MD4Fd +#endif +#ifndef MD4FdChunk +#define MD4FdChunk _libmd_MD4FdChunk +#endif #ifndef MD4File #define MD4File _libmd_MD4File #endif @@ -68,6 +74,8 @@ void MD4Update(MD4_CTX *, const void * void MD4Pad(MD4_CTX *); void MD4Final(unsigned char [16], MD4_CTX *); char * MD4End(MD4_CTX *, char *); +char * MD4Fd(int, char *); +char * MD4FdChunk(int, char *, off_t, off_t); char * MD4File(const char *, char *); char * MD4FileChunk(const char *, char *, off_t, off_t); char * MD4Data(const void *, unsigned int, char *); Modified: projects/clang390-import/lib/libmd/md5.h ============================================================================== --- projects/clang390-import/lib/libmd/md5.h Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/lib/libmd/md5.h Fri Oct 21 16:29:40 2016 (r307736) @@ -25,6 +25,12 @@ #ifndef MD5End #define MD5End _libmd_MD5End #endif +#ifndef MD5Fd +#define MD5Fd _libmd_MD5Fd +#endif +#ifndef MD5FdChunk +#define MD5FdChunk _libmd_MD5FdChunk +#endif #ifndef MD5File #define MD5File _libmd_MD5File #endif @@ -37,13 +43,5 @@ #endif -#ifdef __cplusplus -#define static -#endif - #include <sys/md5.h> - -#ifdef __cplusplus -#undef static -#endif #endif /* _MD5_H_ */ Modified: projects/clang390-import/lib/libmd/mdXhl.c ============================================================================== --- projects/clang390-import/lib/libmd/mdXhl.c Fri Oct 21 16:14:58 2016 (r307735) +++ projects/clang390-import/lib/libmd/mdXhl.c Fri Oct 21 16:29:40 2016 (r307736) @@ -42,18 +42,18 @@ MDXEnd(MDX_CTX *ctx, char *buf) } char * -MDXFile(const char *filename, char *buf) +MDXFd(int fd, char *buf) { - return (MDXFileChunk(filename, buf, 0, 0)); + return MDXFdChunk(fd, buf, 0, 0); } char * -MDXFileChunk(const char *filename, char *buf, off_t ofs, off_t len) +MDXFdChunk(int fd, char *buf, off_t ofs, off_t len) { unsigned char buffer[16*1024]; MDX_CTX ctx; struct stat stbuf; - int fd, readrv, e; + int readrv, e; off_t remain; if (len < 0) { @@ -62,9 +62,6 @@ MDXFileChunk(const char *filename, char } MDXInit(&ctx); - fd = open(filename, O_RDONLY); - if (fd < 0) - return NULL; if (ofs != 0) { errno = 0; if (lseek(fd, ofs, SEEK_SET) != ofs || @@ -86,15 +83,34 @@ MDXFileChunk(const char *filename, char remain -= readrv; } error: - e = errno; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610211629.u9LGTfQO064294>