svn commit: r357662 - in projects/clang1000-import: . bin/pwait cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line contrib/elftoolchain/elfcopy contrib/elftoolchain/libdwa...

Fri Feb 7 19:08:43 UTC 2020

Author: dim
Date: Fri Feb  7 19:08:37 2020
New Revision: 357662
URL: https://svnweb.freebsd.org/changeset/base/357662

Log:
  Merge ^/head r357408 through r357661.

Added:
  projects/clang1000-import/lib/libkvm/kvm_kerndisp.3
     - copied unchanged from r357661, head/lib/libkvm/kvm_kerndisp.3
Deleted:
  projects/clang1000-import/gnu/lib/csu/
  projects/clang1000-import/sbin/Makefile.sparc64
  projects/clang1000-import/sbin/sunlabel/Makefile
  projects/clang1000-import/sbin/sunlabel/Makefile.depend
  projects/clang1000-import/sbin/sunlabel/runtest.sh
  projects/clang1000-import/sbin/sunlabel/sun_disklabel.h
  projects/clang1000-import/sbin/sunlabel/sunlabel.8
  projects/clang1000-import/sbin/sunlabel/sunlabel.c
  projects/clang1000-import/sbin/sunlabel/sunlabel_enc.c
  projects/clang1000-import/stand/ficl/sparc64/sysdep.c
  projects/clang1000-import/stand/ficl/sparc64/sysdep.h
  projects/clang1000-import/stand/libsa/sparc64/_setjmp.S
  projects/clang1000-import/stand/sparc64/Makefile
  projects/clang1000-import/stand/sparc64/Makefile.inc
  projects/clang1000-import/stand/sparc64/boot1/Makefile
  projects/clang1000-import/stand/sparc64/boot1/_start.s
  projects/clang1000-import/stand/sparc64/boot1/boot1.c
  projects/clang1000-import/stand/sparc64/loader/Makefile
  projects/clang1000-import/stand/sparc64/loader/help.sparc64
  projects/clang1000-import/stand/sparc64/loader/locore.S
  projects/clang1000-import/stand/sparc64/loader/main.c
  projects/clang1000-import/stand/sparc64/loader/version
  projects/clang1000-import/stand/sparc64/zfsboot/Makefile
  projects/clang1000-import/sys/conf/Makefile.sparc64
  projects/clang1000-import/sys/conf/files.sparc64
  projects/clang1000-import/sys/conf/ldscript.sparc64
  projects/clang1000-import/sys/conf/options.sparc64
  projects/clang1000-import/sys/dev/atkbdc/atkbdc_ebus.c
  projects/clang1000-import/sys/dev/auxio/auxio.c
  projects/clang1000-import/sys/dev/auxio/auxioreg.h
  projects/clang1000-import/sys/dev/esp/esp_sbus.c
  projects/clang1000-import/sys/dev/fb/creator.c
  projects/clang1000-import/sys/dev/fb/creator_vt.c
  projects/clang1000-import/sys/dev/fb/creatorreg.h
  projects/clang1000-import/sys/dev/fb/machfb.c
  projects/clang1000-import/sys/dev/fb/machfbreg.h
  projects/clang1000-import/sys/dev/gem/if_gem_sbus.c
  projects/clang1000-import/sys/dev/hme/if_hme_sbus.c
  projects/clang1000-import/sys/dev/hwpmc/hwpmc_sparc64.c
  projects/clang1000-import/sys/dev/isp/isp_sbus.c
  projects/clang1000-import/sys/dev/ispfw/asm_1000.h
  projects/clang1000-import/sys/dev/le/if_le_lebuffer.c
  projects/clang1000-import/sys/dev/le/if_le_ledma.c
  projects/clang1000-import/sys/dev/le/lebuffer_sbus.c
  projects/clang1000-import/sys/dev/pcf/envctrl.c
  projects/clang1000-import/sys/dev/pcf/pcf_ebus.c
  projects/clang1000-import/sys/dev/scc/scc_bfe_ebus.c
  projects/clang1000-import/sys/dev/scc/scc_bfe_sbus.c
  projects/clang1000-import/sys/dev/sound/sbus/apcdmareg.h
  projects/clang1000-import/sys/dev/sound/sbus/cs4231.c
  projects/clang1000-import/sys/dev/sound/sbus/cs4231.h
  projects/clang1000-import/sys/dev/uart/uart_bus_ebus.c
  projects/clang1000-import/sys/dev/uart/uart_cpu_sparc64.c
  projects/clang1000-import/sys/dev/uart/uart_kbd_sun.c
  projects/clang1000-import/sys/dev/uart/uart_kbd_sun.h
  projects/clang1000-import/sys/dev/uart/uart_kbd_sun_tables.h
  projects/clang1000-import/sys/modules/auxio/Makefile
  projects/clang1000-import/sys/modules/epic/Makefile
  projects/clang1000-import/sys/modules/sound/driver/audiocs/Makefile
  projects/clang1000-import/sys/sparc64/
  projects/clang1000-import/tools/build/options/WITHOUT_HTTPD
  projects/clang1000-import/tools/build/options/WITH_HTTPD
  projects/clang1000-import/usr.bin/Makefile.sparc64
  projects/clang1000-import/usr.bin/elf2aout/Makefile
  projects/clang1000-import/usr.bin/elf2aout/Makefile.depend
  projects/clang1000-import/usr.bin/elf2aout/elf2aout.1
  projects/clang1000-import/usr.bin/elf2aout/elf2aout.c
  projects/clang1000-import/usr.sbin/simple_httpd/
