svn commit: r340126 - in projects/clang700-import: . bin/getfacl bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace contrib/elftoolchain/libelftc contrib/elftoolchain/readelf contrib/netbsd-tests/li...

Dimitry Andric dim at FreeBSD.org
Sun Nov 4 15:49:16 UTC 2018 

Author: dim
Date: Sun Nov  4 15:49:06 2018
New Revision: 340126
URL: https://svnweb.freebsd.org/changeset/base/340126

Log:
  Merge ^/head r339813 through r340125.

Added:
  projects/clang700-import/lib/csu/arm/crt.h
     - copied unchanged from r340125, head/lib/csu/arm/crt.h
  projects/clang700-import/lib/csu/mips/crt.h
     - copied unchanged from r340125, head/lib/csu/mips/crt.h
  projects/clang700-import/lib/csu/powerpc/crt.h
     - copied unchanged from r340125, head/lib/csu/powerpc/crt.h
  projects/clang700-import/lib/csu/riscv/crt.h
     - copied unchanged from r340125, head/lib/csu/riscv/crt.h
  projects/clang700-import/lib/csu/sparc64/crt.h
     - copied unchanged from r340125, head/lib/csu/sparc64/crt.h
  projects/clang700-import/lib/csu/tests/dso/
     - copied from r340125, head/lib/csu/tests/dso/
  projects/clang700-import/lib/csu/tests/dynamiclib/
     - copied from r340125, head/lib/csu/tests/dynamiclib/
  projects/clang700-import/lib/libpmc/pmu-events/arch/x86/amdfam17h/data-fabric.json
     - copied unchanged from r340125, head/lib/libpmc/pmu-events/arch/x86/amdfam17h/data-fabric.json
  projects/clang700-import/lib/libpmc/pmu-events/arch/x86/amdfam17h/l3cache.json
     - copied unchanged from r340125, head/lib/libpmc/pmu-events/arch/x86/amdfam17h/l3cache.json
  projects/clang700-import/sbin/pfctl/tests/macro.sh
     - copied unchanged from r340125, head/sbin/pfctl/tests/macro.sh
  projects/clang700-import/share/monetdef/fr_FR.UTF-8.src
     - copied unchanged from r340125, head/share/monetdef/fr_FR.UTF-8.src
  projects/clang700-import/share/monetdef/it_IT.ISO8859-15.src
     - copied unchanged from r340125, head/share/monetdef/it_IT.ISO8859-15.src
  projects/clang700-import/share/monetdef/it_IT.UTF-8.src
     - copied unchanged from r340125, head/share/monetdef/it_IT.UTF-8.src
  projects/clang700-import/share/monetdef/nl_BE.ISO8859-1.src
     - copied unchanged from r340125, head/share/monetdef/nl_BE.ISO8859-1.src
  projects/clang700-import/share/numericdef/fr_FR.UTF-8.src
     - copied unchanged from r340125, head/share/numericdef/fr_FR.UTF-8.src
  projects/clang700-import/sys/x86/pci/pci_early_quirks.c
     - copied unchanged from r340125, head/sys/x86/pci/pci_early_quirks.c
  projects/clang700-import/sys/x86/pci/pci_early_quirks.h
     - copied unchanged from r340125, head/sys/x86/pci/pci_early_quirks.h
  projects/clang700-import/tests/sys/netpfil/pf/pfsync.sh
     - copied unchanged from r340125, head/tests/sys/netpfil/pf/pfsync.sh
  projects/clang700-import/tools/build/options/WITH_EXPERIMENTAL
     - copied unchanged from r340125, head/tools/build/options/WITH_EXPERIMENTAL
Deleted:
  projects/clang700-import/etc/nls.alias
  projects/clang700-import/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c
  projects/clang700-import/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h
  projects/clang700-import/share/monetdef/de_AT.ISO8859-1.src
  projects/clang700-import/share/monetdef/de_AT.ISO8859-15.src
  projects/clang700-import/share/monetdef/de_AT.UTF-8.src
  projects/clang700-import/tools/test/sort/bigtest/q-1.022.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.024.003.
  projects/clang700-import/tools/test/sort/bigtest/q-1.024.003.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.024.009.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.024.07.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.024.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.23.1.tgz
  projects/clang700-import/tools/test/sort/bigtest/q-1.23.tgz
