svn commit: r337590 - in projects/clang700-import: . bin/date bin/date/tests bin/dd bin/ls cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/open...

Dimitry Andric dim at FreeBSD.org
Fri Aug 10 21:02:34 UTC 2018 

Author: dim
Date: Fri Aug 10 21:02:28 2018
New Revision: 337590
URL: https://svnweb.freebsd.org/changeset/base/337590

Log:
  Merge ^/head r337286 through r337585.

Added:
  projects/clang700-import/contrib/file/magic/Magdir/dataone
     - copied unchanged from r337585, head/contrib/file/magic/Magdir/dataone
  projects/clang700-import/contrib/file/python/CHANGELOG.md
     - copied unchanged from r337585, head/contrib/file/python/CHANGELOG.md
  projects/clang700-import/contrib/file/python/LICENSE
     - copied unchanged from r337585, head/contrib/file/python/LICENSE
  projects/clang700-import/contrib/file/python/README.md
     - copied unchanged from r337585, head/contrib/file/python/README.md
  projects/clang700-import/contrib/file/python/tests.py
     - copied unchanged from r337585, head/contrib/file/python/tests.py
  projects/clang700-import/contrib/file/tests/JW07022A.mp3.result
     - copied unchanged from r337585, head/contrib/file/tests/JW07022A.mp3.result
  projects/clang700-import/contrib/file/tests/JW07022A.mp3.testfile
     - copied unchanged from r337585, head/contrib/file/tests/JW07022A.mp3.testfile
  projects/clang700-import/lib/libc/gen/timespec_get.3
     - copied unchanged from r337585, head/lib/libc/gen/timespec_get.3
  projects/clang700-import/lib/libc/gen/timespec_get.c
     - copied unchanged from r337585, head/lib/libc/gen/timespec_get.c
  projects/clang700-import/sbin/savecore/minfree
     - copied unchanged from r337585, head/sbin/savecore/minfree
  projects/clang700-import/share/vt/keymaps/us.macbook.kbd
     - copied unchanged from r337585, head/share/vt/keymaps/us.macbook.kbd
  projects/clang700-import/tools/build/options/WITH_LLVM_TARGET_BPF
     - copied unchanged from r337585, head/tools/build/options/WITH_LLVM_TARGET_BPF
  projects/clang700-import/usr.sbin/autofs/auto_master
     - copied unchanged from r337585, head/usr.sbin/autofs/auto_master
  projects/clang700-import/usr.sbin/autofs/autofs/
     - copied from r337585, head/usr.sbin/autofs/autofs/
  projects/clang700-import/usr.sbin/freebsd-update/freebsd-update.conf
     - copied unchanged from r337585, head/usr.sbin/freebsd-update/freebsd-update.conf
  projects/clang700-import/usr.sbin/nfsd/pnfsserver.4
     - copied unchanged from r337585, head/usr.sbin/nfsd/pnfsserver.4
  projects/clang700-import/usr.sbin/portsnap/portsnap/portsnap.conf
     - copied unchanged from r337585, head/usr.sbin/portsnap/portsnap/portsnap.conf
Deleted:
  projects/clang700-import/contrib/file/python/README
  projects/clang700-import/etc/auto_master
  projects/clang700-import/etc/autofs/
  projects/clang700-import/etc/freebsd-update.conf
  projects/clang700-import/etc/minfree
  projects/clang700-import/etc/portsnap.conf