Modified:
  projects/clang1000-import/Makefile.inc1
  projects/clang1000-import/ObsoleteFiles.inc
  projects/clang1000-import/RELNOTES
  projects/clang1000-import/bin/pwait/pwait.c
  projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c
  projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c
  projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c
  projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c
  projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
  projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c
  projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
  projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
  projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
  projects/clang1000-import/contrib/elftoolchain/size/size.c
  projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
  projects/clang1000-import/contrib/sqlite3/Makefile.msc
  projects/clang1000-import/contrib/sqlite3/configure
  projects/clang1000-import/contrib/sqlite3/configure.ac
  projects/clang1000-import/contrib/sqlite3/shell.c
  projects/clang1000-import/contrib/sqlite3/sqlite3.c
  projects/clang1000-import/contrib/sqlite3/sqlite3.h
  projects/clang1000-import/contrib/sqlite3/sqlite3ext.h
  projects/clang1000-import/contrib/sqlite3/tea/configure
  projects/clang1000-import/contrib/sqlite3/tea/configure.ac
  projects/clang1000-import/contrib/sqlite3/tea/generic/tclsqlite3.c
  projects/clang1000-import/contrib/sqlite3/tea/win/makefile.vc
  projects/clang1000-import/contrib/xz/src/common/tuklib_physmem.c
  projects/clang1000-import/contrib/xz/src/xz/hardware.c
  projects/clang1000-import/contrib/xz/src/xz/xz.1
  projects/clang1000-import/include/stdio.h
  projects/clang1000-import/lib/libc/Makefile
  projects/clang1000-import/lib/libc/net/rcmd.c
  projects/clang1000-import/lib/libc/riscv/gen/_set_tp.c
  projects/clang1000-import/lib/libc/rpc/rpcb_st_xdr.c
  projects/clang1000-import/lib/libc/stdio/Symbol.map
  projects/clang1000-import/lib/libc/stdio/fputc.c
  projects/clang1000-import/lib/libc/sys/open.2
  projects/clang1000-import/lib/libc/tests/c063/Makefile
  projects/clang1000-import/lib/libc/xdr/xdr_array.c
  projects/clang1000-import/lib/libc/xdr/xdr_reference.c
  projects/clang1000-import/lib/libfetch/fetch.c
  projects/clang1000-import/lib/libkvm/Makefile
  projects/clang1000-import/lib/libkvm/kvm.3
  projects/clang1000-import/lib/libkvm/kvm.c
  projects/clang1000-import/lib/libkvm/kvm.h
  projects/clang1000-import/lib/libkvm/kvm_minidump_powerpc64.c
  projects/clang1000-import/lib/libkvm/kvm_private.h
  projects/clang1000-import/lib/libmemstat/memstat_uma.c
  projects/clang1000-import/lib/libutil/login.conf.5
  projects/clang1000-import/lib/libutil/login_class.c
  projects/clang1000-import/lib/msun/powerpc/fenv.h
  projects/clang1000-import/libexec/rc/rc.d/auditd
  projects/clang1000-import/sbin/fsck_msdosfs/boot.c
  projects/clang1000-import/sbin/init/init.c
  projects/clang1000-import/share/man/man4/cxgbe.4
  projects/clang1000-import/share/man/man5/make.conf.5
  projects/clang1000-import/share/man/man5/rc.conf.5
  projects/clang1000-import/share/man/man5/src.conf.5
  projects/clang1000-import/share/man/man7/ports.7
  projects/clang1000-import/share/man/man7/security.7
  projects/clang1000-import/share/man/man9/zone.9
  projects/clang1000-import/share/mk/bsd.linker.mk
  projects/clang1000-import/share/mk/src.libnames.mk
  projects/clang1000-import/share/mk/src.opts.mk
  projects/clang1000-import/stand/common/metadata.c
  projects/clang1000-import/stand/i386/libi386/biosdisk.c
  projects/clang1000-import/stand/i386/zfsboot/zfsboot.c
  projects/clang1000-import/stand/libofw/libofw.h
  projects/clang1000-import/stand/libsa/zfs/zfsimpl.c
  projects/clang1000-import/stand/loader.mk
  projects/clang1000-import/stand/man/loader.8
  projects/clang1000-import/sys/Makefile
  projects/clang1000-import/sys/amd64/amd64/sys_machdep.c
  projects/clang1000-import/sys/amd64/include/counter.h
  projects/clang1000-import/sys/amd64/include/param.h
  projects/clang1000-import/sys/amd64/linux/linux_dummy.c
  projects/clang1000-import/sys/amd64/linux/linux_proto.h
  projects/clang1000-import/sys/amd64/linux/linux_syscall.h
  projects/clang1000-import/sys/amd64/linux/linux_syscalls.c
  projects/clang1000-import/sys/amd64/linux/linux_sysent.c
  projects/clang1000-import/sys/amd64/linux/linux_systrace_args.c
  projects/clang1000-import/sys/amd64/linux/syscalls.master
  projects/clang1000-import/sys/amd64/linux32/linux32_dummy.c
  projects/clang1000-import/sys/amd64/linux32/linux32_proto.h
  projects/clang1000-import/sys/amd64/linux32/linux32_syscall.h
  projects/clang1000-import/sys/amd64/linux32/linux32_syscalls.c
  projects/clang1000-import/sys/amd64/linux32/linux32_sysent.c
  projects/clang1000-import/sys/amd64/linux32/linux32_systrace_args.c
  projects/clang1000-import/sys/amd64/linux32/syscalls.master
  projects/clang1000-import/sys/arm/include/param.h
  projects/clang1000-import/sys/arm/linux/linux_proto.h
  projects/clang1000-import/sys/arm/linux/linux_syscall.h
  projects/clang1000-import/sys/arm/linux/linux_syscalls.c
  projects/clang1000-import/sys/arm/linux/linux_sysent.c
  projects/clang1000-import/sys/arm/linux/linux_systrace_args.c
  projects/clang1000-import/sys/arm/linux/syscalls.master
  projects/clang1000-import/sys/arm64/arm64/gicv3_its.c
  projects/clang1000-import/sys/arm64/arm64/identcpu.c
  projects/clang1000-import/sys/arm64/arm64/trap.c
  projects/clang1000-import/sys/arm64/include/atomic.h
  projects/clang1000-import/sys/arm64/include/param.h
  projects/clang1000-import/sys/arm64/linux/linux_dummy.c
  projects/clang1000-import/sys/cam/ata/ata_da.c
  projects/clang1000-import/sys/cam/cam_xpt.c
  projects/clang1000-import/sys/cam/mmc/mmc_da.c
  projects/clang1000-import/sys/cam/nvme/nvme_da.c
  projects/clang1000-import/sys/cam/scsi/scsi_cd.c
  projects/clang1000-import/sys/cam/scsi/scsi_da.c
  projects/clang1000-import/sys/cam/scsi/scsi_sa.c
  projects/clang1000-import/sys/cddl/boot/zfs/zfsimpl.h
  projects/clang1000-import/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
  projects/clang1000-import/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/clang1000-import/sys/cddl/contrib/opensolaris/common/lz4/lz4.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/aggsum.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/aggsum.h
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/clang1000-import/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h
  projects/clang1000-import/sys/compat/cloudabi/cloudabi_vdso.c
  projects/clang1000-import/sys/compat/linux/linux_socket.c
  projects/clang1000-import/sys/compat/linux/linux_socket.h
  projects/clang1000-import/sys/compat/linux/linux_time.c
  projects/clang1000-import/sys/compat/linuxkpi/common/include/linux/file.h
  projects/clang1000-import/sys/conf/Makefile.riscv
  projects/clang1000-import/sys/conf/NOTES
  projects/clang1000-import/sys/conf/config.mk
  projects/clang1000-import/sys/conf/files
  projects/clang1000-import/sys/conf/kern.mk
  projects/clang1000-import/sys/conf/kern.opts.mk
  projects/clang1000-import/sys/conf/ldscript.riscv
  projects/clang1000-import/sys/conf/options.arm64
  projects/clang1000-import/sys/contrib/ck/include/ck_md.h
  projects/clang1000-import/sys/dev/aac/aac_disk.c
  projects/clang1000-import/sys/dev/acpi_support/acpi_ibm.c
  projects/clang1000-import/sys/dev/altera/avgen/altera_avgen.c
  projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c
  projects/clang1000-import/sys/dev/amr/amr.c
  projects/clang1000-import/sys/dev/ata/ata-pci.c
  projects/clang1000-import/sys/dev/ata/chipsets/ata-promise.c
  projects/clang1000-import/sys/dev/atkbdc/atkbd.c
  projects/clang1000-import/sys/dev/atkbdc/atkbdc.c
  projects/clang1000-import/sys/dev/atkbdc/psm.c
  projects/clang1000-import/sys/dev/bge/if_bge.c
  projects/clang1000-import/sys/dev/cas/if_cas.c
  projects/clang1000-import/sys/dev/cfi/cfi_disk.c
  projects/clang1000-import/sys/dev/cxgbe/adapter.h
  projects/clang1000-import/sys/dev/cxgbe/t4_main.c
  projects/clang1000-import/sys/dev/cxgbe/t4_netmap.c
  projects/clang1000-import/sys/dev/cxgbe/t4_sge.c
  projects/clang1000-import/sys/dev/dc/if_dc.c
  projects/clang1000-import/sys/dev/fb/fbreg.h
  projects/clang1000-import/sys/dev/firewire/sbp.c
  projects/clang1000-import/sys/dev/flash/at45d.c
  projects/clang1000-import/sys/dev/flash/mx25l.c
  projects/clang1000-import/sys/dev/flash/n25q.c
  projects/clang1000-import/sys/dev/gem/if_gem_pci.c
  projects/clang1000-import/sys/dev/hme/if_hme_pci.c
  projects/clang1000-import/sys/dev/ida/ida_disk.c
  projects/clang1000-import/sys/dev/ips/ips_disk.c
  projects/clang1000-import/sys/dev/isp/isp_freebsd.h
  projects/clang1000-import/sys/dev/isp/isp_pci.c
  projects/clang1000-import/sys/dev/ispfw/ispfw.c
  projects/clang1000-import/sys/dev/mfi/mfi.c
  projects/clang1000-import/sys/dev/mlx/mlx_disk.c
  projects/clang1000-import/sys/dev/mmc/mmcsd.c
  projects/clang1000-import/sys/dev/mpr/mpr.c
  projects/clang1000-import/sys/dev/mpr/mprvar.h
  projects/clang1000-import/sys/dev/mps/mps.c
  projects/clang1000-import/sys/dev/mps/mpsvar.h
  projects/clang1000-import/sys/dev/mpt/mpt.h
  projects/clang1000-import/sys/dev/mpt/mpt_pci.c
  projects/clang1000-import/sys/dev/mthca/mthca_srq.c
  projects/clang1000-import/sys/dev/mxge/if_mxge_var.h
  projects/clang1000-import/sys/dev/nvme/nvme_ns.c
  projects/clang1000-import/sys/dev/ofw/openfirm.h
  projects/clang1000-import/sys/dev/proto/proto_core.c
  projects/clang1000-import/sys/dev/pst/pst-raid.c
  projects/clang1000-import/sys/dev/sfxge/common/efsys.h
  projects/clang1000-import/sys/dev/sound/pci/t4dwave.c
  projects/clang1000-import/sys/dev/sym/sym_hipd.c
  projects/clang1000-import/sys/dev/syscons/scgfbrndr.c
  projects/clang1000-import/sys/dev/syscons/schistory.c
  projects/clang1000-import/sys/dev/syscons/scterm-dumb.c   (contents, props changed)
  projects/clang1000-import/sys/dev/syscons/scterm-sc.c   (contents, props changed)
  projects/clang1000-import/sys/dev/syscons/scterm-teken.c
  projects/clang1000-import/sys/dev/syscons/scvtb.c
  projects/clang1000-import/sys/dev/syscons/syscons.c
  projects/clang1000-import/sys/dev/syscons/syscons.h
  projects/clang1000-import/sys/dev/twe/twe.c
  projects/clang1000-import/sys/dev/virtio/block/virtio_blk.c
  projects/clang1000-import/sys/dev/virtio/pci/virtio_pci.c
  projects/clang1000-import/sys/dev/vt/hw/fb/vt_early_fb.c
  projects/clang1000-import/sys/dev/vt/hw/ofwfb/ofwfb.c
  projects/clang1000-import/sys/dev/xdma/xdma.c
  projects/clang1000-import/sys/dev/xdma/xdma.h
  projects/clang1000-import/sys/dev/xen/blkfront/blkfront.c
  projects/clang1000-import/sys/dev/xen/console/xen_console.c
  projects/clang1000-import/sys/dev/xilinx/axidma.c
  projects/clang1000-import/sys/dev/xilinx/axidma.h
  projects/clang1000-import/sys/dev/xilinx/if_xae.c
  projects/clang1000-import/sys/fs/devfs/devfs_vnops.c
  projects/clang1000-import/sys/fs/fuse/fuse_vnops.c
  projects/clang1000-import/sys/fs/nfsclient/nfs_clvnops.c
  projects/clang1000-import/sys/fs/nullfs/null_subr.c
  projects/clang1000-import/sys/fs/pseudofs/pseudofs_vnops.c
  projects/clang1000-import/sys/fs/smbfs/smbfs_vnops.c
  projects/clang1000-import/sys/fs/tmpfs/tmpfs.h
  projects/clang1000-import/sys/fs/tmpfs/tmpfs_subr.c
  projects/clang1000-import/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/clang1000-import/sys/fs/tmpfs/tmpfs_vnops.c
  projects/clang1000-import/sys/geom/geom_vfs.c
  projects/clang1000-import/sys/i386/i386/pmap.c
  projects/clang1000-import/sys/i386/include/param.h
  projects/clang1000-import/sys/i386/linux/linux_dummy.c
  projects/clang1000-import/sys/i386/linux/linux_proto.h
  projects/clang1000-import/sys/i386/linux/linux_syscall.h
  projects/clang1000-import/sys/i386/linux/linux_syscalls.c
  projects/clang1000-import/sys/i386/linux/linux_sysent.c
  projects/clang1000-import/sys/i386/linux/linux_systrace_args.c
  projects/clang1000-import/sys/i386/linux/syscalls.master
  projects/clang1000-import/sys/kern/kern_descrip.c
  projects/clang1000-import/sys/kern/kern_exit.c
  projects/clang1000-import/sys/kern/kern_ktrace.c
  projects/clang1000-import/sys/kern/kern_malloc.c
  projects/clang1000-import/sys/kern/kern_mbuf.c
  projects/clang1000-import/sys/kern/kern_sendfile.c
  projects/clang1000-import/sys/kern/kern_sysctl.c
  projects/clang1000-import/sys/kern/kern_thr.c
  projects/clang1000-import/sys/kern/kern_time.c
  projects/clang1000-import/sys/kern/link_elf.c
  projects/clang1000-import/sys/kern/sched_ule.c
  projects/clang1000-import/sys/kern/subr_capability.c
  projects/clang1000-import/sys/kern/subr_param.c
  projects/clang1000-import/sys/kern/subr_smr.c
  projects/clang1000-import/sys/kern/subr_uio.c
  projects/clang1000-import/sys/kern/subr_witness.c
  projects/clang1000-import/sys/kern/sys_capability.c
  projects/clang1000-import/sys/kern/sys_generic.c
  projects/clang1000-import/sys/kern/sysv_sem.c
  projects/clang1000-import/sys/kern/tty.c
  projects/clang1000-import/sys/kern/vfs_bio.c
  projects/clang1000-import/sys/kern/vfs_cache.c
  projects/clang1000-import/sys/kern/vfs_lookup.c
  projects/clang1000-import/sys/kern/vfs_subr.c
  projects/clang1000-import/sys/kern/vfs_syscalls.c
  projects/clang1000-import/sys/mips/beri/beri_mp.c
  projects/clang1000-import/sys/modules/Makefile
  projects/clang1000-import/sys/modules/bge/Makefile
  projects/clang1000-import/sys/modules/cas/Makefile
  projects/clang1000-import/sys/modules/dtrace/dtrace/Makefile
  projects/clang1000-import/sys/modules/dtrace/fasttrap/Makefile
  projects/clang1000-import/sys/modules/esp/Makefile
  projects/clang1000-import/sys/modules/gem/Makefile
  projects/clang1000-import/sys/modules/hme/Makefile
  projects/clang1000-import/sys/modules/hwpmc/Makefile
  projects/clang1000-import/sys/modules/i2c/controllers/pcf/Makefile
  projects/clang1000-import/sys/modules/isp/Makefile
  projects/clang1000-import/sys/modules/ispfw/Makefile
  projects/clang1000-import/sys/modules/ix/Makefile
  projects/clang1000-import/sys/modules/ixv/Makefile
  projects/clang1000-import/sys/modules/le/Makefile
  projects/clang1000-import/sys/modules/lio/Makefile
  projects/clang1000-import/sys/modules/oce/Makefile
  projects/clang1000-import/sys/modules/scc/Makefile
  projects/clang1000-import/sys/modules/sound/driver/Makefile
  projects/clang1000-import/sys/modules/syscons/Makefile
  projects/clang1000-import/sys/modules/uart/Makefile
  projects/clang1000-import/sys/modules/vmm/Makefile
  projects/clang1000-import/sys/net/ethernet.h
  projects/clang1000-import/sys/net/if.c
  projects/clang1000-import/sys/netgraph/ng_base.c
  projects/clang1000-import/sys/netgraph/ng_device.c
  projects/clang1000-import/sys/netgraph/ng_socket.c
  projects/clang1000-import/sys/netinet/libalias/alias_db.c
  projects/clang1000-import/sys/netinet/sctp_constants.h
  projects/clang1000-import/sys/netinet/sctp_indata.c
  projects/clang1000-import/sys/netinet/sctp_pcb.c
  projects/clang1000-import/sys/netinet/sctp_structs.h
  projects/clang1000-import/sys/netinet/sctputil.c
  projects/clang1000-import/sys/powerpc/aim/aim_machdep.c
  projects/clang1000-import/sys/powerpc/aim/slb.c
  projects/clang1000-import/sys/powerpc/booke/booke_machdep.c
  projects/clang1000-import/sys/powerpc/include/param.h
  projects/clang1000-import/sys/powerpc/powerpc/exec_machdep.c
  projects/clang1000-import/sys/riscv/include/db_machdep.h
  projects/clang1000-import/sys/riscv/include/param.h
  projects/clang1000-import/sys/riscv/include/riscvreg.h
  projects/clang1000-import/sys/riscv/riscv/db_trace.c
  projects/clang1000-import/sys/riscv/riscv/machdep.c
  projects/clang1000-import/sys/riscv/riscv/riscv_console.c
  projects/clang1000-import/sys/riscv/riscv/trap.c
  projects/clang1000-import/sys/sys/capsicum.h
  projects/clang1000-import/sys/sys/fcntl.h
  projects/clang1000-import/sys/sys/filedesc.h
  projects/clang1000-import/sys/sys/ktrace.h
  projects/clang1000-import/sys/sys/linker.h
  projects/clang1000-import/sys/sys/namei.h
  projects/clang1000-import/sys/sys/param.h
  projects/clang1000-import/sys/sys/seqc.h
  projects/clang1000-import/sys/sys/smr.h
  projects/clang1000-import/sys/sys/syscallsubr.h
  projects/clang1000-import/sys/sys/sysctl.h
  projects/clang1000-import/sys/sys/types.h
  projects/clang1000-import/sys/sys/vnode.h
  projects/clang1000-import/sys/ufs/ffs/ffs_softdep.c
  projects/clang1000-import/sys/ufs/ffs/ffs_vnops.c
  projects/clang1000-import/sys/ufs/ffs/softdep.h
  projects/clang1000-import/sys/vm/uma.h
  projects/clang1000-import/sys/vm/uma_core.c
  projects/clang1000-import/sys/vm/uma_int.h
  projects/clang1000-import/sys/vm/vm_kern.c
  projects/clang1000-import/sys/vm/vm_object.c
  projects/clang1000-import/sys/vm/vm_object.h
  projects/clang1000-import/sys/vm/vm_page.c
  projects/clang1000-import/sys/vm/vm_page.h
  projects/clang1000-import/sys/vm/vnode_pager.c
  projects/clang1000-import/sys/xdr/xdr_array.c
  projects/clang1000-import/sys/xdr/xdr_reference.c
  projects/clang1000-import/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
  projects/clang1000-import/tools/build/options/WITH_BINUTILS_BOOTSTRAP
  projects/clang1000-import/usr.bin/Makefile
  projects/clang1000-import/usr.bin/diff/TODO
  projects/clang1000-import/usr.bin/diff/diff.1
  projects/clang1000-import/usr.bin/diff/diff.c
  projects/clang1000-import/usr.bin/diff/diff.h
  projects/clang1000-import/usr.bin/diff/diffreg.c
  projects/clang1000-import/usr.bin/diff/tests/diff_test.sh
  projects/clang1000-import/usr.bin/env/Makefile
  projects/clang1000-import/usr.bin/env/env.1
  projects/clang1000-import/usr.bin/env/env.c
  projects/clang1000-import/usr.bin/login/login.conf
  projects/clang1000-import/usr.bin/ministat/ministat.c
  projects/clang1000-import/usr.bin/units/units.1
  projects/clang1000-import/usr.bin/units/units.c
  projects/clang1000-import/usr.bin/wc/wc.c
  projects/clang1000-import/usr.sbin/Makefile
  projects/clang1000-import/usr.sbin/bsdinstall/bsdinstall.8
  projects/clang1000-import/usr.sbin/cron/cron/do_command.c
  projects/clang1000-import/usr.sbin/cron/crontab/crontab.5
  projects/clang1000-import/usr.sbin/fstyp/hammer.c
  projects/clang1000-import/usr.sbin/fstyp/hammer2.c
  projects/clang1000-import/usr.sbin/mixer/tests/mixer_test.sh
  projects/clang1000-import/usr.sbin/mpsutil/mps_cmd.c
  projects/clang1000-import/usr.sbin/mpsutil/mps_show.c
  projects/clang1000-import/usr.sbin/service/service.sh