Modified:
  projects/clang700-import/Makefile.inc1
  projects/clang700-import/Makefile.libcompat
  projects/clang700-import/ObsoleteFiles.inc
  projects/clang700-import/bin/getfacl/getfacl.c
  projects/clang700-import/bin/ps/ps.1
  projects/clang700-import/bin/sh/eval.c
  projects/clang700-import/bin/sh/exec.c
  projects/clang700-import/bin/sh/exec.h
  projects/clang700-import/bin/sh/jobs.c
  projects/clang700-import/bin/sh/main.c
  projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
  projects/clang700-import/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
  projects/clang700-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_mktime.c
  projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_strptime.c
  projects/clang700-import/contrib/ofed/librdmacm/examples/rping.c
  projects/clang700-import/contrib/one-true-awk/awk.1
  projects/clang700-import/contrib/smbfs/mount_smbfs/mount_smbfs.8
  projects/clang700-import/contrib/smbfs/smbutil/smbutil.1
  projects/clang700-import/contrib/tzcode/stdtime/localtime.c
  projects/clang700-import/contrib/tzdata/NEWS
  projects/clang700-import/contrib/tzdata/africa
  projects/clang700-import/contrib/tzdata/europe
  projects/clang700-import/contrib/tzdata/northamerica
  projects/clang700-import/contrib/tzdata/theory.html
  projects/clang700-import/contrib/tzdata/version
  projects/clang700-import/contrib/tzdata/ziguard.awk
  projects/clang700-import/contrib/tzdata/zishrink.awk
  projects/clang700-import/contrib/unbound/config.h
  projects/clang700-import/contrib/unbound/config.h.in
  projects/clang700-import/contrib/unbound/configure
  projects/clang700-import/contrib/unbound/configure.ac
  projects/clang700-import/contrib/unbound/util/config_file.c
  projects/clang700-import/etc/Makefile
  projects/clang700-import/etc/mtree/BSD.tests.dist
  projects/clang700-import/lib/csu/Makefile
  projects/clang700-import/lib/csu/common/crtbegin.c
  projects/clang700-import/lib/csu/common/crtend.c
  projects/clang700-import/lib/csu/tests/Makefile
  projects/clang700-import/lib/csu/tests/Makefile.tests
  projects/clang700-import/lib/csu/tests/cxx_constructors.cc
  projects/clang700-import/lib/csu/tests/fini_test.c
  projects/clang700-import/lib/csu/tests/init_test.c
  projects/clang700-import/lib/libbe/be.c
  projects/clang700-import/lib/libc/amd64/sys/Makefile.inc
  projects/clang700-import/lib/libc/amd64/sys/amd64_get_fsbase.c
  projects/clang700-import/lib/libc/amd64/sys/amd64_get_gsbase.c
  projects/clang700-import/lib/libc/amd64/sys/amd64_set_fsbase.c
  projects/clang700-import/lib/libc/amd64/sys/amd64_set_gsbase.c
  projects/clang700-import/lib/libc/stdtime/strptime.c
  projects/clang700-import/lib/libc/sys/gettimeofday.2
  projects/clang700-import/lib/libc/sys/poll.2
  projects/clang700-import/lib/libc/tests/Makefile
  projects/clang700-import/lib/libcompat/4.1/ftime.3
  projects/clang700-import/lib/libpmc/libpmc_pmu_util.c
  projects/clang700-import/lib/libpmc/pmu-events/jevents.c
  projects/clang700-import/lib/msun/man/csqrt.3
  projects/clang700-import/libexec/makewhatis.local/makewhatis.local.sh
  projects/clang700-import/libexec/rc/rc.conf
  projects/clang700-import/libexec/rc/rc.d/local_unbound
  projects/clang700-import/libexec/rc/rc.resume
  projects/clang700-import/libexec/rc/rc.subr
  projects/clang700-import/libexec/rtld-elf/Makefile
  projects/clang700-import/libexec/rtld-elf/aarch64/reloc.c
  projects/clang700-import/libexec/rtld-elf/amd64/reloc.c
  projects/clang700-import/libexec/rtld-elf/arm/reloc.c
  projects/clang700-import/libexec/rtld-elf/i386/reloc.c
  projects/clang700-import/libexec/rtld-elf/i386/rtld_machdep.h
  projects/clang700-import/libexec/rtld-elf/libmap.c
  projects/clang700-import/libexec/rtld-elf/libmap.h
  projects/clang700-import/libexec/rtld-elf/malloc.c
  projects/clang700-import/libexec/rtld-elf/map_object.c
  projects/clang700-import/libexec/rtld-elf/mips/reloc.c
  projects/clang700-import/libexec/rtld-elf/mips/rtld_machdep.h
  projects/clang700-import/libexec/rtld-elf/paths.h
  projects/clang700-import/libexec/rtld-elf/powerpc/reloc.c
  projects/clang700-import/libexec/rtld-elf/powerpc/rtld_machdep.h
  projects/clang700-import/libexec/rtld-elf/powerpc64/reloc.c
  projects/clang700-import/libexec/rtld-elf/powerpc64/rtld_machdep.h
  projects/clang700-import/libexec/rtld-elf/riscv/reloc.c
  projects/clang700-import/libexec/rtld-elf/rtld.c
  projects/clang700-import/libexec/rtld-elf/rtld.h
  projects/clang700-import/libexec/rtld-elf/rtld_lock.c
  projects/clang700-import/libexec/rtld-elf/rtld_printf.c
  projects/clang700-import/libexec/rtld-elf/sparc64/reloc.c
  projects/clang700-import/release/Makefile
  projects/clang700-import/release/release.sh
  projects/clang700-import/rescue/rescue/Makefile
  projects/clang700-import/sbin/clri/clri.c
  projects/clang700-import/sbin/devd/devd.conf
  projects/clang700-import/sbin/fsck_ffs/dir.c
  projects/clang700-import/sbin/fsck_ffs/fsck.h
  projects/clang700-import/sbin/fsck_ffs/inode.c
  projects/clang700-import/sbin/fsck_ffs/pass1.c
  projects/clang700-import/sbin/fsck_ffs/pass2.c
  projects/clang700-import/sbin/fsdb/fsdb.c
  projects/clang700-import/sbin/ifconfig/Makefile
  projects/clang700-import/sbin/ifconfig/af_nd6.c
  projects/clang700-import/sbin/ipfw/ipfw.8
  projects/clang700-import/sbin/ipfw/ipv6.c
  projects/clang700-import/sbin/mount_msdosfs/mount_msdosfs.c
  projects/clang700-import/sbin/pfctl/parse.y
  projects/clang700-import/sbin/pfctl/pfctl_parser.c
  projects/clang700-import/sbin/pfctl/tests/Makefile
  projects/clang700-import/sbin/rcorder/rcorder.8
  projects/clang700-import/share/colldef/af_ZA.UTF-8.src
  projects/clang700-import/share/colldef/am_ET.UTF-8.src
  projects/clang700-import/share/colldef/ar_SA.UTF-8.src
  projects/clang700-import/share/colldef/be_BY.UTF-8.src
  projects/clang700-import/share/colldef/ca_AD.UTF-8.src
  projects/clang700-import/share/colldef/cs_CZ.ISO8859-2.src
  projects/clang700-import/share/colldef/cs_CZ.UTF-8.src
  projects/clang700-import/share/colldef/da_DK.ISO8859-1.src
  projects/clang700-import/share/colldef/da_DK.ISO8859-15.src
  projects/clang700-import/share/colldef/da_DK.UTF-8.src
  projects/clang700-import/share/colldef/el_GR.UTF-8.src
  projects/clang700-import/share/colldef/en_US.UTF-8.src
  projects/clang700-import/share/colldef/es_MX.UTF-8.src
  projects/clang700-import/share/colldef/et_EE.UTF-8.src
  projects/clang700-import/share/colldef/fi_FI.UTF-8.src
  projects/clang700-import/share/colldef/fr_CA.UTF-8.src
  projects/clang700-import/share/colldef/he_IL.UTF-8.src
  projects/clang700-import/share/colldef/hi_IN.UTF-8.src
  projects/clang700-import/share/colldef/hr_HR.ISO8859-2.src
  projects/clang700-import/share/colldef/hu_HU.ISO8859-2.src
  projects/clang700-import/share/colldef/hu_HU.UTF-8.src
  projects/clang700-import/share/colldef/hy_AM.UTF-8.src
  projects/clang700-import/share/colldef/is_IS.UTF-8.src
  projects/clang700-import/share/colldef/ja_JP.UTF-8.src
  projects/clang700-import/share/colldef/ja_JP.eucJP.src
  projects/clang700-import/share/colldef/kk_KZ.UTF-8.src
  projects/clang700-import/share/colldef/ko_KR.UTF-8.src
  projects/clang700-import/share/colldef/lt_LT.UTF-8.src
  projects/clang700-import/share/colldef/lv_LV.UTF-8.src
  projects/clang700-import/share/colldef/nb_NO.ISO8859-1.src
  projects/clang700-import/share/colldef/nb_NO.ISO8859-15.src
  projects/clang700-import/share/colldef/nn_NO.ISO8859-1.src
  projects/clang700-import/share/colldef/nn_NO.ISO8859-15.src
  projects/clang700-import/share/colldef/nn_NO.UTF-8.src
  projects/clang700-import/share/colldef/pl_PL.UTF-8.src
  projects/clang700-import/share/colldef/ro_RO.UTF-8.src
  projects/clang700-import/share/colldef/ru_RU.UTF-8.src
  projects/clang700-import/share/colldef/se_NO.UTF-8.src
  projects/clang700-import/share/colldef/sk_SK.ISO8859-2.src
  projects/clang700-import/share/colldef/sk_SK.UTF-8.src
  projects/clang700-import/share/colldef/sl_SI.UTF-8.src
  projects/clang700-import/share/colldef/sr_RS.ISO8859-2.src
  projects/clang700-import/share/colldef/sr_RS.ISO8859-5.src
  projects/clang700-import/share/colldef/sr_RS.UTF-8.src
  projects/clang700-import/share/colldef/sr_RS.UTF-8 at latin.src
  projects/clang700-import/share/colldef/sv_SE.UTF-8.src
  projects/clang700-import/share/colldef/tr_TR.UTF-8.src
  projects/clang700-import/share/colldef/uk_UA.UTF-8.src
  projects/clang700-import/share/colldef/zh_CN.GB18030.src
  projects/clang700-import/share/colldef/zh_CN.GB2312.src
  projects/clang700-import/share/colldef/zh_CN.GBK.src
  projects/clang700-import/share/colldef/zh_CN.UTF-8.src
  projects/clang700-import/share/colldef/zh_CN.eucCN.src
  projects/clang700-import/share/colldef/zh_TW.Big5.src
  projects/clang700-import/share/colldef/zh_TW.UTF-8.src
  projects/clang700-import/share/ctypedef/Makefile
  projects/clang700-import/share/ctypedef/ca_IT.ISO8859-1.src
  projects/clang700-import/share/ctypedef/en_US.ISO8859-1.src
  projects/clang700-import/share/ctypedef/hi_IN.ISCII-DEV.src
  projects/clang700-import/share/ctypedef/hy_AM.ARMSCII-8.src
  projects/clang700-import/share/ctypedef/ja_JP.eucJP.src
  projects/clang700-import/share/ctypedef/zh_CN.eucCN.src
  projects/clang700-import/share/examples/jails/README
  projects/clang700-import/share/examples/jails/jib
  projects/clang700-import/share/examples/jails/jng
  projects/clang700-import/share/man/man3/CMSG_DATA.3
  projects/clang700-import/share/man/man4/ahci.4
  projects/clang700-import/share/man/man4/icmp6.4
  projects/clang700-import/share/man/man4/ip6.4
  projects/clang700-import/share/man/man4/netdump.4
  projects/clang700-import/share/man/man4/sctp.4
  projects/clang700-import/share/man/man4/tpm.4
  projects/clang700-import/share/man/man5/nsmb.conf.5
  projects/clang700-import/share/man/man5/pf.conf.5
  projects/clang700-import/share/man/man5/rc.conf.5
  projects/clang700-import/share/man/man5/src.conf.5
  projects/clang700-import/share/man/man8/rc.8
  projects/clang700-import/share/man/man9/Makefile
  projects/clang700-import/share/man/man9/VOP_CREATE.9
  projects/clang700-import/share/man/man9/contigmalloc.9
  projects/clang700-import/share/man/man9/domainset.9
  projects/clang700-import/share/man/man9/epoch.9
  projects/clang700-import/share/man/man9/malloc.9
  projects/clang700-import/share/man/man9/style.9
  projects/clang700-import/share/mk/bsd.compiler.mk
  projects/clang700-import/share/mk/src.opts.mk
  projects/clang700-import/share/monetdef/Makefile
  projects/clang700-import/share/monetdef/fr_CH.UTF-8.src
  projects/clang700-import/share/monetdef/hy_AM.ARMSCII-8.src
  projects/clang700-import/share/monetdef/hy_AM.UTF-8.src
  projects/clang700-import/share/monetdef/mn_MN.UTF-8.src
  projects/clang700-import/share/monetdef/nl_BE.ISO8859-15.src
  projects/clang700-import/share/monetdef/nl_BE.UTF-8.src
  projects/clang700-import/share/numericdef/Makefile
  projects/clang700-import/stand/i386/libi386/biosdisk.c
  projects/clang700-import/stand/i386/loader/main.c
  projects/clang700-import/stand/liblua/luaconf.h
  projects/clang700-import/stand/libsa/ip.c
  projects/clang700-import/stand/libsa/net.c
  projects/clang700-import/stand/libsa/tftp.c
  projects/clang700-import/stand/libsa/udp.c
  projects/clang700-import/stand/lua/cli.lua
  projects/clang700-import/stand/lua/cli.lua.8
  projects/clang700-import/stand/lua/core.lua
  projects/clang700-import/sys/amd64/amd64/machdep.c
  projects/clang700-import/sys/amd64/amd64/trap.c
  projects/clang700-import/sys/amd64/conf/GENERIC
  projects/clang700-import/sys/amd64/conf/MINIMAL
  projects/clang700-import/sys/amd64/include/md_var.h
  projects/clang700-import/sys/amd64/vmm/amd/svm_msr.c
  projects/clang700-import/sys/amd64/vmm/intel/vmcs.h
  projects/clang700-import/sys/arm/arm/trap-v4.c
  projects/clang700-import/sys/arm/arm/trap-v6.c
  projects/clang700-import/sys/arm/conf/std.arm
  projects/clang700-import/sys/arm/conf/std.armv6
  projects/clang700-import/sys/arm/conf/std.armv7
  projects/clang700-import/sys/arm64/arm64/locore.S
  projects/clang700-import/sys/arm64/arm64/mp_machdep.c
  projects/clang700-import/sys/arm64/arm64/pmap.c
  projects/clang700-import/sys/arm64/arm64/swtch.S
  projects/clang700-import/sys/arm64/arm64/trap.c
  projects/clang700-import/sys/arm64/conf/GENERIC
  projects/clang700-import/sys/arm64/include/armreg.h
  projects/clang700-import/sys/arm64/include/hypervisor.h
  projects/clang700-import/sys/cam/cam_periph.c
  projects/clang700-import/sys/cam/scsi/scsi_da.c
  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/zfs_vnops.c
  projects/clang700-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang700-import/sys/compat/freebsd32/freebsd32_proto.h
  projects/clang700-import/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/clang700-import/sys/compat/freebsd32/freebsd32_util.h
  projects/clang700-import/sys/compat/freebsd32/syscalls.master
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/dmapool.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/gfp.h
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/kernel.h
  projects/clang700-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang700-import/sys/conf/Makefile.amd64
  projects/clang700-import/sys/conf/Makefile.i386
  projects/clang700-import/sys/conf/files.amd64
  projects/clang700-import/sys/conf/kern.mk
  projects/clang700-import/sys/conf/kern.post.mk
  projects/clang700-import/sys/conf/newvers.sh
  projects/clang700-import/sys/conf/options
  projects/clang700-import/sys/contrib/dev/acpica/changes.txt
  projects/clang700-import/sys/contrib/dev/acpica/common/dmtbdump3.c
  projects/clang700-import/sys/contrib/dev/acpica/common/dmtbinfo3.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslload.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/dtio.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/dttable2.c
  projects/clang700-import/sys/contrib/dev/acpica/compiler/prscan.c
  projects/clang700-import/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/clang700-import/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/clang700-import/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/clang700-import/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/clang700-import/sys/contrib/dev/acpica/components/parser/psloop.c
  projects/clang700-import/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/clang700-import/sys/contrib/dev/acpica/components/tables/tbxfload.c
  projects/clang700-import/sys/contrib/dev/acpica/include/acdisasm.h
  projects/clang700-import/sys/contrib/dev/acpica/include/acnamesp.h
  projects/clang700-import/sys/contrib/dev/acpica/include/acpixf.h
  projects/clang700-import/sys/contrib/dev/acpica/include/actbinfo.h
  projects/clang700-import/sys/contrib/dev/acpica/include/actbl3.h
  projects/clang700-import/sys/dev/acpica/acpi_battery.c
  projects/clang700-import/sys/dev/ahci/ahci.c
  projects/clang700-import/sys/dev/ahci/ahci.h
  projects/clang700-import/sys/dev/ahci/ahci_pci.c
  projects/clang700-import/sys/dev/atkbdc/atkbd.c
  projects/clang700-import/sys/dev/cxgbe/crypto/t4_crypto.c
  projects/clang700-import/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/clang700-import/sys/dev/cxgbe/iw_cxgbe/qp.c
  projects/clang700-import/sys/dev/cxgbe/t4_main.c
  projects/clang700-import/sys/dev/cxgbe/t4_sge.c
  projects/clang700-import/sys/dev/evdev/cdev.c
  projects/clang700-import/sys/dev/evdev/evdev.c
  projects/clang700-import/sys/dev/evdev/evdev_private.h
  projects/clang700-import/sys/dev/filemon/filemon_wrapper.c
  projects/clang700-import/sys/dev/hwpmc/hwpmc_amd.c
  projects/clang700-import/sys/dev/hwpmc/hwpmc_amd.h
  projects/clang700-import/sys/dev/hwpmc/hwpmc_logging.c
  projects/clang700-import/sys/dev/hwpmc/hwpmc_mod.c
  projects/clang700-import/sys/dev/ixl/iavf_vc.c
  projects/clang700-import/sys/dev/ixl/if_iavf.c
  projects/clang700-import/sys/dev/kbdmux/kbdmux.c
  projects/clang700-import/sys/dev/random/random_harvestq.c
  projects/clang700-import/sys/dev/sound/pci/hda/hdac.c
  projects/clang700-import/sys/dev/usb/controller/ehci_pci.c
  projects/clang700-import/sys/dev/usb/input/ukbd.c
  projects/clang700-import/sys/fs/ext2fs/ext2_vnops.c
  projects/clang700-import/sys/fs/fuse/fuse_vnops.c
  projects/clang700-import/sys/fs/nandfs/nandfs_vnops.c
  projects/clang700-import/sys/fs/nfs/nfs_var.h
  projects/clang700-import/sys/fs/nfsclient/nfs_clrpcops.c
  projects/clang700-import/sys/fs/nfsclient/nfs_clvnops.c
  projects/clang700-import/sys/fs/tmpfs/tmpfs.h
  projects/clang700-import/sys/fs/tmpfs/tmpfs_subr.c
  projects/clang700-import/sys/fs/tmpfs/tmpfs_vnops.c
  projects/clang700-import/sys/geom/concat/g_concat.c
  projects/clang700-import/sys/geom/concat/g_concat.h
  projects/clang700-import/sys/geom/geom.h
  projects/clang700-import/sys/geom/geom_disk.h
  projects/clang700-import/sys/geom/geom_dump.c
  projects/clang700-import/sys/geom/geom_redboot.c
  projects/clang700-import/sys/geom/geom_subr.c
  projects/clang700-import/sys/geom/nop/g_nop.c
  projects/clang700-import/sys/geom/part/g_part.c
  projects/clang700-import/sys/geom/raid/g_raid.c
  projects/clang700-import/sys/geom/stripe/g_stripe.c
  projects/clang700-import/sys/geom/stripe/g_stripe.h
  projects/clang700-import/sys/geom/uzip/g_uzip.c
  projects/clang700-import/sys/i386/conf/GENERIC
  projects/clang700-import/sys/i386/conf/MINIMAL
  projects/clang700-import/sys/i386/i386/pmap.c
  projects/clang700-import/sys/i386/i386/trap.c
  projects/clang700-import/sys/kern/kern_cpuset.c
  projects/clang700-import/sys/kern/kern_exec.c
  projects/clang700-import/sys/kern/kern_malloc.c
  projects/clang700-import/sys/kern/kern_mbuf.c
  projects/clang700-import/sys/kern/kern_pmc.c
  projects/clang700-import/sys/kern/kern_shutdown.c
  projects/clang700-import/sys/kern/kern_sysctl.c
  projects/clang700-import/sys/kern/link_elf.c
  projects/clang700-import/sys/kern/link_elf_obj.c
  projects/clang700-import/sys/kern/subr_busdma_bufalloc.c
  projects/clang700-import/sys/kern/subr_epoch.c
  projects/clang700-import/sys/kern/subr_gtaskqueue.c
  projects/clang700-import/sys/kern/subr_kdb.c
  projects/clang700-import/sys/kern/sys_generic.c
  projects/clang700-import/sys/kern/sys_process.c
  projects/clang700-import/sys/kern/syscalls.master
  projects/clang700-import/sys/kern/systrace_args.c
  projects/clang700-import/sys/kern/vfs_syscalls.c
  projects/clang700-import/sys/kern/vnode_if.src
  projects/clang700-import/sys/mips/mips/trap.c
  projects/clang700-import/sys/modules/bios/smapi/Makefile
  projects/clang700-import/sys/modules/linuxkpi/Makefile
  projects/clang700-import/sys/net/if.c
  projects/clang700-import/sys/net/if_ethersubr.c
  projects/clang700-import/sys/net/if_lagg.c
  projects/clang700-import/sys/net/pfvar.h
  projects/clang700-import/sys/net/vnet.c
  projects/clang700-import/sys/netinet/icmp6.h
  projects/clang700-import/sys/netinet/in_pcb.c
  projects/clang700-import/sys/netinet/ip_carp.c
  projects/clang700-import/sys/netinet/ip_icmp.c
  projects/clang700-import/sys/netinet/netdump/netdump_client.c
  projects/clang700-import/sys/netinet/tcp_syncache.c
  projects/clang700-import/sys/netinet6/in6_pcb.c
  projects/clang700-import/sys/netinet6/nd6.h
  projects/clang700-import/sys/netinet6/nd6_rtr.c
  projects/clang700-import/sys/netpfil/pf/if_pfsync.c
  projects/clang700-import/sys/netpfil/pf/pf.c
  projects/clang700-import/sys/netpfil/pf/pf_if.c
  projects/clang700-import/sys/netpfil/pf/pf_ioctl.c
  projects/clang700-import/sys/netpfil/pf/pf_norm.c
  projects/clang700-import/sys/powerpc/conf/GENERIC
  projects/clang700-import/sys/powerpc/conf/GENERIC64
  projects/clang700-import/sys/powerpc/mpc85xx/pci_mpc85xx.c
  projects/clang700-import/sys/powerpc/powermac/fcu.c
  projects/clang700-import/sys/powerpc/powerpc/trap.c
  projects/clang700-import/sys/riscv/conf/GENERIC
  projects/clang700-import/sys/riscv/include/pte.h
  projects/clang700-import/sys/riscv/riscv/intr_machdep.c
  projects/clang700-import/sys/riscv/riscv/locore.S
  projects/clang700-import/sys/riscv/riscv/machdep.c
  projects/clang700-import/sys/riscv/riscv/mp_machdep.c
  projects/clang700-import/sys/riscv/riscv/pmap.c
  projects/clang700-import/sys/riscv/riscv/trap.c
  projects/clang700-import/sys/security/audit/audit.h
  projects/clang700-import/sys/security/audit/audit_arg.c
  projects/clang700-import/sys/sparc64/conf/GENERIC
  projects/clang700-import/sys/sys/domainset.h
  projects/clang700-import/sys/sys/elf_common.h
  projects/clang700-import/sys/sys/epoch_private.h
  projects/clang700-import/sys/sys/gtaskqueue.h
  projects/clang700-import/sys/sys/imgact.h
  projects/clang700-import/sys/sys/kdb.h
  projects/clang700-import/sys/sys/malloc.h
  projects/clang700-import/sys/sys/mount.h
  projects/clang700-import/sys/sys/param.h
  projects/clang700-import/sys/sys/queue.h
  projects/clang700-import/sys/sys/random.h
  projects/clang700-import/sys/sys/syscallsubr.h
  projects/clang700-import/sys/sys/sysctl.h
  projects/clang700-import/sys/sys/sysproto.h
  projects/clang700-import/sys/sys/types.h
  projects/clang700-import/sys/tools/embed_mfs.sh
  projects/clang700-import/sys/ufs/ufs/ufs_vnops.c
  projects/clang700-import/sys/vm/uma_core.c
  projects/clang700-import/sys/vm/vm_extern.h
  projects/clang700-import/sys/vm/vm_fault.c
  projects/clang700-import/sys/vm/vm_init.c
  projects/clang700-import/sys/vm/vm_kern.c
  projects/clang700-import/sys/vm/vm_map.c
  projects/clang700-import/sys/vm/vm_map.h
  projects/clang700-import/sys/vm/vm_object.c
  projects/clang700-import/sys/vm/vm_page.c
  projects/clang700-import/sys/vm/vm_pageout.c
  projects/clang700-import/sys/x86/iommu/busdma_dmar.c
  projects/clang700-import/sys/x86/x86/busdma_bounce.c
  projects/clang700-import/tests/sys/netpfil/pf/Makefile
  projects/clang700-import/tests/sys/netpfil/pf/pass_block.sh
  projects/clang700-import/tests/sys/netpfil/pf/utils.subr
  projects/clang700-import/tools/tools/crypto/Makefile
  projects/clang700-import/tools/tools/locale/Makefile
  projects/clang700-import/tools/tools/locale/etc/charmaps.xml
  projects/clang700-import/tools/tools/locale/etc/final-maps/map.UTF-8
  projects/clang700-import/usr.bin/localedef/ctype.c
  projects/clang700-import/usr.bin/procstat/procstat_auxv.c
  projects/clang700-import/usr.bin/sed/tests/regress.multitest.out/Makefile
  projects/clang700-import/usr.bin/truss/syscall.h
  projects/clang700-import/usr.bin/truss/syscalls.c
  projects/clang700-import/usr.sbin/acpi/acpiconf/acpiconf.8
  projects/clang700-import/usr.sbin/bhyve/bhyve.8
  projects/clang700-import/usr.sbin/bhyve/bhyverun.c
  projects/clang700-import/usr.sbin/bhyve/block_if.c
  projects/clang700-import/usr.sbin/bhyve/pci_fbuf.c   (contents, props changed)
  projects/clang700-import/usr.sbin/bhyve/pci_virtio_rnd.c
  projects/clang700-import/usr.sbin/bhyve/pci_xhci.c   (contents, props changed)
  projects/clang700-import/usr.sbin/bhyve/ps2kbd.c   (contents, props changed)
  projects/clang700-import/usr.sbin/bsdconfig/share/dialog.subr
  projects/clang700-import/usr.sbin/bsdinstall/scripts/zfsboot
  projects/clang700-import/usr.sbin/freebsd-update/freebsd-update.sh
  projects/clang700-import/usr.sbin/ndp/Makefile
  projects/clang700-import/usr.sbin/ndp/ndp.c
  projects/clang700-import/usr.sbin/nfsd/nfsd.c
  projects/clang700-import/usr.sbin/nscd/debug.c
  projects/clang700-import/usr.sbin/nscd/debug.h
  projects/clang700-import/usr.sbin/nscd/nscdcli.c
  projects/clang700-import/usr.sbin/nscd/query.c
  projects/clang700-import/usr.sbin/rtadvd/Makefile
  projects/clang700-import/usr.sbin/rtadvd/config.c
  projects/clang700-import/usr.sbin/rtadvd/rtadvd.c
  projects/clang700-import/usr.sbin/rtadvd/rtadvd.h
  projects/clang700-import/usr.sbin/uhsoctl/uhsoctl.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/contrib/elftoolchain/   (props changed)
  projects/clang700-import/contrib/netbsd-tests/   (props changed)
  projects/clang700-import/contrib/one-true-awk/   (props changed)
  projects/clang700-import/contrib/tzcode/stdtime/   (props changed)
  projects/clang700-import/contrib/tzdata/   (props changed)
  projects/clang700-import/contrib/unbound/   (props changed)
  projects/clang700-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang700-import/sys/contrib/dev/acpica/   (props changed)