Modified:
  projects/clang700-import/Makefile.inc1
  projects/clang700-import/UPDATING
  projects/clang700-import/bin/date/date.1
  projects/clang700-import/bin/date/date.c
  projects/clang700-import/bin/date/tests/format_string_test.sh
  projects/clang700-import/bin/dd/args.c
  projects/clang700-import/bin/dd/dd.1
  projects/clang700-import/bin/dd/dd.c
  projects/clang700-import/bin/dd/dd.h
  projects/clang700-import/bin/dd/extern.h
  projects/clang700-import/bin/dd/misc.c
  projects/clang700-import/bin/ls/ls.1
  projects/clang700-import/bin/ls/ls.c
  projects/clang700-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang700-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/clang700-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang700-import/contrib/file/ChangeLog
  projects/clang700-import/contrib/file/Makefile.in
  projects/clang700-import/contrib/file/README
  projects/clang700-import/contrib/file/aclocal.m4
  projects/clang700-import/contrib/file/compile
  projects/clang700-import/contrib/file/config.guess
  projects/clang700-import/contrib/file/config.h.in
  projects/clang700-import/contrib/file/config.sub
  projects/clang700-import/contrib/file/configure
  projects/clang700-import/contrib/file/configure.ac
  projects/clang700-import/contrib/file/depcomp
  projects/clang700-import/contrib/file/doc/Makefile.in
  projects/clang700-import/contrib/file/doc/file.man
  projects/clang700-import/contrib/file/doc/magic.man
  projects/clang700-import/contrib/file/install-sh
  projects/clang700-import/contrib/file/ltmain.sh
  projects/clang700-import/contrib/file/magic/Magdir/animation
  projects/clang700-import/contrib/file/magic/Magdir/archive
  projects/clang700-import/contrib/file/magic/Magdir/audio
  projects/clang700-import/contrib/file/magic/Magdir/cad
  projects/clang700-import/contrib/file/magic/Magdir/console
  projects/clang700-import/contrib/file/magic/Magdir/database
  projects/clang700-import/contrib/file/magic/Magdir/dbpf
  projects/clang700-import/contrib/file/magic/Magdir/dump
  projects/clang700-import/contrib/file/magic/Magdir/elf
  projects/clang700-import/contrib/file/magic/Magdir/fsav
  projects/clang700-import/contrib/file/magic/Magdir/images
  projects/clang700-import/contrib/file/magic/Magdir/linux
  projects/clang700-import/contrib/file/magic/Magdir/make
  projects/clang700-import/contrib/file/magic/Magdir/measure
  projects/clang700-import/contrib/file/magic/Magdir/msdos
  projects/clang700-import/contrib/file/magic/Magdir/msooxml
  projects/clang700-import/contrib/file/magic/Magdir/pdf
  projects/clang700-import/contrib/file/magic/Magdir/sgi
  projects/clang700-import/contrib/file/magic/Makefile.am
  projects/clang700-import/contrib/file/magic/Makefile.in
  projects/clang700-import/contrib/file/missing
  projects/clang700-import/contrib/file/python/Makefile.am
  projects/clang700-import/contrib/file/python/Makefile.in
  projects/clang700-import/contrib/file/python/magic.py
  projects/clang700-import/contrib/file/python/setup.py
  projects/clang700-import/contrib/file/src/Makefile.in
  projects/clang700-import/contrib/file/src/apprentice.c
  projects/clang700-import/contrib/file/src/compress.c
  projects/clang700-import/contrib/file/src/der.c
  projects/clang700-import/contrib/file/src/file.h
  projects/clang700-import/contrib/file/src/funcs.c
  projects/clang700-import/contrib/file/src/readcdf.c
  projects/clang700-import/contrib/file/src/readelf.c
  projects/clang700-import/contrib/file/src/readelf.h
  projects/clang700-import/contrib/file/src/seccomp.c
  projects/clang700-import/contrib/file/src/softmagic.c
  projects/clang700-import/contrib/file/tests/Makefile.am
  projects/clang700-import/contrib/file/tests/Makefile.in
  projects/clang700-import/contrib/flex/main.c
  projects/clang700-import/contrib/mdocml/apropos.1
  projects/clang700-import/contrib/mdocml/main.c
  projects/clang700-import/contrib/mdocml/man.1
  projects/clang700-import/contrib/mdocml/mandoc.1
  projects/clang700-import/contrib/netbsd-tests/lib/libpthread/t_mutex.c
  projects/clang700-import/contrib/tnftp/src/ftp_var.h
  projects/clang700-import/etc/Makefile
  projects/clang700-import/etc/mtree/BSD.var.dist
  projects/clang700-import/etc/root/dot.cshrc
  projects/clang700-import/etc/root/dot.profile
  projects/clang700-import/include/time.h
  projects/clang700-import/lib/clang/include/llvm/Config/AsmParsers.def
  projects/clang700-import/lib/clang/include/llvm/Config/AsmPrinters.def
  projects/clang700-import/lib/clang/include/llvm/Config/Disassemblers.def
  projects/clang700-import/lib/clang/include/llvm/Config/Targets.def
  projects/clang700-import/lib/clang/libllvm/Makefile
  projects/clang700-import/lib/clang/llvm.build.mk
  projects/clang700-import/lib/libc/gen/Makefile.inc
  projects/clang700-import/lib/libc/gen/Symbol.map
  projects/clang700-import/lib/libc/gen/ftok.c
  projects/clang700-import/lib/libc/inet/inet_addr.c
  projects/clang700-import/lib/libc/sys/gettimeofday.2
  projects/clang700-import/lib/libgcc_eh/Makefile.inc
  projects/clang700-import/lib/libnv/Makefile
  projects/clang700-import/release/Makefile.ec2
  projects/clang700-import/release/tools/arm.subr
  projects/clang700-import/release/tools/gce.conf
  projects/clang700-import/sbin/dhclient/dhclient.8
  projects/clang700-import/sbin/dhclient/dhclient.c
  projects/clang700-import/sbin/ifconfig/ifconfig.c
  projects/clang700-import/sbin/init/init.8
  projects/clang700-import/sbin/init/init.c
  projects/clang700-import/sbin/init/rc.d/dhclient
  projects/clang700-import/sbin/ipfw/ipfw.8
  projects/clang700-import/sbin/ipfw/ipfw2.c
  projects/clang700-import/sbin/ldconfig/ldconfig.c
  projects/clang700-import/sbin/mount/mount.8
  projects/clang700-import/sbin/mount/mount.c
  projects/clang700-import/sbin/savecore/Makefile
  projects/clang700-import/share/man/man4/cxgbe.4
  projects/clang700-import/share/man/man4/ddb.4
  projects/clang700-import/share/man/man4/pf.4
  projects/clang700-import/share/man/man4/tcp.4
  projects/clang700-import/share/man/man4/uep.4
  projects/clang700-import/share/man/man5/src.conf.5
  projects/clang700-import/share/man/man7/arch.7
  projects/clang700-import/share/man/man8/rc.subr.8
  projects/clang700-import/share/man/man9/VOP_LOOKUP.9
  projects/clang700-import/share/mk/bsd.dirs.mk
  projects/clang700-import/share/mk/bsd.own.mk
  projects/clang700-import/share/mk/src.opts.mk
  projects/clang700-import/share/skel/dot.cshrc
  projects/clang700-import/share/skel/dot.mailrc
  projects/clang700-import/share/skel/dot.profile
  projects/clang700-import/share/vt/keymaps/INDEX.keymaps
  projects/clang700-import/share/vt/keymaps/Makefile
  projects/clang700-import/stand/i386/gptboot/gptboot.c
  projects/clang700-import/stand/i386/isoboot/isoboot.c
  projects/clang700-import/stand/i386/libi386/biosdisk.c
  projects/clang700-import/stand/i386/libi386/pxe.h
  projects/clang700-import/stand/i386/zfsboot/zfsboot.c
  projects/clang700-import/stand/libsa/dosfs.c
  projects/clang700-import/stand/libsa/gets.c
  projects/clang700-import/stand/libsa/gzipfs.c
  projects/clang700-import/stand/man/loader.8
  projects/clang700-import/sys/amd64/amd64/efirt_machdep.c   (contents, props changed)
  projects/clang700-import/sys/amd64/linux/linux_machdep.c
  projects/clang700-import/sys/amd64/linux/linux_support.s
  projects/clang700-import/sys/amd64/linux32/linux32_machdep.c
  projects/clang700-import/sys/amd64/linux32/linux32_support.s
  projects/clang700-import/sys/arm/allwinner/aw_sid.c
  projects/clang700-import/sys/arm/allwinner/aw_sid.h
  projects/clang700-import/sys/arm/allwinner/aw_thermal.c
  projects/clang700-import/sys/arm/allwinner/clkng/ccu_a64.c
  projects/clang700-import/sys/arm/allwinner/files.allwinner
  projects/clang700-import/sys/arm/allwinner/if_awg.c
  projects/clang700-import/sys/arm/allwinner/if_emac.c
  projects/clang700-import/sys/arm/arm/pmap-v6.c
  projects/clang700-import/sys/arm/conf/NOTES
  projects/clang700-import/sys/arm/include/atomic-v4.h
  projects/clang700-import/sys/arm/include/pmap-v6.h
  projects/clang700-import/sys/arm64/arm64/efirt_machdep.c
  projects/clang700-import/sys/cam/cam_ccb.h
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  projects/clang700-import/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang700-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang700-import/sys/compat/linux/linux_socket.c
  projects/clang700-import/sys/compat/linuxkpi/common/include/asm/atomic-long.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/asm/atomic.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/asm/atomic64.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/bitops.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/types.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/workqueue.h
  projects/clang700-import/sys/compat/linuxkpi/common/src/linux_work.c
  projects/clang700-import/sys/conf/NOTES
  projects/clang700-import/sys/conf/newvers.sh
  projects/clang700-import/sys/conf/options
  projects/clang700-import/sys/contrib/ck/include/gcc/ppc/ck_pr.h
  projects/clang700-import/sys/contrib/ck/include/spinlock/hclh.h
  projects/clang700-import/sys/contrib/ck/src/ck_barrier_combining.c
  projects/clang700-import/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/clang700-import/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/clang700-import/sys/ddb/db_ps.c
  projects/clang700-import/sys/dev/ath/if_ath_rx_edma.c
  projects/clang700-import/sys/dev/bwi/if_bwi.c
  projects/clang700-import/sys/dev/cxgbe/adapter.h
  projects/clang700-import/sys/dev/cxgbe/common/common.h
  projects/clang700-import/sys/dev/cxgbe/common/t4_hw.c
  projects/clang700-import/sys/dev/cxgbe/offload.h
  projects/clang700-import/sys/dev/cxgbe/t4_filter.c
  projects/clang700-import/sys/dev/cxgbe/t4_main.c
  projects/clang700-import/sys/dev/cxgbe/t4_netmap.c
  projects/clang700-import/sys/dev/cxgbe/t4_sched.c
  projects/clang700-import/sys/dev/cxgbe/t4_sge.c
  projects/clang700-import/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang700-import/sys/dev/cxgbe/tom/t4_tom.c
  projects/clang700-import/sys/dev/efidev/efirt.c   (contents, props changed)
  projects/clang700-import/sys/dev/extres/clk/clk_div.c
  projects/clang700-import/sys/dev/hyperv/pcib/vmbus_pcib.c
  projects/clang700-import/sys/dev/mii/icsphy.c
  projects/clang700-import/sys/dev/mii/miidevs
  projects/clang700-import/sys/dev/usb/input/uep.c
  projects/clang700-import/sys/dev/usb/input/wmt.c
  projects/clang700-import/sys/dev/usb/net/if_muge.c
  projects/clang700-import/sys/dev/vt/hw/vga/vt_vga.c
  projects/clang700-import/sys/fs/ext2fs/ext2_dir.h
  projects/clang700-import/sys/fs/ext2fs/ext2_htree.c
  projects/clang700-import/sys/fs/ext2fs/ext2_lookup.c
  projects/clang700-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang700-import/sys/fs/fuse/fuse_file.c
  projects/clang700-import/sys/fs/fuse/fuse_vfsops.c
  projects/clang700-import/sys/fs/fuse/fuse_vnops.c
  projects/clang700-import/sys/fs/msdosfs/msdosfs_fat.c
  projects/clang700-import/sys/fs/nfs/nfs_commonkrpc.c
  projects/clang700-import/sys/fs/nfsserver/nfs_nfsdport.c
  projects/clang700-import/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang700-import/sys/i386/include/atomic.h
  projects/clang700-import/sys/kern/kern_sig.c
  projects/clang700-import/sys/kern/link_elf_obj.c
  projects/clang700-import/sys/kern/subr_epoch.c
  projects/clang700-import/sys/kern/subr_gtaskqueue.c
  projects/clang700-import/sys/kern/subr_msgbuf.c
  projects/clang700-import/sys/kern/subr_prf.c
  projects/clang700-import/sys/kern/sys_process.c
  projects/clang700-import/sys/kern/uipc_sockbuf.c
  projects/clang700-import/sys/kern/uipc_syscalls.c
  projects/clang700-import/sys/kern/uipc_usrreq.c
  projects/clang700-import/sys/modules/usb/uep/Makefile
  projects/clang700-import/sys/net/pfvar.h
  projects/clang700-import/sys/net80211/ieee80211_node.c
  projects/clang700-import/sys/netinet/in_mcast.c
  projects/clang700-import/sys/netinet/tcp_hpts.c
  projects/clang700-import/sys/netinet/tcp_reass.c
  projects/clang700-import/sys/netinet/tcp_stacks/rack.c
  projects/clang700-import/sys/netinet6/in6_mcast.c
  projects/clang700-import/sys/netpfil/ipfw/pmod/tcpmod.c
  projects/clang700-import/sys/powerpc/powernv/opal_dev.c
  projects/clang700-import/sys/powerpc/powerpc/db_disasm.c
  projects/clang700-import/sys/riscv/include/atomic.h
  projects/clang700-import/sys/riscv/include/vmparam.h
  projects/clang700-import/sys/riscv/riscv/uma_machdep.c
  projects/clang700-import/sys/sys/cdefs.h
  projects/clang700-import/sys/sys/efi.h
  projects/clang700-import/sys/sys/mbuf.h
  projects/clang700-import/sys/sys/msgbuf.h
  projects/clang700-import/sys/sys/param.h
  projects/clang700-import/sys/sys/proc.h
  projects/clang700-import/sys/sys/sockbuf.h
  projects/clang700-import/sys/sys/stdatomic.h
  projects/clang700-import/sys/ufs/ffs/ffs_alloc.c
  projects/clang700-import/sys/ufs/ffs/ffs_balloc.c
  projects/clang700-import/sys/ufs/ffs/ffs_extern.h
  projects/clang700-import/sys/ufs/ffs/ffs_inode.c
  projects/clang700-import/sys/ufs/ffs/ffs_snapshot.c
  projects/clang700-import/sys/ufs/ffs/ffs_softdep.c
  projects/clang700-import/sys/ufs/ffs/ffs_vfsops.c
  projects/clang700-import/sys/ufs/ffs/softdep.h
  projects/clang700-import/sys/ufs/ufs/ufsmount.h
  projects/clang700-import/sys/vm/swap_pager.c
  projects/clang700-import/sys/vm/vm_fault.c
  projects/clang700-import/sys/vm/vm_pageout.c
  projects/clang700-import/sys/vm/vm_swapout.c
  projects/clang700-import/tests/sys/kern/unix_passfd_test.c
  projects/clang700-import/tools/tools/git/git-svn-init
  projects/clang700-import/tools/tools/nanobsd/pcengines/Files/root/.cshrc
  projects/clang700-import/tools/tools/nanobsd/rescue/Files/root/.cshrc
  projects/clang700-import/tools/tools/sysbuild/sysbuild.sh
  projects/clang700-import/usr.bin/apply/apply.c
  projects/clang700-import/usr.bin/kdump/kdump.c
  projects/clang700-import/usr.bin/mail/cmd1.c
  projects/clang700-import/usr.bin/mail/mail.1
  projects/clang700-import/usr.bin/mail/pathnames.h
  projects/clang700-import/usr.bin/man/man.1
  projects/clang700-import/usr.bin/man/man.sh
  projects/clang700-import/usr.bin/msgs/msgs.1
  projects/clang700-import/usr.bin/msgs/pathnames.h
  projects/clang700-import/usr.bin/printf/printf.c
  projects/clang700-import/usr.bin/sed/compile.c
  projects/clang700-import/usr.bin/top/machine.c
  projects/clang700-import/usr.sbin/autofs/Makefile
  projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.8
  projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.c
  projects/clang700-import/usr.sbin/freebsd-update/Makefile
  projects/clang700-import/usr.sbin/freebsd-update/freebsd-update.sh
  projects/clang700-import/usr.sbin/mergemaster/mergemaster.8
  projects/clang700-import/usr.sbin/mergemaster/mergemaster.sh
  projects/clang700-import/usr.sbin/newsyslog/Makefile
  projects/clang700-import/usr.sbin/newsyslog/newsyslog.c
  projects/clang700-import/usr.sbin/nfsd/Makefile
  projects/clang700-import/usr.sbin/nfsd/nfsd.8
  projects/clang700-import/usr.sbin/nfsd/pnfs.4
  projects/clang700-import/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
  projects/clang700-import/usr.sbin/portsnap/portsnap/Makefile
  projects/clang700-import/usr.sbin/route6d/route6d.c
  projects/clang700-import/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  projects/clang700-import/   (props changed)
  projects/clang700-import/cddl/   (props changed)
  projects/clang700-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang700-import/contrib/elftoolchain/   (props changed)
  projects/clang700-import/contrib/file/   (props changed)
  projects/clang700-import/contrib/mdocml/   (props changed)
  projects/clang700-import/contrib/netbsd-tests/   (props changed)
  projects/clang700-import/contrib/tnftp/   (props changed)
  projects/clang700-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang700-import/sys/contrib/ck/   (props changed)
  projects/clang700-import/sys/contrib/ipfilter/   (props changed)