Directory Properties:
  projects/clang1000-import/   (props changed)
  projects/clang1000-import/cddl/   (props changed)
  projects/clang1000-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang1000-import/contrib/elftoolchain/   (props changed)
  projects/clang1000-import/contrib/netbsd-tests/   (props changed)
  projects/clang1000-import/contrib/sqlite3/   (props changed)
  projects/clang1000-import/contrib/xz/   (props changed)
  projects/clang1000-import/gnu/lib/   (props changed)
  projects/clang1000-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang1000-import/sys/contrib/ck/   (props changed)

Modified: projects/clang1000-import/Makefile.inc1
==============================================================================

--- projects/clang1000-import/Makefile.inc1	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/Makefile.inc1	Fri Feb  7 19:08:37 2020	(r357662)
@@ -2912,6 +2912,7 @@ _cddl_lib_libctf= cddl/lib/libctf
 _cddl_lib= cddl/lib
 cddl/lib/libctf__L: lib/libz__L
 .endif
+# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db
 _prebuild_libs+=	lib/libprocstat lib/libproc lib/librtld_db
 lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L
 lib/libproc__L: lib/libprocstat__L

Modified: projects/clang1000-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang1000-import/ObsoleteFiles.inc	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/ObsoleteFiles.inc	Fri Feb  7 19:08:37 2020	(r357662)
@@ -272,6 +272,14 @@ OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt
 OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