Modified: projects/clang700-import/Makefile.inc1
==============================================================================
--- projects/clang700-import/Makefile.inc1	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/Makefile.inc1	Sun Nov  4 15:49:06 2018	(r340126)
@@ -183,7 +183,7 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 # support the target architecture), provide a default cross-binutils prefix.
 # This allows riscv64 builds, for example, to automatically use the
 # riscv64-binutils port or package.
-.if !make(showconfig)
+.if !make(showconfig) && !defined(_NO_INCLUDE_COMPILERMK)
 .if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
     ${MK_LLD_BOOTSTRAP} == "no" && \
     !defined(CROSS_BINUTILS_PREFIX)
@@ -950,7 +950,7 @@ _worldtmp: .PHONY
 .else
 	${_+_}@if [ -e "${WORLDTMP}" ]; then \
 		echo ">>> Deleting stale files in build tree..."; \
-		cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
+		cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES _NO_INCLUDE_COMPILERMK=t \
 		    delete-old delete-old-libs >/dev/null; \
 	fi
 	rm -rf ${WORLDTMP}/legacy/usr/include
@@ -1003,19 +1003,21 @@ _cleanobj:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR}
+	# Avoid including bsd.compiler.mk in clean and obj with _NO_INCLUDE_COMPILERMK
+	# since the restricted $PATH might not contain a valid cc binary
+	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t ${CLEANDIR}
 .if defined(LIBCOMPAT)