Modified: projects/clang700-import/Makefile.inc1
==============================================================================
--- projects/clang700-import/Makefile.inc1	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/Makefile.inc1	Fri Aug 10 21:02:28 2018	(r337590)
@@ -830,6 +830,13 @@ IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
+
+# When generating install media, do not allow user and group information from
+# the build host to affect the contents of the distribution.
+.if make(distributeworld)
+DB_FROM_SRC=	yes
+.endif
+
 .if defined(DB_FROM_SRC)
 INSTALLFLAGS+=	-N ${.CURDIR}/etc
 MTREEFLAGS+=	-N ${.CURDIR}/etc
@@ -1936,13 +1943,17 @@ update: .PHONY
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
+# libnv and libl are both requirements for config(8), which is an unconditional
+# bootstrap-tool.
+_config_deps= lib/libnv usr.bin/lex/lib
+
 legacy: .PHONY
 .if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to ${MINIMUM_SUPPORTED_REL} are not supported."; \
 	false
 .endif
 
-.for _tool in tools/build ${_elftoolchain_libs} lib/libnv
+.for _tool in tools/build ${_elftoolchain_libs} ${_config_deps}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
 	    if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \

Modified: projects/clang700-import/UPDATING
==============================================================================
--- projects/clang700-import/UPDATING	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/UPDATING	Fri Aug 10 21:02:28 2018	(r337590)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20180808:
+	The default pager for most commands has been changed to "less".  To
+	restore the old behavior, set PAGER="more" and MANPAGER="more -s" in
+	your environment.
+
 20180731:
 	The jedec_ts(4) driver has been removed. A superset of its functionality
 	is available in the jedec_dimm(4) driver, and the manpage for that