+
+# 20200206: Remove elf2aout
+OLD_FILES+=usr/bin/elf2aout
+OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
+
+# 20200204: simple_httpd removed
+OLD_FILES+=usr/sbin/simple_httpd
+
 # 20200127: vpo removed
 OLD_FILES+=usr/share/man/man4/imm.4.gz
 OLD_FILES+=usr/share/man/man4/vpo.4.gz

Modified: projects/clang1000-import/RELNOTES
==============================================================================
--- projects/clang1000-import/RELNOTES	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/RELNOTES	Fri Feb  7 19:08:37 2020	(r357662)
@@ -10,6 +10,18 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+r357627:
+	remove elf2aout.
+
+r357560-r357565:
+	init(8), service(8), and cron(8) will now adopt user/class environment
+	variables (excluding PATH, by default, which will be overwritten) by
+	default.  Notably, environment variables for all cron jobs and rc
+	services can now be set via login.conf(5).
+
+r357455:
+	sparc64 has been removed from FreeBSD.
+
 r355677:
 	Adds support for NFSv4.2 (RFC-7862) and Extended Attributes
 	(RFC-8276) to the NFS client and server.
@@ -31,6 +43,9 @@ r355677:
 	server.
 	Setting vfs.nfsd.server_max_minorversion4 to 0 or 1 will disable NFSv4.2
 	on the server.