-	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
+	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} _NO_INCLUDE_COMPILERMK=t -f Makefile.inc1 ${CLEANDIR}
 .endif
 .else
-	${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack
+	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
 .endif	# !defined(NO_CLEAN)
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; ${WMAKE} obj
+	${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=t obj
 _build-tools:
 	@echo
 	@echo "--------------------------------------------------------------"

Modified: projects/clang700-import/Makefile.libcompat
==============================================================================
--- projects/clang700-import/Makefile.libcompat	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/Makefile.libcompat	Sun Nov  4 15:49:06 2018	(r340126)
@@ -200,7 +200,8 @@ build${libcompat}: .PHONY
 	    OBJTOP=${LIBCOMPAT_OBJTOP} \
 	    OBJROOT='$${OBJTOP}/' \
 	    MAKEOBJDIRPREFIX= \
-	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS \
+	    MK_CTF=no MK_RETPOLINE=no MK_WARNS=no \
 	    ${_t}
 .endfor
 .endfor

Modified: projects/clang700-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang700-import/ObsoleteFiles.inc	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/ObsoleteFiles.inc	Sun Nov  4 15:49:06 2018	(r340126)
@@ -174,6 +174,8 @@ OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
+# 20181030: malloc_domain(9) KPI change
+OLD_FILES+=share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports

Modified: projects/clang700-import/bin/getfacl/getfacl.c
==============================================================================
--- projects/clang700-import/bin/getfacl/getfacl.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/getfacl/getfacl.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -88,7 +88,7 @@ getgname(gid_t gid)
  * contained in struct stat
  */
 static acl_t
-acl_from_stat(struct stat sb)
+acl_from_stat(const struct stat *sb)
 {
 	acl_t acl;
 	acl_entry_t entry;
@@ -111,13 +111,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate user mode */
-	if (sb.st_mode & S_IRUSR)
+	if (sb->st_mode & S_IRUSR)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWUSR)
+	if (sb->st_mode & S_IWUSR)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXUSR)
+	if (sb->st_mode & S_IXUSR)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -135,13 +135,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate group mode */
-	if (sb.st_mode & S_IRGRP)
+	if (sb->st_mode & S_IRGRP)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWGRP)
+	if (sb->st_mode & S_IWGRP)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXGRP)
+	if (sb->st_mode & S_IXGRP)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -159,13 +159,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate other mode */
-	if (sb.st_mode & S_IROTH)
+	if (sb->st_mode & S_IROTH)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWOTH)
+	if (sb->st_mode & S_IWOTH)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXOTH)
+	if (sb->st_mode & S_IXOTH)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -229,7 +229,7 @@ print_acl(char *path, acl_type_t type, int hflag, int 
 		errno = 0;
 		if (type == ACL_TYPE_DEFAULT)
 			return(0);
-		acl = acl_from_stat(sb);
+		acl = acl_from_stat(&sb);
 		if (!acl) {
 			warn("%s: acl_from_stat() failed", path);
 			return(-1);

Modified: projects/clang700-import/bin/ps/ps.1
==============================================================================
--- projects/clang700-import/bin/ps/ps.1	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/ps/ps.1	Sun Nov  4 15:49:06 2018	(r340126)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 13, 2018
+.Dd October 31, 2018
 .Dt PS 1
 .Os
 .Sh NAME
@@ -346,7 +346,7 @@ the include file
 .It Dv "P_HWPMC" Ta No "0x800000" Ta "Process is using HWPMCs"
 .It Dv "P_JAILED" Ta No "0x1000000" Ta "Process is in jail"
 .It Dv "P_TOTAL_STOP" Ta No "0x2000000" Ta "Stopped for system suspend"
-.It Dv "P_INEXEC" Ta No "0x4000000" Ta "Process is in execve()"
+.It Dv "P_INEXEC" Ta No "0x4000000" Ta Process is in Xr execve 2
 .It Dv "P_STATCHILD" Ta No "0x8000000" Ta "Child process stopped or exited"
 .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory"
 .It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out"
@@ -361,8 +361,8 @@ the include file
 .In sys/proc.h :
 .Bl -column P2_INHERIT_PROTECTED 0x00000001
 .It Dv "P2_INHERIT_PROTECTED" Ta No "0x00000001" Ta "New children get P_PROTECTED"
-.It Dv "P2_NOTRACE" Ta No "0x00000002" Ta "No ptrace(2) attach or coredumps"
-.It Dv "P2_NOTRACE_EXEC" Ta No "0x00000004" Ta "Keep P2_NOPTRACE on exec(2)"
+.It Dv "P2_NOTRACE" Ta No "0x00000002" Ta "No" Xr ptrace 2 attach or coredumps
+.It Dv "P2_NOTRACE_EXEC" Ta No "0x00000004" Ta Keep P2_NOPTRACE on Xr execve 2
 .It Dv "P2_AST_SU" Ta No "0x00000008" Ta "Handles SU ast for kthreads"
 .It Dv "P2_PTRACE_FSTP" Ta No "0x00000010" Ta "SIGSTOP from PT_ATTACH not yet handled"
 .El
@@ -453,8 +453,7 @@ Marks a process which is in
 The hostname of the prison can be found in
 .Pa /proc/ Ns Ao Ar pid Ac Ns Pa /status .
 .It Li L
-The process has pages locked in core (for example, for raw
-.Tn I/O ) .
+The process has pages locked in core (for example, for raw I/O).
 .It Li N
 The process has reduced CPU scheduling priority (see
 .Xr setpriority 2 ) .
@@ -553,9 +552,11 @@ data size (in Kbytes)
 system-call emulation environment (ABI)
 .It Cm etime
 elapsed running time, format
+.Do
 .Op days- Ns
-.Op hours: Ns
-minutes:seconds.
+.Op hours\&: Ns
+minutes:seconds
+.Dc
 .It Cm etimes
 elapsed running time, in decimal integer seconds
 .It Cm fib
@@ -750,6 +751,8 @@ attempts to automatically determine the terminal width
 .It Pa /boot/kernel/kernel
 default system namelist
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh EXAMPLES
 Display information on all system processes:
 .Pp

Modified: projects/clang700-import/bin/sh/eval.c
==============================================================================
--- projects/clang700-import/bin/sh/eval.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/sh/eval.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -468,7 +468,8 @@ evalredir(union node *n, int flags)
 		popredir();
 		if (e == EXERROR || e == EXEXEC) {
 			if (in_redirect) {
-				exitstatus = 2;
+				if (e == EXERROR)
+					exitstatus = 2;
 				FORCEINTON;
 				return;
 			}
@@ -669,8 +670,10 @@ evalbackcmd(union node *n, struct backcmd *result)
 		forcelocal++;
 		savehandler = handler;
 		if (setjmp(jmploc.loc)) {
-			if (exception == EXERROR || exception == EXEXEC)
+			if (exception == EXERROR)
 				exitstatus = 2;
+			else if (exception == EXEXEC)
+				/* nothing */;
 			else if (exception != 0) {
 				handler = savehandler;
 				forcelocal--;
@@ -1089,7 +1092,7 @@ evalcommand(union node *cmd, int flags, struct backcmd
 			e = exception;
 			if (e == EXINT)
 				exitstatus = SIGINT+128;
-			else if (e != EXEXIT)
+			else if (e != EXEXEC && e != EXEXIT)
 				exitstatus = 2;
 			goto cmddone;
 		}

Modified: projects/clang700-import/bin/sh/exec.c
==============================================================================
--- projects/clang700-import/bin/sh/exec.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/sh/exec.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -91,7 +91,6 @@ struct tblentry {
 
 static struct tblentry *cmdtable[CMDTABLESIZE];
 static int cmdtable_cd = 0;	/* cmdtable contains cd-dependent entries */
-int exerrno = 0;			/* Last exec error */
 
 
 static void tryexec(char *, char **, char **);
@@ -135,10 +134,10 @@ shellexec(char **argv, char **envp, const char *path, 
 
 	/* Map to POSIX errors */
 	if (e == ENOENT || e == ENOTDIR) {
-		exerrno = 127;
+		exitstatus = 127;
 		exerror(EXEXEC, "%s: not found", argv[0]);
 	} else {
-		exerrno = 126;
+		exitstatus = 126;
 		exerror(EXEXEC, "%s: %s", argv[0], strerror(e));
 	}
 }

Modified: projects/clang700-import/bin/sh/exec.h
==============================================================================
--- projects/clang700-import/bin/sh/exec.h	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/sh/exec.h	Sun Nov  4 15:49:06 2018	(r340126)
@@ -61,8 +61,6 @@ struct cmdentry {
 #define DO_ERR		0x01	/* prints errors */
 #define DO_NOFUNC	0x02	/* don't return shell functions, for command */
 
-extern int exerrno;		/* last exec error */
-
 void shellexec(char **, char **, const char *, int) __dead2;
 char *padvance(const char **, const char **, const char *);
 void find_command(const char *, struct cmdentry *, int, const char *);

Modified: projects/clang700-import/bin/sh/jobs.c
==============================================================================
--- projects/clang700-import/bin/sh/jobs.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/sh/jobs.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include "mystring.h"
 #include "var.h"
 #include "builtins.h"
+#include "eval.h"
 
 
 /*
@@ -1005,7 +1006,7 @@ vforkexecshell(struct job *jp, char **argv, char **env
 	if (pid == 0) {
 		TRACE(("Child shell %d\n", (int)getpid()));
 		if (setjmp(jmploc.loc))
-			_exit(exception == EXEXEC ? exerrno : 2);
+			_exit(exception == EXEXEC ? exitstatus : 2);
 		if (pip != NULL) {
 			close(pip[0]);
 			if (pip[1] != 1) {

Modified: projects/clang700-import/bin/sh/main.c
==============================================================================
--- projects/clang700-import/bin/sh/main.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/bin/sh/main.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -106,10 +106,6 @@ main(int argc, char *argv[])
 	state = 0;
 	if (setjmp(main_handler.loc)) {
 		switch (exception) {
-		case EXEXEC:
-			exitstatus = exerrno;
-			break;
-
 		case EXERROR:
 			exitstatus = 2;
 			break;

Modified: projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
==============================================================================
--- projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1	Sun Nov  4 15:49:06 2018	(r340126)
@@ -20,7 +20,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 16, 2018
+.Dd October 30, 2018
 .Dt DTRACE 1
 .Os
 .Sh NAME
@@ -778,7 +778,6 @@ Invalid command line options or arguments were specifi
 .El
 .Sh SEE ALSO
 .Xr cpp 1 ,
-.Xr dtruss 1 ,
 .Xr elf 5 ,
 .Xr SDT 9
 .Rs

Modified: projects/clang700-import/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
==============================================================================
--- projects/clang700-import/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -402,6 +402,8 @@ elftc_reloc_type_str(unsigned int mach, unsigned int t
 		case 22: return "R_MIPS_GOT_HI16";
 		case 23: return "R_MIPS_GOT_LO16";
 		case 24: return "R_MIPS_SUB";
+		case 28: return "R_MIPS_HIGHER";
+		case 29: return "R_MIPS_HIGHEST";
 		case 30: return "R_MIPS_CALLHI16";
 		case 31: return "R_MIPS_CALLLO16";
 		case 37: return "R_MIPS_JALR";

Modified: projects/clang700-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang700-import/contrib/elftoolchain/readelf/readelf.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/elftoolchain/readelf/readelf.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1121,6 +1121,7 @@ note_type_freebsd(unsigned int nt)
 	case 1: return "NT_FREEBSD_ABI_TAG";
 	case 2: return "NT_FREEBSD_NOINIT_TAG";
 	case 3: return "NT_FREEBSD_ARCH_TAG";
+	case 4: return "NT_FREEBSD_FEATURE_CTL";
 	default: return (note_type_unknown(nt));
 	}
 }

Modified: projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_mktime.c
==============================================================================
--- projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_mktime.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_mktime.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -64,6 +64,9 @@ ATF_TC_HEAD(mktime_negyear, tc)
 
 ATF_TC_BODY(mktime_negyear, tc)
 {
+#ifdef __FreeBSD__
+	atf_tc_expect_fail("needs work");
+#endif
 	struct tm tms;
 	time_t t;
 

Modified: projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_strptime.c
==============================================================================
--- projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_strptime.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/netbsd-tests/lib/libc/time/t_strptime.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -103,6 +103,7 @@ static struct {
 	const char *name;
 	long offs;
 } zt[] = {
+#ifndef __FreeBSD__
 	{ "Z",				0 },
 	{ "UT",				0 },
 	{ "UTC",			0 },
@@ -173,6 +174,7 @@ static struct {
 	{ "EST4EDT",			-14400 },
 
 	{ "Bogus",			-1 },
+#endif
 };
 
 static void
@@ -188,9 +190,11 @@ ztest1(const char *name, const char *fmt, long value)
 		value = 0;
 
 	switch (value) {
+#ifndef __FreeBSD__
 	case -2:
 		value = -timezone;
 		break;
+#endif
 	case -1:
 		if (fmt[1] == 'Z')
 			value = 0;
@@ -210,9 +214,11 @@ static void
 ztest(const char *fmt)
 {
 	setenv("TZ", "US/Eastern", 1);
+#ifndef __FreeBSD__
 	ztest1("GMT", fmt, 0);
 	ztest1("UTC", fmt, 0);
 	ztest1("US/Eastern", fmt, -18000);
+#endif
 	for (size_t i = 0; i < __arraycount(zt); i++)
 		ztest1(zt[i].name, fmt, zt[i].offs);
 }
@@ -228,10 +234,6 @@ ATF_TC_HEAD(common, tc)
 ATF_TC_BODY(common, tc)
 {
 
-#ifdef __FreeBSD__
-	atf_tc_expect_fail("There are various issues with strptime on FreeBSD");
-#endif
-
 	h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %T %Y",
 		24, 46, 27, 23, 20, 0, 98, 2, 19);
 	h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %H:%M:%S %Y",
@@ -305,6 +307,10 @@ ATF_TC_BODY(day, tc)
 #else
 	h_pass("SaturDay", "%OA", 8, -1, -1, -1, -1, -1, -1, 6, -1);
 #endif
+
+#ifdef __FreeBSD__
+	h_fail("00", "%d");
+#endif
 }
 
 ATF_TC(hour);
@@ -313,7 +319,11 @@ ATF_TC_HEAD(hour, tc)
 {
 
 	atf_tc_set_md_var(tc, "descr",
+#ifdef __FreeBSD__
+			  "Checks strptime(3) hour conversions [HIkl]");
+#else
 			  "Checks strptime(3) hour conversions [IH]");
+#endif
 }
 
 ATF_TC_BODY(hour, tc)
@@ -322,6 +332,21 @@ ATF_TC_BODY(hour, tc)
 	h_fail("00", "%I");
 	h_fail("13", "%I");
 
+#ifdef __FreeBSD__
+	h_pass("0", "%k", 1, -1, -1, 0, -1, -1, -1, -1, -1);
+	h_pass("04", "%k", 2, -1, -1, 4, -1, -1, -1, -1, -1);
+	h_pass(" 8", "%k", 2, -1, -1, 8, -1, -1, -1, -1, -1);
+	h_pass("23", "%k", 2, -1, -1, 23, -1, -1, -1, -1, -1);
+	h_fail("24", "%k");
+
+	h_fail("0", "%l");
+	h_pass("1", "%l", 1, -1, -1, 1, -1, -1, -1, -1, -1);
+	h_pass("05", "%l", 2, -1, -1, 5, -1, -1, -1, -1, -1);
+	h_pass(" 9", "%l", 2, -1, -1, 9, -1, -1, -1, -1, -1);
+	h_pass("12", "%l", 2, -1, -1, 12, -1, -1, -1, -1, -1);
+	h_fail("13", "%l");
+#endif
+
 	h_pass("00", "%H", 2, -1, -1, 0, -1, -1, -1, -1, -1);
 	h_pass("12", "%H", 2, -1, -1, 12, -1, -1, -1, -1, -1);
 	h_pass("23", "%H", 2, -1, -1, 23, -1, -1, -1, -1, -1);
@@ -413,7 +438,18 @@ ATF_TC_BODY(seconds, tc)
 	h_pass("0", "%S", 1, 0, -1, -1, -1, -1, -1, -1, -1);
 	h_pass("59", "%S", 2, 59, -1, -1, -1, -1, -1, -1, -1);
 	h_pass("60", "%S", 2, 60, -1, -1, -1, -1, -1, -1, -1);
+#ifdef __FreeBSD__
+	/*
+	 * (Much) older versions of the standard (up to the Issue 6) allowed for
+	 * [0;61] range in %S conversion for double-leap seconds, and it's
+	 * apparently what NetBSD and glibc are expecting, however current
+	 * version defines allowed values to be [0;60], and that is what our
+	 * strptime() implementation expects.
+	 */
+	h_fail("61", "%S");
+#else
 	h_pass("61", "%S", 2, 61, -1, -1, -1, -1, -1, -1, -1);
+#endif
 	h_fail("62", "%S");
 }
 
@@ -434,7 +470,9 @@ ATF_TC_BODY(year, tc)
 	h_pass("x2084y", "x%C%yy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
 	h_pass("x8420y", "x%y%Cy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
 	h_pass("%20845", "%%%C%y5", 6, -1, -1, -1, -1, -1, 184, -1, -1);
+#ifndef __FreeBSD__
 	h_fail("%", "%E%");
+#endif
 
 	h_pass("1980", "%Y", 4, -1, -1, -1, -1, -1, 80, -1, -1);
 	h_pass("1980", "%EY", 4, -1, -1, -1, -1, -1, 80, -1, -1);
@@ -467,7 +505,7 @@ ATF_TC_HEAD(Zone, tc)
 
 ATF_TC_BODY(Zone, tc)
 {
-	ztest("%z");
+	ztest("%Z");
 }
 
 ATF_TP_ADD_TCS(tp)

Modified: projects/clang700-import/contrib/ofed/librdmacm/examples/rping.c
==============================================================================
--- projects/clang700-import/contrib/ofed/librdmacm/examples/rping.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/ofed/librdmacm/examples/rping.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1177,9 +1177,13 @@ int main(int argc, char *argv[])
 	cb->server = -1;
 	cb->state = IDLE;
 	cb->size = 64;
-	cb->sin.ss_family = PF_INET;
 	cb->port = htobe16(7174);
 	sem_init(&cb->sem, 0, 0);
+
+	/* initialize sockaddr structure with defaults */
+	ret = get_addr("0.0.0.0", (struct sockaddr *) &cb->sin);
+	if (ret)
+		goto out;
 
 	opterr = 0;
 	while ((op=getopt(argc, argv, "a:I:Pp:C:S:t:scvVd")) != -1) {

Modified: projects/clang700-import/contrib/one-true-awk/awk.1
==============================================================================
--- projects/clang700-import/contrib/one-true-awk/awk.1	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/one-true-awk/awk.1	Sun Nov  4 15:49:06 2018	(r340126)
@@ -352,9 +352,13 @@ Patterns are arbitrary Boolean combinations
 of regular expressions and
 relational expressions.
 Regular expressions are as in
-.IR egrep ; 
-see
-.IR grep (1).
+.IR egrep (1) 
+except numeric quantifiers are not supported beyond the basic
+.B +
+and
+.B ?
+for quantities \&\f(CW"0 or 1"\fP and \&\f(CW"1 or more"\fP
+respectively.
 Isolated regular expressions
 in a pattern apply to the entire line.
 Regular expressions may also occur in

Modified: projects/clang700-import/contrib/smbfs/mount_smbfs/mount_smbfs.8
==============================================================================
--- projects/clang700-import/contrib/smbfs/mount_smbfs/mount_smbfs.8	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/smbfs/mount_smbfs/mount_smbfs.8	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1,6 +1,6 @@
 .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
 .\" $FreeBSD$
-.Dd September 17, 2011
+.Dd November 1, 2018
 .Dt MOUNT_SMBFS 8
 .Os
 .Sh NAME
@@ -8,12 +8,12 @@
 .Nd "mount a shared resource from an SMB file server"
 .Sh SYNOPSIS
 .Nm
-.Op Fl E Ar cs1 : Ns Ar cs2
+.Op Fl E Ar cs1 Ns Cm \&: Ns Ar cs2
 .Op Fl I Ar host
 .Op Fl L Ar locale
-.Op Fl M Ar crights : Ns Ar srights
+.Op Fl M Ar crights Ns Cm \&: Ns Ar srights
 .Op Fl N
-.Op Fl O Ar cowner : Ns Ar cgroup Ns / Ns Ar sowner : Ns Ar sgroup
+.Op Fl O Ar cowner Ns Cm \&: Ns Ar cgroup Ns Cm \&/ Ns Ar sowner Ns Cm \&: Ns Ar sgroup
 .Op Fl R Ar retrycount
 .Op Fl T Ar timeout
 .Op Fl U Ar username
@@ -25,9 +25,9 @@
 .Op Fl n Ar opt
 .Op Fl u Ar uid
 .Sm off
-.No // Ar user No @ Ar server
-.Op Ar :port1 Op Ar :port2
-.No / Ar share
+.Cm \&// Ns Ar user Cm \&@ Ar server
+.Op Cm \&: Ar port1 Op Cm \&: Ar port2
+.Cm \&/ Ar share
 .Sm on
 .Ar node
 .Sh DESCRIPTION
@@ -37,7 +37,7 @@ command mounts a share from a remote server using SMB/
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl E Ar cs1 : Ns Ar cs2
+.It Fl E Ar cs1 Ns Cm \&: Ns Ar cs2
 Specifies local
 .Pq Ar cs1
 and server's
@@ -57,7 +57,7 @@ By default,
 tries to use an environment variable
 .Ev LC_*
 to determine it.
-.It Fl M Ar crights : Ns Ar srights
+.It Fl M Ar crights Ns Cm \&: Ns Ar srights
 Assign access rights to the newly created connection.
 .It Fl N
 Do not ask for a password.
@@ -69,7 +69,7 @@ file for additional configuration parameters and a pas
 If no password is found,
 .Nm
 prompts for it.
-.It Fl O Ar cowner : Ns Ar cgroup Ns / Ns Ar sowner : Ns Ar sgroup
+.It Fl O Ar cowner Ns Cm \&: Ns Ar cgroup Ns Cm \&/ Ns Ar sowner Ns Cm \&: Ns Ar sgroup
 Assign owner/group attributes to the newly created connection.
 .It Fl R Ar retrycount
 How many retries should be done before the SMB requester decides to drop
@@ -111,7 +111,7 @@ server.
 User ID and group ID assigned to files.
 The default are owner and group IDs from
 the directory where the volume is mounted.
-.It No // Ns Ar user Ns @ Ns Ar server Ns Oo Ar :port1 Ns Oo Ar :port2 Oc Oc Ns No / Ns Ar share
+.It Cm \&// Ns Ar user Ns Cm \&@ Ns Ar server Ns Oo Cm \&: Ns Ar port1 Ns Oo Cm \&: Ns Ar port2 Oc Oc Ns Cm \&/ Ns Ar share
 The
 .Nm
 command will use
@@ -136,22 +136,24 @@ are 137.
 Path to mount point.
 .El
 .Sh FILES
-.Bl -tag -width ".Pa ~/.nsmbrc" -compact
+.Bl -tag -width ".Pa /etc/nsmb.conf" -compact
 .It Pa ~/.nsmbrc
-Keeps static parameters for connections and other information.
+Keeps user-specific static parameters for connections and other information.
 See
 .Pa /usr/share/examples/smbfs/dot.nsmbrc
 for details.
+.It Pa /etc/nsmb.conf
+Keeps system-wide static parameters for connections and other information.
 .El
 .Sh EXAMPLES
 The following example illustrates how to connect to SMB server
-.Em SAMBA
+.Dq SAMBA
 as user
-.Em GUEST ,
+.Dq GUEST ,
 and mount shares
-.Em PUBLIC
+.Dq PUBLIC
 and
-.Em TMP :
+.Dq TMP :
 .Bd -literal -offset indent
 mount_smbfs -I samba.mydomain.com //guest at samba/public /smb/public
 mount_smbfs -I 192.168.20.3 -E koi8-r:cp866 //guest at samba/tmp /smb/tmp
@@ -159,9 +161,43 @@ mount_smbfs -I 192.168.20.3 -E koi8-r:cp866 //guest at sa
 .Pp
 It is also possible to use
 .Xr fstab 5
-for smbfs mounts (the example below doesn't prompt for a password):
+for smbfs mounts (the example below does not prompt for a password):
 .Pp
 .Dl "//guest at samba/public    /smb/public     smbfs  rw,noauto,-N 0   0"
+.Sh SEE ALSO
+.Xr smbutil 1 ,
+.Xr nsmb.conf 5
+.Pp
+Other resources:
+.Bl -dash -compact
+.It
+Chapter dedicated to Samba configuration in the
+.Fx
+Handbook:
+.Lk "https://www.freebsd.org/doc/handbook/network-samba.html"
+.El
+.Sh STANDARDS
+.Nm
+offers support for SMB/CIFS/SMB1.
+It does not support newer versions of the protocol like SMB2 and SMB3.
+SMB2 and SMB3 are supported by software available in the
+.Xr ports 7
+collection.
+.Pp
+The list of supported SMB servers includes:
+.Bl -dash -compact
+.It
+Samba
+.It
+Windows 95/98/ME/2000/NT4.0 (SPs 4, 5, 6)
+.It
+IBM LanManager
+.It
+NetApp
+.El
+.Sh HISTORY
+SMB/CIFS protocol and SMB/CIFS file system implementation first appeared in
+.Fx 4.5 .
 .Sh AUTHORS
 .An Boris Popov Aq bp at butya.kz ,
 .Aq bp at FreeBSD.org

Modified: projects/clang700-import/contrib/smbfs/smbutil/smbutil.1
==============================================================================
--- projects/clang700-import/contrib/smbfs/smbutil/smbutil.1	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/smbfs/smbutil/smbutil.1	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1,5 +1,5 @@
 .\" $Id: smbutil.1,v 1.5 2002/04/16 02:48:16 bp Exp $
-.Dd February 14, 2000
+.Dd November 1, 2018
 .Dt SMBUTIL 1
 .Os
 .Sh NAME
@@ -127,6 +127,9 @@ See
 .Pa ./examples/dot.nsmbrc
 for details.
 .El
+.Sh SEE ALSO
+.Xr nsmb.conf 5 ,
+.Xr mount_smbfs 8
 .Sh AUTHORS
 .An Boris Popov Aq bp at butya.kz ,
 .Aq bp at FreeBSD.org

Modified: projects/clang700-import/contrib/tzcode/stdtime/localtime.c
==============================================================================
--- projects/clang700-import/contrib/tzcode/stdtime/localtime.c	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzcode/stdtime/localtime.c	Sun Nov  4 15:49:06 2018	(r340126)
@@ -390,7 +390,6 @@ register const int	doextend;
 	res = -1;
 	sp->goback = sp->goahead = FALSE;
 
-	/* XXX The following is from OpenBSD, and I'm not sure it is correct */
 	if (name != NULL && issetugid() != 0)
 		if ((name[0] == ':' && name[1] == '/') || 
 		    name[0] == '/' || strchr(name, '.'))
@@ -398,7 +397,6 @@ register const int	doextend;
 	if (name == NULL && (name = TZDEFAULT) == NULL)
 		return -1;
 	{
-		int	doaccess;
 		struct stat	stab;
 		/*
 		** Section 4.9.1 of the C standard says that
@@ -415,8 +413,7 @@ register const int	doextend;
 
 		if (name[0] == ':')
 			++name;
-		doaccess = name[0] == '/';
-		if (!doaccess) {
+		if (name[0] != '/') {
 			if ((p = TZDIR) == NULL) {
 				free(fullname);
 				return -1;
@@ -428,16 +425,7 @@ register const int	doextend;
 			(void) strcpy(fullname, p);
 			(void) strcat(fullname, "/");
 			(void) strcat(fullname, name);
-			/*
-			** Set doaccess if '.' (as in "../") shows up in name.
-			*/
-			if (strchr(name, '.') != NULL)
-				doaccess = TRUE;
 			name = fullname;
-		}
-		if (doaccess && access(name, R_OK) != 0) {
-			free(fullname);
-		     	return -1;
 		}
 		if ((fid = _open(name, OPEN_MODE)) == -1) {
 			free(fullname);

Modified: projects/clang700-import/contrib/tzdata/NEWS
==============================================================================
--- projects/clang700-import/contrib/tzdata/NEWS	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/NEWS	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1,5 +1,40 @@
 News for the tz database
 
+Release 2018g - 2018-10-26 22:22:45 -0700
+
+  Briefly:
+    Morocco switches to permanent +01 on 2018-10-27.
+
+  Changes to future timestamps
+
+    Morocco switches from +00/+01 to permanent +01 effective 2018-10-27,
+    so its clocks will not fall back on 2018-10-28 as previously scheduled.
+    (Thanks to Mohamed Essedik Najd and Brian Inglis.)
+
+  Changes to code
+
+    When generating TZif files with leap seconds, zic no longer uses a
+    format that trips up older 32-bit clients, fixing a bug introduced
+    in 2018f.  (Reported by Daniel Fischer.)  Also, the zic workaround
+    for QTBUG-53071 now also works for TZif files with leap seconds.
+
+    The translator to rearguard format now rewrites the line
+    "Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S" to
+    "Rule Japan 1948 1951 - Sep Sun>=9  1:00 0 S".
+    This caters to zic before 2007 and to Oracle TZUpdater 2.2.0
+    and earlier.  (Reported by Christos Zoulas.)
+
+  Changes to past time zone abbreviations
+
+    Change HDT to HWT/HPT for WWII-era abbreviations in Hawaii.
+    This reverts to 2011h, as the abbreviation change in 2011i was
+    likely inadvertent.
+
+  Changes to documentation
+
+    tzfile.5 has new sections on interoperability issues.
+
+
 Release 2018f - 2018-10-18 00:14:18 -0700
 
   Briefly:

Modified: projects/clang700-import/contrib/tzdata/africa
==============================================================================
--- projects/clang700-import/contrib/tzdata/africa	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/africa	Sun Nov  4 15:49:06 2018	(r340126)
@@ -844,94 +844,61 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
 # with the patch.
 
-# From Paul Eggert (2015-06-08):
-# For now, guess that later spring and fall transitions will use 2015's rules,
-# and guess that Morocco will switch to standard time at 03:00 the last
-# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
-# Ramadan.  To implement this, transition dates for 2016 through 2037 were
-# determined by running the following program under GNU Emacs 24.3, with the
-# results integrated by hand into the table below.
-# (let ((islamic-year 1437))
-#   (require 'cal-islam)
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (sunday 0))
-#       (while (/= sunday (mod (setq a (1- a)) 7)))
-#       (while (/= sunday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
-#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-#     (setq islamic-year (+ 1 islamic-year))))
+# From Mohamed Essedik Najd (2018-10-26):
+# Today, a Moroccan government council approved the perpetual addition
+# of 60 minutes to the regular Moroccan timezone.
+# From Brian Inglis (2018-10-26):
+# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-
-Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
+Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
 Rule	Morocco	1939	only	-	Nov	19	 0:00	0	-
-Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	S
+Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	-
 Rule	Morocco	1945	only	-	Nov	18	 0:00	0	-
-Rule	Morocco	1950	only	-	Jun	11	 0:00	1:00	S
+Rule	Morocco	1950	only	-	Jun	11	 0:00	1:00	-
 Rule	Morocco	1950	only	-	Oct	29	 0:00	0	-
-Rule	Morocco	1967	only	-	Jun	 3	12:00	1:00	S
+Rule	Morocco	1967	only	-	Jun	 3	12:00	1:00	-
 Rule	Morocco	1967	only	-	Oct	 1	 0:00	0	-
-Rule	Morocco	1974	only	-	Jun	24	 0:00	1:00	S
+Rule	Morocco	1974	only	-	Jun	24	 0:00	1:00	-
 Rule	Morocco	1974	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	1976	1977	-	May	 1	 0:00	1:00	S
+Rule	Morocco	1976	1977	-	May	 1	 0:00	1:00	-
 Rule	Morocco	1976	only	-	Aug	 1	 0:00	0	-
 Rule	Morocco	1977	only	-	Sep	28	 0:00	0	-
-Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
+Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	-
 Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
-Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
+Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	-
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
+Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	-
 Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
-Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	-
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
+Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	-
 Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
-Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
+Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	-
 Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
-Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
+Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	-
 Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
 Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
-Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
-Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
-Rule	Morocco	2014	2021	-	Mar	lastSun	 2:00	1:00	S
+Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	-
+Rule	Morocco	2013	2018	-	Oct	lastSun	 3:00	0	-
+Rule	Morocco	2014	2018	-	Mar	lastSun	 2:00	1:00	-
 Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
-Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
+Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	-
 Rule	Morocco	2015	only	-	Jun	14	 3:00	0	-
-Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	S
+Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	-
 Rule	Morocco	2016	only	-	Jun	 5	 3:00	0	-
-Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	S
+Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	-
 Rule	Morocco	2017	only	-	May	21	 3:00	0	-
-Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	S
+Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	-
 Rule	Morocco	2018	only	-	May	13	 3:00	0	-
-Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	S
-Rule	Morocco	2019	only	-	May	 5	 3:00	0	-
-Rule	Morocco	2019	only	-	Jun	 9	 2:00	1:00	S
-Rule	Morocco	2020	only	-	Apr	19	 3:00	0	-
-Rule	Morocco	2020	only	-	May	24	 2:00	1:00	S
-Rule	Morocco	2021	only	-	Apr	11	 3:00	0	-
-Rule	Morocco	2021	only	-	May	16	 2:00	1:00	S
-Rule	Morocco	2022	only	-	May	 8	 2:00	1:00	S
-Rule	Morocco	2023	only	-	Apr	23	 2:00	1:00	S
-Rule	Morocco	2024	only	-	Apr	14	 2:00	1:00	S
-Rule	Morocco	2025	only	-	Apr	 6	 2:00	1:00	S
-Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
-Rule	Morocco	2036	only	-	Oct	19	 3:00	0	-
-Rule	Morocco	2037	only	-	Oct	 4	 3:00	0	-
+Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
-			 0:00	Morocco	WE%sT	1984 Mar 16
-			 1:00	-	CET	1986
-			 0:00	Morocco	WE%sT
+			 0:00	Morocco	+00/+01	1984 Mar 16
+			 1:00	-	+01	1986
+			 0:00	Morocco	+00/+01	2018 Oct 27
+			 1:00	-	+01
 
 # Western Sahara
 #
@@ -946,7 +913,8 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	-01	1976 Apr 14
-			 0:00	Morocco	WE%sT
+			 0:00	Morocco	+00/+01	2018 Oct 27
+			 1:00	-	+01
 
 # Mozambique
 #

Modified: projects/clang700-import/contrib/tzdata/europe
==============================================================================
--- projects/clang700-import/contrib/tzdata/europe	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/europe	Sun Nov  4 15:49:06 2018	(r340126)
@@ -3440,7 +3440,8 @@ Rule	Spain	1978	only	-	Oct	 1	 2:00s	0	-
 #Rule NatSpain	1937	only	-	May	22	23:00	1:00	S
 #Rule NatSpain	1937	1938	-	Oct	Sat>=1	24:00s	0	-
 #Rule NatSpain	1938	only	-	Mar	26	23:00	1:00	S
-# The following rules are copied from Morocco from 1967 through 1978.
+# The following rules are copied from Morocco from 1967 through 1978,
+# except with "S" letters.
 Rule SpainAfrica 1967	only	-	Jun	 3	12:00	1:00	S
 Rule SpainAfrica 1967	only	-	Oct	 1	 0:00	0	-
 Rule SpainAfrica 1974	only	-	Jun	24	 0:00	1:00	S

Modified: projects/clang700-import/contrib/tzdata/northamerica
==============================================================================
--- projects/clang700-import/contrib/tzdata/northamerica	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/northamerica	Sun Nov  4 15:49:06 2018	(r340126)
@@ -439,6 +439,19 @@ Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 N
 # western South Dakota, far western Texas (El Paso County, Hudspeth County,
 # and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
 #
+# From Paul Eggert (2018-10-25):
+# On 1921-03-04 federal law placed all of Texas into the central time zone.
+# However, El Paso ignored the law for decades and continued to observe
+# mountain time, on the grounds that that's what they had always done
+# and they weren't about to let the federal government tell them what to do.
+# Eventually the federal government gave in and changed the law on
+# 1970-04-10 to match what El Paso was actually doing.  Although
+# that's slightly after our 1970 cutoff, there is no need to create a
+# separate zone for El Paso since they were ignoring the law anyway.  See:
+# Long T. El Pasoans were time rebels, fought to stay in Mountain zone.
+# El Paso Times. 2018-10-24 06:40 -06.
+# https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoans-were-time-rebels-fought-stay-mountain-zone/1744509002/
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Denver	1920	1921	-	Mar	lastSun	2:00	1:00	D
 Rule	Denver	1920	only	-	Oct	lastSun	2:00	0	S
@@ -708,9 +721,7 @@ Zone America/Adak	 12:13:22 -	LMT	1867 Oct 19 12:44:35
 Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
 			-10:30	-	HST	1933 Apr 30  2:00
 			-10:30	1:00	HDT	1933 May 21 12:00
-			-10:30	-	HST	1942 Feb  9  2:00
-			-10:30	1:00	HDT	1945 Sep 30  2:00
-			-10:30	-	HST	1947 Jun  8  2:00
+			-10:30	US	H%sT	1947 Jun  8  2:00
 			-10:00	-	HST
 
 # Now we turn to US areas that have diverged from the consensus since 1970.

Modified: projects/clang700-import/contrib/tzdata/theory.html
==============================================================================
--- projects/clang700-import/contrib/tzdata/theory.html	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/theory.html	Sun Nov  4 15:49:06 2018	(r340126)
@@ -407,7 +407,7 @@ in decreasing order of importance:
       EST/EDT/EWT/EPT/EDDT Eastern [North America],
       EET/EEST Eastern European,
       GST Guam,
-      HST/HDT Hawaii,
+      HST/HDT/HWT/HPT Hawaii,
       HKT/HKST Hong Kong,
       IST India,
       IST/GMT Irish,

Modified: projects/clang700-import/contrib/tzdata/version
==============================================================================
--- projects/clang700-import/contrib/tzdata/version	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/version	Sun Nov  4 15:49:06 2018	(r340126)
@@ -1 +1 @@
-2018f
+2018g

Modified: projects/clang700-import/contrib/tzdata/ziguard.awk
==============================================================================
--- projects/clang700-import/contrib/tzdata/ziguard.awk	Sun Nov  4 15:46:30 2018	(r340125)
+++ projects/clang700-import/contrib/tzdata/ziguard.awk	Sun Nov  4 15:49:06 2018	(r340126)
@@ -80,6 +80,13 @@ DATAFORM != "main" {
   if (comment_out) {
     sub(/^/, "#")
   }
+
+  # In rearguard format, change the Japan rule line with "Sat>=8 25:00"
+  # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
+  if (!vanguard && $1 == "Rule" && $7 == "Sat>=8" && $8 == "25:00") {
+    sub(/Sat>=8/, "Sun>=9")
+    sub(/25:00/, " 1:00")
+  }
 }
 
 # If a Link line is followed by a Zone line for the same data, comment

Modified: projects/clang700-import/contrib/tzdata/zishrink.awk
==============================================================================
--- projects/clang700-import/contrib/tzdata/zishrink.awk	Sun Nov  4 15:46:30 2018	(r340125)

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

More information about the svn-src-projects mailing list