Modified: projects/clang700-import/bin/date/date.1
==============================================================================
--- projects/clang700-import/bin/date/date.1	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/date/date.1	Fri Aug 10 21:02:28 2018	(r337590)
@@ -32,7 +32,7 @@
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd June 1, 2018
+.Dd August 4, 2018
 .Dt DATE 1
 .Os
 .Sh NAME
@@ -64,6 +64,13 @@
 .Nm
 .Op Fl d Ar dst
 .Op Fl t Ar minutes_west
+.Nm
+.Op Fl jnu
+.Op Fl I Ns Op Ar FMT
+.Op Fl f Ar input_fmt
+.Op Fl r Ar ...
+.Op Fl v Ar ...
+.Op Ar new_date
 .Sh DESCRIPTION
 When invoked without arguments, the
 .Nm
@@ -113,6 +120,33 @@ provided rather than using the default
 format.
 Parsing is done using
 .Xr strptime 3 .
+.It Fl I Ns Op Ar FMT
+Use
+.St -iso8601
+output format.
+.Ar FMT
+may be omitted, in which case the default is
+.Sq date .
+Valid
+.Ar FMT
+values are
+.Sq date ,
+.Sq hours ,
+.Sq minutes ,
+and
+.Sq seconds .
+The date and time is formatted to the specified precision.
+When
+.Ar FMT
+is
+.Sq hours
+(or the more precise
+.Sq minutes
+or
+.Sq seconds ) ,
+the
+.St -iso8601
+format includes the timezone.
 .It Fl j
 Do not try to set the date.
 This allows you to use the