+
+r356263:
+	armv5 support has been removed from FreeBSD.
 
 r354517:
 	iwm(4) now supports most Intel 9260, 9460 and 9560 Wi-Fi devices.

Modified: projects/clang1000-import/bin/pwait/pwait.c
==============================================================================
--- projects/clang1000-import/bin/pwait/pwait.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/bin/pwait/pwait.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -687,6 +687,9 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, in
 #elif defined(__mips__)
 	elf_file.ehdr.e_machine = EM_MIPS;
 #elif defined(__powerpc64__)
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+	elf_file.ehdr.e_flags = 2;
+#endif
 	elf_file.ehdr.e_machine = EM_PPC64;
 #elif defined(__sparc)
 	elf_file.ehdr.e_machine = EM_SPARCV9;
@@ -1276,7 +1279,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
 	static const char dt_symfmt[] = "%s%u.%s";
 	static const char dt_weaksymfmt[] = "%s.%s";
 	char probename[DTRACE_NAMELEN];
-	int fd, i, ndx, eprobe, mod = 0;
+	int fd, i, ndx, eprobe, uses_funcdesc = 0, mod = 0;
 	Elf *elf = NULL;
 	GElf_Ehdr ehdr;
 	Elf_Scn *scn_rel, *scn_sym, *scn_str, *scn_tgt;
@@ -1328,6 +1331,9 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
 		emachine1 = emachine2 = EM_MIPS;
 #elif defined(__powerpc__)
 		emachine1 = emachine2 = EM_PPC64;
+#if !defined(_CALL_ELF) || _CALL_ELF == 1
+		uses_funcdesc = 1;
+#endif
 #elif defined(__sparc)
 		emachine1 = emachine2 = EM_SPARCV9;
 #elif defined(__i386) || defined(__amd64)
@@ -1473,7 +1479,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
 				continue;
 
 			if (dt_symtab_lookup(data_sym, 0, isym, rela.r_offset,
-			    shdr_rel.sh_info, &fsym, (emachine1 == EM_PPC64),
+			    shdr_rel.sh_info, &fsym, uses_funcdesc,
 			    elf) != 0) {
 				dt_strtab_destroy(strtab);
 				goto err;
@@ -1644,7 +1650,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
 
 			if (dt_symtab_lookup(data_sym, osym, isym,
 			    rela.r_offset, shdr_rel.sh_info, &fsym,
-			    (emachine1 == EM_PPC64), elf) == 0) {
+			    uses_funcdesc, elf) == 0) {
 				if (fsym.st_name > data_str->d_size)
 					goto err;
 
@@ -1653,7 +1659,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *e
 				s = strchr(s, '.') + 1;
 			} else if (dt_symtab_lookup(data_sym, 0, osym,
 			    rela.r_offset, shdr_rel.sh_info, &fsym,
-			    (emachine1 == EM_PPC64), elf) == 0) {
+			    uses_funcdesc, elf) == 0) {
 				u_int bind;
 
 				bind = GELF_ST_BIND(fsym.st_info) == STB_WEAK ?

Modified: projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -25,6 +25,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/tree.h>
 
 #include <capsicum_helpers.h>
 #include <dwarf.h>
@@ -39,7 +40,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "uthash.h"
 #include "_elftc.h"
 
 ELFTC_VCSID("$Id: addr2line.c 3499 2016-11-25 16:06:29Z emaste $");
@@ -57,13 +57,14 @@ struct Func {
 };
 
 struct CU {
+	RB_ENTRY(CU) entry;
 	Dwarf_Off off;
 	Dwarf_Unsigned lopc;
 	Dwarf_Unsigned hipc;
 	char **srcfiles;
 	Dwarf_Signed nsrcfiles;
 	STAILQ_HEAD(, Func) funclist;
-	UT_hash_handle hh;
+	Dwarf_Die die;
 };
 
 static struct option longopts[] = {
@@ -80,11 +81,23 @@ static struct option longopts[] = {
 	{"version", no_argument, NULL, 'V'},
 	{NULL, 0, NULL, 0}
 };
+
 static int demangle, func, base, inlines, print_addr, pretty_print;
 static char unknown[] = { '?', '?', '\0' };
 static Dwarf_Addr section_base;
-static struct CU *culist;
+/* Need a new curlopc that stores last lopc value. */
+static Dwarf_Unsigned curlopc = ~0ULL;
+static RB_HEAD(cutree, CU) cuhead = RB_INITIALIZER(&cuhead);
 
+static int
+lopccmp(struct CU *e1, struct CU *e2)
+{
+	return (e1->lopc < e2->lopc ? -1 : e1->lopc > e2->lopc);
+}
+
+RB_PROTOTYPE(cutree, CU, entry, lopccmp);
+RB_GENERATE(cutree, CU, entry, lopccmp)
+
 #define	USAGE_MESSAGE	"\
 Usage: %s [options] hexaddress...\n\
   Map program addresses to source file names and line numbers.\n\n\
@@ -378,6 +391,26 @@ print_inlines(struct CU *cu, struct Func *f, Dwarf_Uns
 		    f->call_line);
 }
 
+static struct CU *
+culookup(Dwarf_Unsigned addr)
+{
+	struct CU find, *res;
+
+	find.lopc = addr;
+	res = RB_NFIND(cutree, &cuhead, &find);
+	if (res != NULL) {
+		if (res->lopc != addr)
+			res = RB_PREV(cutree, &cuhead, res);
+		if (res != NULL && addr >= res->lopc && addr < res->hipc)
+			return (res);
+	} else {
+		res = RB_MAX(cutree, &cuhead);
+		if (res != NULL && addr >= res->lopc && addr < res->hipc)
+			return (res);
+	}
+	return (NULL);
+}
+
 static void
 translate(Dwarf_Debug dbg, Elf *e, const char* addrstr)
 {
@@ -400,11 +433,30 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
 	addr += section_base;
 	lineno = 0;
 	file = unknown;
-	cu = NULL;
 	die = NULL;
+	ret = DW_DLV_OK;
 
-	while ((ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
-	    &de)) ==  DW_DLV_OK) {
+	cu = culookup(addr);
+	if (cu != NULL) {
+		die = cu->die;
+		goto status_ok;
+	}
+
+	while (true) {
+		/*
+		 * We resume the CU scan from the last place we found a match.
+		 * Because when we have 2 sequential addresses, and the second
+		 * one is of the next CU, it is faster to just go to the next CU
+		 * instead of starting from the beginning.
+		 */
+		ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
+		    &de);
+		if (ret == DW_DLV_NO_ENTRY) {
+			if (curlopc == ~0ULL)
+				goto out;
+			ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL,
+			    NULL, &de);
+		}
 		die = NULL;
 		while (dwarf_siblingof(dbg, die, &ret_die, &de) == DW_DLV_OK) {
 			if (die != NULL)
@@ -420,12 +472,15 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
 			if (tag == DW_TAG_compile_unit)
 				break;
 		}
+
 		if (ret_die == NULL) {
 			warnx("could not find DW_TAG_compile_unit die");
 			goto next_cu;
 		}
 		if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) ==
 		    DW_DLV_OK) {
+			if (lopc == curlopc)
+				goto out;
 			if (dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc,
 			   &de) == DW_DLV_OK) {
 				/*
@@ -440,31 +495,27 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
 				hipc = ~0ULL;
 			}
 
-			/*
-			 * Record the CU in the hash table for faster lookup
-			 * later.
-			 */
 			if (dwarf_dieoffset(die, &off, &de) != DW_DLV_OK) {
 				warnx("dwarf_dieoffset failed: %s",
 				    dwarf_errmsg(de));
 				goto out;
 			}
-			HASH_FIND(hh, culist, &off, sizeof(off), cu);
-			if (cu == NULL) {
+
+			if (addr >= lopc && addr < hipc) {
 				if ((cu = calloc(1, sizeof(*cu))) == NULL)
 					err(EXIT_FAILURE, "calloc");
 				cu->off = off;
 				cu->lopc = lopc;
 				cu->hipc = hipc;
+				cu->die = die;
 				STAILQ_INIT(&cu->funclist);
-				HASH_ADD(hh, culist, off, sizeof(off), cu);
-			}
+				RB_INSERT(cutree, &cuhead, cu);
 
-			if (addr >= lopc && addr < hipc)
+				curlopc = lopc;
 				break;
+			}
 		}
-
-	next_cu:
+next_cu:
 		if (die != NULL) {
 			dwarf_dealloc(dbg, die, DW_DLA_DIE);
 			die = NULL;
@@ -474,6 +525,7 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr
 	if (ret != DW_DLV_OK || die == NULL)
 		goto out;
 
+status_ok:
 	switch (dwarf_srclines(die, &lbuf, &lcount, &de)) {
 	case DW_DLV_OK:
 		break;
@@ -572,21 +624,6 @@ out:
 	    cu->srcfiles != NULL && f != NULL && f->inlined_caller != NULL)
 		print_inlines(cu, f->inlined_caller, f->call_file,
 		    f->call_line);
-
-	if (die != NULL)
-		dwarf_dealloc(dbg, die, DW_DLA_DIE);
-
-	/*
-	 * Reset internal CU pointer, so we will start from the first CU
-	 * next round.
-	 */
-	while (ret != DW_DLV_NO_ENTRY) {
-		if (ret == DW_DLV_ERROR)
-			errx(EXIT_FAILURE, "dwarf_next_cu_header: %s",
-			    dwarf_errmsg(de));
-		ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL,
-		    &de);
-	}
 }
 
 static void

Modified: projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -587,15 +587,19 @@ copy_from_tempfile(const char *src, const char *dst, i
 	if ((tmpfd = open(dst, O_CREAT | O_TRUNC | O_WRONLY, 0755)) < 0)
 		return (-1);
 
-	if (elftc_copyfile(infd, tmpfd) < 0)
+	if (elftc_copyfile(infd, tmpfd) < 0) {
+		(void) close(tmpfd);
 		return (-1);
+	}
 
 	/*
 	 * Remove the temporary file from the file system
 	 * namespace, and close its file descriptor.
 	 */
-	if (unlink(src) < 0)
+	if (unlink(src) < 0) {
+		(void) close(tmpfd);
 		return (-1);
+	}
 
 	(void) close(infd);
 

Modified: projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/elfcopy/sections.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -1137,7 +1137,7 @@ read_section(struct section *s, size_t *size)
 		if (b == NULL)
 			b = malloc(id->d_size);
 		else
-			b = malloc(sz + id->d_size);
+			b = realloc(b, sz + id->d_size);
 		if (b == NULL)
 			err(EXIT_FAILURE, "malloc or realloc failed");
 

Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_attr.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -46,8 +46,10 @@ dwarf_add_AT_location_expr(Dwarf_P_Debug dbg, Dwarf_P_
 	at->at_attrib = attr;
 	at->at_expr = loc_expr;
 
-	if (_dwarf_expr_into_block(loc_expr, error) != DW_DLE_NONE)
+	if (_dwarf_expr_into_block(loc_expr, error) != DW_DLE_NONE) {
+		free(at);
 		return (DW_DLV_BADADDR);
+	}
 	at->u[0].u64 = loc_expr->pe_length;
 	at->u[1].u8p = loc_expr->pe_block;
 	if (loc_expr->pe_length <= UCHAR_MAX)

Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/dwarf_pro_expr.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -36,10 +36,10 @@ _dwarf_add_expr(Dwarf_P_Expr expr, Dwarf_Small opcode,
 	Dwarf_Debug dbg;
 	int len;
 
-	dbg = expr != NULL ? expr->pe_dbg : NULL;
+	dbg = expr->pe_dbg;
 
-	if (_dwarf_loc_expr_add_atom(expr->pe_dbg, NULL, NULL, opcode, val1,
-	    val2, &len, error) != DW_DLE_NONE)
+	if (_dwarf_loc_expr_add_atom(dbg, NULL, NULL, opcode, val1, val2, &len,
+	    error) != DW_DLE_NONE)
 		return (NULL);
 	assert(len > 0);
 
@@ -67,7 +67,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error 
 	Dwarf_Debug dbg;
 	int len, pos, ret;
 
-	dbg = expr != NULL ? expr->pe_dbg : NULL;
+	dbg = expr->pe_dbg;
 
 	if (expr->pe_block != NULL) {
 		free(expr->pe_block);
@@ -88,7 +88,7 @@ _dwarf_expr_into_block(Dwarf_P_Expr expr, Dwarf_Error 
 	pos = 0;
 	STAILQ_FOREACH(ee, &expr->pe_eelist, ee_next) {
 		assert((Dwarf_Unsigned) pos < expr->pe_length);
-		ret = _dwarf_loc_expr_add_atom(expr->pe_dbg,
+		ret = _dwarf_loc_expr_add_atom(dbg,
 		    &expr->pe_block[pos], &expr->pe_block[expr->pe_length],
 		    ee->ee_loc.lr_atom, ee->ee_loc.lr_number,
 		    ee->ee_loc.lr_number2, &len, error);

Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_abbrev.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -59,9 +59,7 @@ _dwarf_abbrev_add(Dwarf_CU cu, uint64_t entry, uint64_
 		HASH_ADD(ab_hh, cu->cu_abbrev_hash, ab_entry,
 		    sizeof(ab->ab_entry), ab);
 
-	if (abp != NULL)
-		*abp = ab;
-
+	*abp = ab;
 	return (DW_DLE_NONE);
 }
 

Modified: projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libdwarf/libdwarf_frame.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -468,9 +468,9 @@ _dwarf_frame_section_init(Dwarf_Debug dbg, Dwarf_Frame
 
 		if (length > ds->ds_size - offset ||
 		    (length == 0 && !eh_frame)) {
-			DWARF_SET_ERROR(dbg, error,
-			    DW_DLE_DEBUG_FRAME_LENGTH_BAD);
-			return (DW_DLE_DEBUG_FRAME_LENGTH_BAD);
+			ret = DW_DLE_DEBUG_FRAME_LENGTH_BAD;
+			DWARF_SET_ERROR(dbg, error, ret);
+			goto fail_cleanup;
 		}
 
 		/* Check terminator for .eh_frame */

Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_arm.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -203,11 +203,13 @@ cpp_demangle_ARM(const char *org)
 			break;
 
 		if ((arg = vector_str_substr(&d.vec, arg_begin, d.vec.size - 1,
-			    &arg_len)) == NULL)
+		    &arg_len)) == NULL)
 			goto clean;
 
-		if (vector_str_push(&d.arg, arg, arg_len) == false)
+		if (vector_str_push(&d.arg, arg, arg_len) == false) {
+			free(arg);
 			goto clean;
+		}
 
 		free(arg);
 
@@ -301,12 +303,11 @@ init_demangle_data(struct demangle_data *d)
 
 	d->type = ENCODE_FUNC;
 
-	if (vector_str_init(&d->vec) == false)
+	if (!vector_str_init(&d->vec))
 		return (false);
 
-	if (vector_str_init(&d->arg) == false) {
+	if (!vector_str_init(&d->arg)) {
 		vector_str_dest(&d->vec);
-
 		return (false);
 	}
 
@@ -956,7 +957,7 @@ read_op_user(struct demangle_data *d)
 		goto clean;
 
 	if (VEC_PUSH_STR(&d->vec, "::operator ") == false)
-		return (false);
+		goto clean;
 
 	if (vector_str_push(&d->vec, to_str, to_len) == false)
 		goto clean;

Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu2.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -216,11 +216,13 @@ cpp_demangle_gnu2(const char *org)
 			break;
 
 		if ((arg = vector_str_substr(&d.vec, arg_begin, d.vec.size - 1,
-			    &arg_len)) == NULL)
+		    &arg_len)) == NULL)
 			goto clean;
 
-		if (vector_str_push(&d.arg, arg, arg_len) == false)
+		if (vector_str_push(&d.arg, arg, arg_len) == false) {
+			free(arg);
 			goto clean;
+		}
 
 		free(arg);
 
@@ -387,12 +389,11 @@ init_demangle_data(struct demangle_data *d)
 
 	d->type = ENCODE_FUNC;
 
-	if (vector_str_init(&d->vec) == false)
+	if (!vector_str_init(&d->vec))
 		return (false);
 
-	if (vector_str_init(&d->arg) == false) {
+	if (!vector_str_init(&d->arg)) {
 		vector_str_dest(&d->vec);
-
 		return (false);
 	}
 

Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -1659,7 +1659,8 @@ cpp_demangle_read_local_name(struct cpp_demangle_data 
 	if (*(++ddata->cur) == '\0')
 		return (0);
 
-	vector_str_init(&local_name);
+	if (!vector_str_init(&local_name))
+		return (0);
 	ddata->cur_output = &local_name;
 
 	if (!cpp_demangle_read_encoding(ddata)) {
@@ -3953,7 +3954,7 @@ vector_type_qualifier_init(struct vector_type_qualifie
 
 	assert(v->q_container != NULL);
 
-	if (vector_str_init(&v->ext_name) == false) {
+	if (!vector_str_init(&v->ext_name)) {
 		free(v->q_container);
 		return (0);
 	}

Modified: projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/readelf/readelf.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -5964,6 +5964,7 @@ dump_dwarf_frame_regtable(struct readelf *re, Dwarf_Fd
 	for (; cur_pc < end_pc; cur_pc++) {
 		if (dwarf_get_fde_info_for_all_regs(fde, cur_pc, &rt, &row_pc,
 		    &de) != DW_DLV_OK) {
+			free(vec);
 			warnx("dwarf_get_fde_info_for_all_regs failed: %s\n",
 			    dwarf_errmsg(de));
 			return (-1);
@@ -6298,8 +6299,8 @@ search_loclist_at(struct readelf *re, Dwarf_Die die, D
 		if (*la_list_cap == *la_list_len) {
 			*la_list = realloc(*la_list,
 			    *la_list_cap * 2 * sizeof(**la_list));
-			if (la_list == NULL)
-				errx(EXIT_FAILURE, "realloc failed");
+			if (*la_list == NULL)
+				err(EXIT_FAILURE, "realloc failed");
 			*la_list_cap *= 2;
 		}
 		la = &((*la_list)[*la_list_len]);
@@ -7247,7 +7248,6 @@ dump_object(struct readelf *re, int fd)
 
 done:
 	elf_end(re->elf);
-	close(fd);
 }
 
 static void

Modified: projects/clang1000-import/contrib/elftoolchain/size/size.c
==============================================================================
--- projects/clang1000-import/contrib/elftoolchain/size/size.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/elftoolchain/size/size.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -240,7 +240,7 @@ main(int argc, char **argv)
         return (rc);
 }
 
-static Elf_Data *
+static int
 xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void *_dst,
     Elf_Type type, size_t size)
 {
@@ -253,7 +253,8 @@ xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void
 	dst.d_buf = _dst;
 	dst.d_version = elfhdr->e_version;
 	dst.d_size = size;
-	return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]));
+	return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]) !=
+	    NULL ? 0 : 1);
 }
 
 #define NOTE_OFFSET_32(nhdr, namesz, offset) 			\
@@ -314,12 +315,12 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
 	while (data != NULL && offset + sizeof(Elf32_Nhdr) < segment_end) {
 		nhdr = (Elf32_Nhdr *)(uintptr_t)((char*)data + offset);
 		memset(&nhdr_l, 0, sizeof(Elf32_Nhdr));
-		if (!xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
-			ELF_T_WORD, sizeof(Elf32_Word)) ||
-		    !xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
-			ELF_T_WORD, sizeof(Elf32_Word)) ||
-		    !xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
-			ELF_T_WORD, sizeof(Elf32_Word)))
+		if (xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
+		    ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+		    xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
+		    ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+		    xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
+		    ELF_T_WORD, sizeof(Elf32_Word)) != 0)
 			break;
 
 		if (offset + sizeof(Elf32_Nhdr) +
@@ -356,10 +357,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
 						pid = PID64(nhdr,
 						    nhdr_l.n_namesz, 40);
 				}