@@ -401,6 +435,14 @@ sets the time to
 .Li "2:32 PM" ,
 without modifying the date.
 .Pp
+The command
+.Pp
+.Dl "TZ=America/Los_Angeles date -Iseconds -r 1533415339"
+.Pp
+will display
+.Pp
+.Dl "2018-08-04T13:42:19-07:00"
+.Pp
 Finally the command:
 .Pp
 .Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s"""
@@ -425,6 +467,19 @@ between
 and
 .Xr timed 8
 fails.
+.Pp
+It is invalid to combine the
+.Fl I
+flag with either
+.Fl R
+or an output format
+.Dq ( + Ns ... )
+operand.
+If this occurs,
+.Nm
+prints:
+.Ql multiple output formats specified
+and exits with an error status.
 .Sh SEE ALSO
 .Xr locale 1 ,
 .Xr gettimeofday 2 ,
@@ -443,12 +498,22 @@ The
 utility is expected to be compatible with
 .St -p1003.2 .
 The
-.Fl d , f , j , n , r , t ,
+.Fl d , f , I , j , n , r , t ,
 and
 .Fl v
 options are all extensions to the standard.
+.Pp
+The format selected by the
+.Fl I
+flag is compatible with
+.St -iso8601 .
 .Sh HISTORY
 A
 .Nm
 command appeared in
 .At v1 .
+.Pp
+The
+.Fl I
+flag was added in
+.Fx 12.0 .

Modified: projects/clang700-import/bin/date/date.c
==============================================================================
--- projects/clang700-import/bin/date/date.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/date/date.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <err.h>
 #include <locale.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -68,10 +69,25 @@ __FBSDID("$FreeBSD$");
 static time_t tval;
 int retval;
 
-static void setthetime(const char *, const char *, int, int);
 static void badformat(void);
+static void iso8601_usage(const char *);
+static void multipleformats(void);
+static void printdate(const char *);
+static void printisodate(struct tm *);
+static void setthetime(const char *, const char *, int, int);
 static void usage(void);
 
+static const struct iso8601_fmt {
+	const char *refname;
+	const char *format_string;
+} iso8601_fmts[] = {
+	{ "date", "%Y-%m-%d" },
+	{ "hours", "T%H" },
+	{ "minutes", ":%M" },
+	{ "seconds", ":%S" },
+};
+static const struct iso8601_fmt *iso8601_selected;
+
 static const char *rfc2822_format = "%a, %d %b %Y %T %z";
 
 int
@@ -79,7 +95,7 @@ main(int argc, char *argv[])
 {
 	struct timezone tz;
 	int ch, rflag;
-	int jflag, nflag, Rflag;
+	bool Iflag, jflag, nflag, Rflag;
 	const char *format;
 	char buf[1024];
 	char *endptr, *fmt;
@@ -89,15 +105,16 @@ main(int argc, char *argv[])
 	const struct vary *badv;
 	struct tm *lt;
 	struct stat sb;
+	size_t i;
 
 	v = NULL;
 	fmt = NULL;
 	(void) setlocale(LC_TIME, "");
 	tz.tz_dsttime = tz.tz_minuteswest = 0;
 	rflag = 0;
-	jflag = nflag = Rflag = 0;
+	Iflag = jflag = nflag = Rflag = 0;
 	set_timezone = 0;
-	while ((ch = getopt(argc, argv, "d:f:jnRr:t:uv:")) != -1)
+	while ((ch = getopt(argc, argv, "d:f:I::jnRr:t:uv:")) != -1)
 		switch((char)ch) {
 		case 'd':		/* daylight savings time */
 			tz.tz_dsttime = strtol(optarg, &endptr, 10) ? 1 : 0;
@@ -108,6 +125,22 @@ main(int argc, char *argv[])
 		case 'f':
 			fmt = optarg;
 			break;
+		case 'I':
+			if (Rflag)
+				multipleformats();
+			Iflag = 1;
+			if (optarg == NULL) {
+				iso8601_selected = iso8601_fmts;
+				break;
+			}
+			for (i = 0; i < nitems(iso8601_fmts); i++)
+				if (strcmp(optarg, iso8601_fmts[i].refname) == 0)
+					break;
+			if (i == nitems(iso8601_fmts))
+				iso8601_usage(optarg);
+
+			iso8601_selected = &iso8601_fmts[i];
+			break;
 		case 'j':
 			jflag = 1;	/* don't set time */
 			break;
@@ -115,6 +148,8 @@ main(int argc, char *argv[])
 			nflag = 1;
 			break;
 		case 'R':		/* RFC 2822 datetime format */
+			if (Iflag)
+				multipleformats();
 			Rflag = 1;
 			break;
 		case 'r':		/* user specified seconds */
@@ -163,6 +198,8 @@ main(int argc, char *argv[])
 
 	/* allow the operands in any order */
 	if (*argv && **argv == '+') {
+		if (Iflag)
+			multipleformats();
 		format = *argv + 1;
 		++argv;
 	}
@@ -173,8 +210,11 @@ main(int argc, char *argv[])
 	} else if (fmt != NULL)
 		usage();
 
-	if (*argv && **argv == '+')
+	if (*argv && **argv == '+') {
+		if (Iflag)
+			multipleformats();
 		format = *argv + 1;
+	}
 
 	lt = localtime(&tval);
 	if (lt == NULL)
@@ -188,6 +228,9 @@ main(int argc, char *argv[])
 	}
 	vary_destroy(v);
 
+	if (Iflag)
+		printisodate(lt);
+
 	if (format == rfc2822_format)
 		/*
 		 * When using RFC 2822 datetime format, don't honor the
@@ -196,12 +239,40 @@ main(int argc, char *argv[])
 		setlocale(LC_TIME, "C");
 
 	(void)strftime(buf, sizeof(buf), format, lt);
+	printdate(buf);
+}
+
+static void
+printdate(const char *buf)
+{
 	(void)printf("%s\n", buf);
 	if (fflush(stdout))
 		err(1, "stdout");
 	exit(retval);
 }
 
+static void
+printisodate(struct tm *lt)
+{
+	const struct iso8601_fmt *it;
+	char fmtbuf[32], buf[32], tzbuf[8];
+
+	fmtbuf[0] = 0;
+	for (it = iso8601_fmts; it <= iso8601_selected; it++)
+		strlcat(fmtbuf, it->format_string, sizeof(fmtbuf));
+
+	(void)strftime(buf, sizeof(buf), fmtbuf, lt);
+
+	if (iso8601_selected > iso8601_fmts) {
+		(void)strftime(tzbuf, sizeof(tzbuf), "%z", lt);
+		memmove(&tzbuf[4], &tzbuf[3], 3);
+		tzbuf[3] = ':';
+		strlcat(buf, tzbuf, sizeof(buf));
+	}
+
+	printdate(buf);
+}
+
 #define	ATOI2(s)	((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
 
 static void
@@ -327,12 +398,27 @@ badformat(void)
 }
 
 static void
+iso8601_usage(const char *badarg)
+{
+	errx(1, "invalid argument '%s' for -I", badarg);
+}
+
+static void
+multipleformats(void)
+{
+	errx(1, "multiple output formats specified");
+}
+
+static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: date [-jnRu] [-d dst] [-r seconds] [-t west] "
-	    "[-v[+|-]val[ymwdHMS]] ... ",
+	(void)fprintf(stderr, "%s\n%s\n%s\n",
+	    "usage: date [-jnRu] [-d dst] [-r seconds|file] [-t west] "
+	    "[-v[+|-]val[ymwdHMS]]",
 	    "            "
-	    "[-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format]");
+	    "[-I[date | hours | minutes | seconds]]",
+	    "            "
+	    "[-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format]"
+	    );
 	exit(1);
 }

Modified: projects/clang700-import/bin/date/tests/format_string_test.sh
==============================================================================
--- projects/clang700-import/bin/date/tests/format_string_test.sh	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/date/tests/format_string_test.sh	Fri Aug 10 21:02:28 2018	(r337590)
@@ -48,6 +48,55 @@ ${desc}_test_body() {
 	atf_add_test_case ${desc}_test
 }
 
+iso8601_check()
+{
+	local arg flags exp_output_1 exp_output_2
+
+	arg="${1}"
+	flags="${2}"
+	exp_output_1="${3}"
+	exp_output_2="${4}"
+
+	atf_check -o "inline:${exp_output_1}\n" \
+	    date $flags -r ${TEST1} "-I${arg}"
+	atf_check -o "inline:${exp_output_2}\n" \
+	    date $flags -r ${TEST2} "-I${arg}"
+}
+
+iso8601_string_test()
+{
+	local desc arg exp_output_1 exp_output_2 flags
+
+	desc="${1}"
+	arg="${2}"
+	flags="${3}"
+	exp_output_1="${4}"
+	exp_output_2="${5}"
+
+	atf_test_case iso8601_${desc}_test
+	eval "
+iso8601_${desc}_test_body() {
+	iso8601_check '${arg}' '${flags}' '${exp_output_1}' '${exp_output_2}'
+}"
+	atf_add_test_case iso8601_${desc}_test
+
+	if [ -z "$flags" ]; then
+	    atf_test_case iso8601_${desc}_parity
+	    eval "
+iso8601_${desc}_parity_body() {
+	local exp1 exp2
+
+	atf_require_prog gdate
+
+	exp1=\"\$(gdate --date '@${TEST1}' '-I${arg}')\"
+	exp2=\"\$(gdate --date '@${TEST2}' '-I${arg}')\"
+
+	iso8601_check '${arg}' '' \"\${exp1}\" \"\${exp2}\"
+}"
+	    atf_add_test_case iso8601_${desc}_parity
+	fi
+}
+
 atf_init_test_cases()
 {
 	format_string_test A A Saturday Monday
@@ -89,4 +138,12 @@ atf_init_test_cases()
 	format_string_test z z +0000 +0000
 	format_string_test percent % % %
 	format_string_test plus + "Sat Feb  7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001"
+
+	iso8601_string_test default "" "" "1970-02-07" "2001-11-12"
+	iso8601_string_test date date "" "1970-02-07" "2001-11-12"
+	iso8601_string_test hours hours "" "1970-02-07T07+00:00" "2001-11-12T21+00:00"
+	iso8601_string_test minutes minutes "" "1970-02-07T07:04+00:00" "2001-11-12T21:20+00:00"
+	iso8601_string_test seconds seconds "" "1970-02-07T07:04:03+00:00" "2001-11-12T21:20:00+00:00"
+	# BSD date(1) does not support fractional seconds at this time.
+	#iso8601_string_test ns ns "" "1970-02-07T07:04:03,000000000+00:00" "2001-11-12T21:20:00,000000000+00:00"
 }

Modified: projects/clang700-import/bin/dd/args.c
==============================================================================
--- projects/clang700-import/bin/dd/args.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/args.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -306,6 +306,8 @@ f_status(char *arg)
 		ddflags |= C_NOINFO;
 	else if (strcmp(arg, "noxfer") == 0)
 		ddflags |= C_NOXFER;
+	else if (strcmp(arg, "progress") == 0)
+		ddflags |= C_PROGRESS;
 	else
 		errx(1, "unknown status %s", arg);
 }

Modified: projects/clang700-import/bin/dd/dd.1
==============================================================================
--- projects/clang700-import/bin/dd/dd.1	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/dd.1	Fri Aug 10 21:02:28 2018	(r337590)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2017
+.Dd August 8, 2018
 .Dt DD 1
 .Os
 .Sh NAME
@@ -164,12 +164,14 @@ bytes per second.
 Where
 .Cm value
 is one of the symbols from the following list.
-.Bl -tag -width "noxfer"
+.Bl -tag -width "progress"
 .It Cm noxfer
 Do not print the transfer statistics as the last line of status output.
 .It Cm none
 Do not print the status output.
 Error messages are shown; informational messages are not.
+.It Cm progress
+Print basic transfer statistics once per second.
 .El
 .It Cm conv Ns = Ns Ar value Ns Op , Ns Ar value ...
 Where

Modified: projects/clang700-import/bin/dd/dd.c
==============================================================================
--- projects/clang700-import/bin/dd/dd.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/dd.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/disklabel.h>
 #include <sys/filio.h>
 #include <sys/mtio.h>
+#include <sys/time.h>
 
 #include <assert.h>
 #include <capsicum_helpers.h>
@@ -89,6 +90,7 @@ const	u_char *ctab;		/* conversion table */
 char	fill_char;		/* Character to fill with if defined */
 size_t	speed = 0;		/* maximum speed, in bytes per second */
 volatile sig_atomic_t need_summary;
+volatile sig_atomic_t need_progress;
 
 int
 main(int argc __unused, char *argv[])
@@ -102,6 +104,7 @@ main(int argc __unused, char *argv[])
 		err(1, "unable to enter capability mode");
 
 	(void)signal(SIGINFO, siginfo_handler);
+	(void)signal(SIGALRM, sigalrm_handler);
 	(void)signal(SIGINT, terminate);
 
 	atexit(summary);
@@ -281,6 +284,14 @@ setup(void)
 		ctab = casetab;
 	}
 
+	if ((ddflags & C_PROGRESS)) {
+		struct itimerval timer = {
+			.it_interval = { .tv_sec = 1, .tv_usec = 0 },
+			.it_value = { .tv_sec = 1, .tv_usec = 0 },
+		};
+		setitimer(ITIMER_REAL, &timer, NULL);
+	}
+
 	if (clock_gettime(CLOCK_MONOTONIC, &st.start))
 		err(1, "clock_gettime");
 }
@@ -460,6 +471,9 @@ dd_in(void)
 		(*cfunc)();
 		if (need_summary) {
 			summary();
+		}
+		if (need_progress) {
+			progress();
 		}
 	}
 }

Modified: projects/clang700-import/bin/dd/dd.h
==============================================================================
--- projects/clang700-import/bin/dd/dd.h	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/dd.h	Fri Aug 10 21:02:28 2018	(r337590)
@@ -100,5 +100,6 @@ typedef struct {
 #define	C_STATUS	0x08000000
 #define	C_NOXFER	0x10000000
 #define	C_NOINFO	0x20000000
+#define	C_PROGRESS	0x40000000
 
 #define	C_PARITY	(C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET)

Modified: projects/clang700-import/bin/dd/extern.h
==============================================================================
--- projects/clang700-import/bin/dd/extern.h	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/extern.h	Fri Aug 10 21:02:28 2018	(r337590)
@@ -46,7 +46,9 @@ void pos_in(void);
 void pos_out(void);
 double secs_elapsed(void);
 void summary(void);
+void progress(void);
 void siginfo_handler(int);
+void sigalrm_handler(int);
 void terminate(int);
 void unblock(void);
 void unblock_close(void);
@@ -66,3 +68,4 @@ extern const u_char a2ibm_32V[], a2ibm_POSIX[];
 extern u_char casetab[];
 extern char fill_char;
 extern volatile sig_atomic_t need_summary;
+extern volatile sig_atomic_t need_progress;

Modified: projects/clang700-import/bin/dd/misc.c
==============================================================================
--- projects/clang700-import/bin/dd/misc.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/dd/misc.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
 #include "dd.h"
 #include "extern.h"
 
+static int need_newline;
+
 double
 secs_elapsed(void)
 {
@@ -83,6 +85,9 @@ summary(void)
 	if (ddflags & C_NOINFO)
 		return;
 
+	if (need_newline && !need_summary)
+		fprintf(stderr, "\n");
+
 	secs = secs_elapsed();
 
 	(void)fprintf(stderr,
@@ -102,12 +107,42 @@ summary(void)
 	need_summary = 0;
 }
 
+void
+progress(void)
+{
+	double secs;
+	static int lastlen;
+	int len;
+
+	secs = secs_elapsed();
+	len = fprintf(stderr,
+	    "\r%ju bytes transferred in %.0f secs (%.0f bytes/sec)",
+	    st.bytes, secs, st.bytes / secs);
+
+	if (len > 0) {
+		if (len < lastlen)
+			(void)fprintf(stderr, "%*s", len - lastlen, "");
+		lastlen = len;
+	}
+
+	need_newline = 1;
+	need_progress = 0;
+}
+
 /* ARGSUSED */
 void
 siginfo_handler(int signo __unused)
 {
 
 	need_summary = 1;
+}
+
+/* ARGSUSED */
+void
+sigalrm_handler(int signo __unused)
+{
+
+	need_progress = 1;
 }
 
 /* ARGSUSED */

Modified: projects/clang700-import/bin/ls/ls.1
==============================================================================
--- projects/clang700-import/bin/ls/ls.1	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/ls/ls.1	Fri Aug 10 21:02:28 2018	(r337590)
@@ -32,7 +32,7 @@
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\" $FreeBSD$
 .\"
-.Dd January 17, 2018
+.Dd August 8, 2018
 .Dt LS 1
 .Os
 .Sh NAME
@@ -132,6 +132,8 @@ after each that is a
 Enable colorized output.
 This option is equivalent to defining
 .Ev CLICOLOR
+or
+.Ev COLORTERM
 in the environment.
 (See below.)
 This functionality can be compiled out by removing the definition of
@@ -628,6 +630,10 @@ The
 variable still needs to reference a color capable terminal however
 otherwise it is not possible to determine which color sequences to
 use.
+.It Ev COLORTERM
+See description for
+.Ev CLICOLOR
+above.
 .It Ev COLUMNS
 If this variable contains a string representing a
 decimal integer, it is used as the
@@ -652,7 +658,9 @@ for more information.
 .It Ev LSCOLORS
 The value of this variable describes what color to use for which
 attribute when colors are enabled with
-.Ev CLICOLOR .
+.Ev CLICOLOR
+or
+.Ev COLORTERM .
 This string is a concatenation of pairs of the format
 .Ar f Ns Ar b ,
 where
@@ -759,6 +767,8 @@ option for more details.
 .It Ev TERM
 The
 .Ev CLICOLOR
+and
+.Ev COLORTERM
 functionality depends on a terminal type with color capabilities.
 .It Ev TZ
 The timezone to use when displaying dates.

Modified: projects/clang700-import/bin/ls/ls.c
==============================================================================
--- projects/clang700-import/bin/ls/ls.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/bin/ls/ls.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -368,7 +368,7 @@ main(int argc, char *argv[])
 		f_listdot = 1;
 
 	/* Enabling of colours is conditional on the environment. */
-	if (getenv("CLICOLOR") &&
+	if ((getenv("CLICOLOR") || getenv("COLORTERM")) &&
 	    (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")))
 #ifdef COLORLS
 		if (tgetent(termcapbuf, getenv("TERM")) == 1) {

Modified: projects/clang700-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -343,13 +343,13 @@ static const dt_ident_t _dtrace_globals[] = {
 	&dt_idops_func, "void(@)" },
 { "mod", DT_IDENT_ACTFUNC, 0, DT_ACT_MOD, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_symaddr(uintptr_t)" },
+#ifdef illumos
 { "msgdsize", DT_IDENT_FUNC, 0, DIF_SUBR_MSGDSIZE,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "size_t(mblk_t *)" },
 { "msgsize", DT_IDENT_FUNC, 0, DIF_SUBR_MSGSIZE,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "size_t(mblk_t *)" },
-#ifdef illumos
 { "mutex_owned", DT_IDENT_FUNC, 0, DIF_SUBR_MUTEX_OWNED,
 	DT_ATTR_EVOLCMN, DT_VERS_1_0,
 	&dt_idops_func, "int(genunix`kmutex_t *)" },

Modified: projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -787,15 +787,13 @@ typedef struct mnttab_node {
 static int
 libzfs_mnttab_cache_compare(const void *arg1, const void *arg2)
 {
-	const mnttab_node_t *mtn1 = arg1;
-	const mnttab_node_t *mtn2 = arg2;
+	const mnttab_node_t *mtn1 = (const mnttab_node_t *)arg1;
+	const mnttab_node_t *mtn2 = (const mnttab_node_t *)arg2;
 	int rv;
 
 	rv = strcmp(mtn1->mtn_mt.mnt_special, mtn2->mtn_mt.mnt_special);
 
-	if (rv == 0)
-		return (0);
-	return (rv > 0 ? 1 : -1);
+	return (AVL_ISIGN(rv));
 }
 
 void

Modified: projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -272,12 +272,7 @@ zfs_snapshot_compare(const void *larg, const void *rar
 	lcreate = zfs_prop_get_int(l, ZFS_PROP_CREATETXG);
 	rcreate = zfs_prop_get_int(r, ZFS_PROP_CREATETXG);
 
-	if (lcreate < rcreate)
-		return (-1);
-	else if (lcreate > rcreate)
-		return (+1);
-	else
-		return (0);
+	return (AVL_CMP(lcreate, rcreate));
 }
 
 int

Modified: projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -489,15 +489,10 @@ typedef struct fsavl_node {
 static int
 fsavl_compare(const void *arg1, const void *arg2)
 {
-	const fsavl_node_t *fn1 = arg1;
-	const fsavl_node_t *fn2 = arg2;
+	const fsavl_node_t *fn1 = (const fsavl_node_t *)arg1;
+	const fsavl_node_t *fn2 = (const fsavl_node_t *)arg2;
 
-	if (fn1->fn_guid > fn2->fn_guid)
-		return (+1);
-	else if (fn1->fn_guid < fn2->fn_guid)
-		return (-1);
-	else
-		return (0);
+	return (AVL_CMP(fn1->fn_guid, fn2->fn_guid));
 }
 
 /*

Modified: projects/clang700-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Fri Aug 10 21:02:28 2018	(r337590)
@@ -670,6 +670,9 @@ extern zoneid_t getzoneid(void);
 #define	root_mount_wait()	do { } while (0)
 #define	root_mounted()		(1)
 
+#define	noinline	__attribute__((noinline))
+#define	likely(x)	__builtin_expect((x), 1)
+
 struct file {
 	void *dummy;
 };

Modified: projects/clang700-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang700-import/contrib/elftoolchain/readelf/readelf.c	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/contrib/elftoolchain/readelf/readelf.c	Fri Aug 10 21:02:28 2018	(r337590)
@@ -1189,6 +1189,7 @@ note_type_gnu(unsigned int nt)
 	case 2: return "NT_GNU_HWCAP (Hardware capabilities)";
 	case 3: return "NT_GNU_BUILD_ID (Build id set by ld(1))";
 	case 4: return "NT_GNU_GOLD_VERSION (GNU gold version)";
+	case 5: return "NT_GNU_PROPERTY_TYPE_0";
 	default: return (note_type_unknown(nt));
 	}
 }

Modified: projects/clang700-import/contrib/file/ChangeLog
==============================================================================
--- projects/clang700-import/contrib/file/ChangeLog	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/contrib/file/ChangeLog	Fri Aug 10 21:02:28 2018	(r337590)
@@ -1,3 +1,15 @@
+2018-07-25   8:50  Christos Zoulas <christos at zoulas.com>
+
+	* release 5.34
+
+2018-06-22  16:38  Christos Zoulas <christos at zoulas.com>
+
+	* Add Quad indirect offsets
+
+2018-05-24  14:10  Christos Zoulas <christos at zoulas.com>
+
+	* Enable parsing of ELF dynamic sections to handle PIE better
+
 2018-04-15  14:52  Christos Zoulas <christos at zoulas.com>
 
 	* release 5.33

Modified: projects/clang700-import/contrib/file/Makefile.in
==============================================================================
--- projects/clang700-import/contrib/file/Makefile.in	Fri Aug 10 20:37:32 2018	(r337589)
+++ projects/clang700-import/contrib/file/Makefile.in	Fri Aug 10 21:02:28 2018	(r337590)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -49,11 +87,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README TODO compile config.guess config.sub depcomp install-sh \
-	missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -61,6 +94,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -124,6 +159,9 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+	COPYING ChangeLog INSTALL NEWS README TODO compile \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -178,6 +216,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -193,6 +232,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -306,7 +346,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__c
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -327,8 +366,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -357,13 +396,12 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -538,10 +576,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -576,16 +620,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

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

More information about the svn-src-projects mailing list