-				xlatetom(elf, elfhdr, &raw_size, &raw_size,
-				    ELF_T_WORD, sizeof(uint64_t));
-				xlatetom(elf, elfhdr, &pid, &pid, ELF_T_WORD,
-				    sizeof(pid_t));
+				(void)xlatetom(elf, elfhdr, &raw_size,
+				    &raw_size, ELF_T_WORD, sizeof(uint64_t));
+				(void)xlatetom(elf, elfhdr, &pid, &pid,
+				    ELF_T_WORD, sizeof(pid_t));
 			}
 
 			if (raw_size != 0 && style == STYLE_SYSV) {

Modified: projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c
==============================================================================
--- projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $ */
+/*	$NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,13 +29,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:01 christos Exp $");
+__RCSID("$NetBSD: t_o_search.c,v 1.9 2020/02/06 12:18:06 martin Exp $");
 
 #include <atf-c.h>
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -50,7 +51,7 @@ __RCSID("$NetBSD: t_o_search.c,v 1.5 2017/01/10 22:25:
  * until a decision is reached about the semantics of O_SEARCH and a
  * non-broken implementation is available.
  */
-#if (O_MASK & O_SEARCH) != 0
+#if defined(__FreeBSD__) || (O_MASK & O_SEARCH) != 0
 #define USE_O_SEARCH
 #endif
 
@@ -257,11 +258,76 @@ ATF_TC_BODY(o_search_notdir, tc)
 	int fd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
-	ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_RDWR|O_SEARCH, 0644)) != -1);
+	ATF_REQUIRE((dfd = open(FILE, O_CREAT|O_SEARCH, 0644)) != -1);
 	ATF_REQUIRE((fd = openat(dfd, BASEFILE, O_RDWR, 0)) == -1);
 	ATF_REQUIRE(errno == ENOTDIR);
+	ATF_REQUIRE(close(dfd) == 0);
 }
 
+#ifdef USE_O_SEARCH
+ATF_TC(o_search_nord);
+ATF_TC_HEAD(o_search_nord, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that openat succeeds with no read permission");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_nord, tc)
+{
+	int dfd, fd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE(chmod(DIR, 0100) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+
+	ATF_REQUIRE(faccessat(dfd, BASEFILE, W_OK, 0) != -1);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_getdents);
+ATF_TC_HEAD(o_search_getdents, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that O_SEARCH forbids getdents");
+}
+ATF_TC_BODY(o_search_getdents, tc)
+{
+	char buf[1024];
+	int dfd;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+	ATF_REQUIRE(getdents(dfd, buf, sizeof(buf)) < 0);
+	ATF_REQUIRE(close(dfd) == 0);
+}
+
+ATF_TC(o_search_revokex);
+ATF_TC_HEAD(o_search_revokex, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that *at behaves after chmod -x");
+	atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+ATF_TC_BODY(o_search_revokex, tc)
+{
+	int dfd, fd;
+	struct stat sb;
+
+	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
+	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
+	ATF_REQUIRE(close(fd) == 0);
+
+	ATF_REQUIRE((dfd = open(DIR, O_SEARCH, 0)) != -1);
+
+	/* Drop permissions. The kernel must still not check the exec bit. */
+	ATF_REQUIRE(chmod(DIR, 0000) == 0);
+	ATF_REQUIRE(fstatat(dfd, BASEFILE, &sb, 0) == 0);
+
+	ATF_REQUIRE(close(dfd) == 0);
+}
+#endif /* USE_O_SEARCH */
+
 ATF_TP_ADD_TCS(tp)
 {
 
@@ -276,6 +342,11 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, o_search_unpriv_flag2);
 #endif
 	ATF_TP_ADD_TC(tp, o_search_notdir);
+#ifdef USE_O_SEARCH
+	ATF_TP_ADD_TC(tp, o_search_nord);
+	ATF_TP_ADD_TC(tp, o_search_getdents);
+	ATF_TP_ADD_TC(tp, o_search_revokex);
+#endif
 
 	return atf_no_error();
 }

Modified: projects/clang1000-import/contrib/sqlite3/Makefile.msc
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/Makefile.msc	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/sqlite3/Makefile.msc	Fri Feb  7 19:08:37 2020	(r357662)
@@ -210,12 +210,6 @@ OPTIMIZATIONS = 2
 SESSION = 0
 !ENDIF
 
-# Set this to non-0 to enable support for the rbu extension.
-#
-!IFNDEF RBU
-RBU = 0
-!ENDIF
-
 # Set the source code file to be used by executables and libraries when
 # they need the amalgamation.
 #
@@ -288,6 +282,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENAB
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
 !ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -301,13 +296,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENAB
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
 !ENDIF
 
-# Should the rbu extension be enabled?  If so, add compilation options
-# to enable it.
-#
-!IF $(RBU)!=0
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1
-!ENDIF
-
 # These are the "extended" SQLite compilation options used when compiling for
 # the Windows 10 platform.
 #
@@ -990,7 +978,7 @@ Replace.exe:
 sqlite3.def:	Replace.exe $(LIBOBJ)
 	echo EXPORTS > sqlite3.def
 	dumpbin /all $(LIBOBJ) \
-		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser|rbu)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
 		| sort >> sqlite3.def
 
 $(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)

Modified: projects/clang1000-import/contrib/sqlite3/configure
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/configure	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/sqlite3/configure	Fri Feb  7 19:08:37 2020	(r357662)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.31.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.30.1.
 #
 # Report bugs to <http://www.sqlite.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.31.0'
-PACKAGE_STRING='sqlite 3.31.0'
+PACKAGE_VERSION='3.30.1'
+PACKAGE_STRING='sqlite 3.30.1'
 PACKAGE_BUGREPORT='http://www.sqlite.org'
 PACKAGE_URL=''
 
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.31.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.30.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1412,7 +1412,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.31.0:";;
+     short | recursive ) echo "Configuration of sqlite 3.30.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.31.0
+sqlite configure 3.30.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.31.0, which was
+It was created by sqlite $as_me 3.30.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2818,7 +2818,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sqlite'
- VERSION='3.31.0'
+ VERSION='3.30.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13653,7 +13653,7 @@ else
 fi
 
 if test x"$enable_rtree" = "xyes"; then
-  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE"
 fi
 #-----------------------------------------------------------------------
 
@@ -14438,7 +14438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.31.0, which was
+This file was extended by sqlite $as_me 3.30.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14495,7 +14495,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sqlite config.status 3.31.0
+sqlite config.status 3.30.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: projects/clang1000-import/contrib/sqlite3/configure.ac
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/configure.ac	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/sqlite3/configure.ac	Fri Feb  7 19:08:37 2020	(r357662)
@@ -10,7 +10,7 @@
 #
 
 AC_PREREQ(2.61)
-AC_INIT(sqlite, 3.31.0, http://www.sqlite.org)
+AC_INIT(sqlite, 3.30.1, http://www.sqlite.org)
 AC_CONFIG_SRCDIR([sqlite3.c])
 AC_CONFIG_AUX_DIR([.])
 
@@ -161,7 +161,7 @@ AC_ARG_ENABLE(rtree, [AS_HELP_STRING(
   [--enable-rtree], [include rtree support [default=yes]])], 
   [], [enable_rtree=yes])
 if test x"$enable_rtree" = "xyes"; then
-  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE"
 fi
 #-----------------------------------------------------------------------
 

Modified: projects/clang1000-import/contrib/sqlite3/shell.c
==============================================================================
--- projects/clang1000-import/contrib/sqlite3/shell.c	Fri Feb  7 19:04:27 2020	(r357661)
+++ projects/clang1000-import/contrib/sqlite3/shell.c	Fri Feb  7 19:08:37 2020	(r357662)
@@ -2007,23 +2007,19 @@ int sqlite3_shathree_init(
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "sha3", 1,
-                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                      0, sha3Func, 0, 0);
+  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
+                               sha3Func, 0, 0);
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3", 2,
-                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                      0, sha3Func, 0, 0);
+    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
+                                 sha3Func, 0, 0);
   }
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3_query", 1,
-                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
-                      0, sha3QueryFunc, 0, 0);
+    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
+                                 sha3QueryFunc, 0, 0);
   }
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3_query", 2,
-                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
-                      0, sha3QueryFunc, 0, 0);
+    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
+                                 sha3QueryFunc, 0, 0);
   }
   return rc;
 }
@@ -2617,7 +2613,6 @@ static int fsdirConnect(
     pNew = (fsdir_tab*)sqlite3_malloc( sizeof(*pNew) );
     if( pNew==0 ) return SQLITE_NOMEM;
     memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
   }
   *ppVtab = (sqlite3_vtab*)pNew;
   return rc;
@@ -3011,12 +3006,10 @@ int sqlite3_fileio_init(
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "readfile", 1, 
-                               SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
                                readfileFunc, 0, 0);
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "writefile", -1,
-                                 SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+    rc = sqlite3_create_function(db, "writefile", -1, SQLITE_UTF8, 0,
                                  writefileFunc, 0, 0);
   }
   if( rc==SQLITE_OK ){
@@ -3151,7 +3144,6 @@ static int completionConnect(
 #define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
 #define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */
 
-  sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
   rc = sqlite3_declare_vtab(db,
       "CREATE TABLE x("
       "  candidate TEXT,"
@@ -4586,7 +4578,6 @@ static int zipfileConnect(
       zipfileDequote(pNew->zFile);
     }
   }
-  sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
   *ppVtab = (sqlite3_vtab*)pNew;
   return rc;
 }
@@ -5199,25 +5190,25 @@ static int zipfileDeflate(
   u8 **ppOut, int *pnOut,         /* Output */
   char **pzErr                    /* OUT: Error message */
 ){
-  int rc = SQLITE_OK;
-  sqlite3_int64 nAlloc;
-  z_stream str;
+  sqlite3_int64 nAlloc = compressBound(nIn);
   u8 *aOut;
+  int rc = SQLITE_OK;
 
-  memset(&str, 0, sizeof(str));
-  str.next_in = (Bytef*)aIn;
-  str.avail_in = nIn;
-  deflateInit2(&str, 9, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
-
-  nAlloc = deflateBound(&str, nIn);
   aOut = (u8*)sqlite3_malloc64(nAlloc);
   if( aOut==0 ){
     rc = SQLITE_NOMEM;
   }else{
     int res;

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