svn commit: r352105 - in projects/clang900-import: . bin/dd bin/uuidgen cddl/contrib/opensolaris/lib/libzfs/common cddl/lib/libavl cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/lib...

Dimitry Andric dim at FreeBSD.org
Mon Sep 9 19:58:59 UTC 2019 

Author: dim
Date: Mon Sep  9 19:58:46 2019
New Revision: 352105
URL: https://svnweb.freebsd.org/changeset/base/352105

Log:
  Merge ^/head r351732 through r352104.

Added:
  projects/clang900-import/sys/dev/gpio/dwgpio/
     - copied from r352104, head/sys/dev/gpio/dwgpio/
  projects/clang900-import/usr.bin/patch/tests/
     - copied from r352104, head/usr.bin/patch/tests/
  projects/clang900-import/usr.sbin/mpsutil/mps_slot.c
     - copied unchanged from r352104, head/usr.sbin/mpsutil/mps_slot.c
Deleted:
  projects/clang900-import/stand/efi/boot1/Makefile.fat
  projects/clang900-import/stand/efi/boot1/fat-amd64.tmpl.xz
  projects/clang900-import/stand/efi/boot1/fat-arm.tmpl.xz
  projects/clang900-import/stand/efi/boot1/fat-arm64.tmpl.xz
  projects/clang900-import/stand/efi/boot1/fat-i386.tmpl.xz
  projects/clang900-import/stand/efi/boot1/generate-fat.sh
  projects/clang900-import/stand/i386/zfsloader/
  projects/clang900-import/sys/arm/altera/socfpga/socfpga_gpio.c
  projects/clang900-import/tools/tools/nanobsd/embedded/sam9260ek.cfg
  projects/clang900-import/tools/tools/nanobsd/embedded/sam9g20ek.cfg
  projects/clang900-import/usr.sbin/pc-sysinstall/
Modified:
  projects/clang900-import/ObsoleteFiles.inc
  projects/clang900-import/bin/dd/args.c
  projects/clang900-import/bin/dd/dd.1
  projects/clang900-import/bin/dd/dd.c
  projects/clang900-import/bin/dd/dd.h
  projects/clang900-import/bin/uuidgen/Makefile
  projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang900-import/cddl/lib/libavl/Makefile
  projects/clang900-import/cddl/lib/libnvpair/Makefile
  projects/clang900-import/cddl/lib/libumem/Makefile
  projects/clang900-import/cddl/lib/libuutil/Makefile
  projects/clang900-import/cddl/lib/libzfs/Makefile
  projects/clang900-import/cddl/lib/libzfs_core/Makefile
  projects/clang900-import/cddl/sbin/zfs/Makefile
  projects/clang900-import/cddl/sbin/zpool/Makefile
  projects/clang900-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
  projects/clang900-import/contrib/llvm/lib/CodeGen/IfConversion.cpp
  projects/clang900-import/etc/mtree/BSD.tests.dist
  projects/clang900-import/etc/mtree/BSD.usr.dist
  projects/clang900-import/include/Makefile
  projects/clang900-import/include/stdio.h
  projects/clang900-import/lib/csu/riscv/crt.h
  projects/clang900-import/lib/geom/part/gpart.8
  projects/clang900-import/lib/lib80211/Makefile
  projects/clang900-import/lib/lib80211/regdomain.xml
  projects/clang900-import/lib/libalias/libalias/Makefile
  projects/clang900-import/lib/libauditd/Makefile
  projects/clang900-import/lib/libbe/Makefile
  projects/clang900-import/lib/libbluetooth/Makefile
  projects/clang900-import/lib/libc/compat-43/creat.2
  projects/clang900-import/lib/libc/gen/Makefile.inc
  projects/clang900-import/lib/libc/nameser/ns_name.c
  projects/clang900-import/lib/libc/sys/cpuset.2
  projects/clang900-import/lib/libc/sys/procctl.2
  projects/clang900-import/lib/libcalendar/Makefile
  projects/clang900-import/lib/libcam/Makefile
  projects/clang900-import/lib/libcapsicum/Makefile
  projects/clang900-import/lib/libcasper/libcasper/Makefile
  projects/clang900-import/lib/libcasper/services/cap_dns/Makefile
  projects/clang900-import/lib/libcasper/services/cap_fileargs/Makefile
  projects/clang900-import/lib/libcasper/services/cap_grp/Makefile
  projects/clang900-import/lib/libcasper/services/cap_pwd/Makefile
  projects/clang900-import/lib/libcasper/services/cap_sysctl/Makefile
  projects/clang900-import/lib/libcasper/services/cap_syslog/Makefile
  projects/clang900-import/lib/libcom_err/Makefile
  projects/clang900-import/lib/libcrypt/Makefile
  projects/clang900-import/lib/libdevctl/Makefile
  projects/clang900-import/lib/libdevinfo/Makefile
  projects/clang900-import/lib/libdevstat/Makefile
  projects/clang900-import/lib/libelf/Makefile
  projects/clang900-import/lib/libfetch/Makefile
  projects/clang900-import/lib/libgeom/Makefile
  projects/clang900-import/lib/libgpio/Makefile
  projects/clang900-import/lib/libgssapi/Makefile
  projects/clang900-import/lib/libipsec/Makefile
  projects/clang900-import/lib/libjail/Makefile
  projects/clang900-import/lib/libkiconv/Makefile
  projects/clang900-import/lib/libkvm/Makefile
  projects/clang900-import/lib/libmd/Makefile
  projects/clang900-import/lib/libmemstat/Makefile
  projects/clang900-import/lib/libmp/Makefile
  projects/clang900-import/lib/libmt/Makefile
  projects/clang900-import/lib/libnetgraph/Makefile
  projects/clang900-import/lib/libngatm/Makefile
  projects/clang900-import/lib/libnv/Makefile
  projects/clang900-import/lib/libpam/libpam/Makefile
  projects/clang900-import/lib/libpcap/Makefile
  projects/clang900-import/lib/libpjdlog/Makefile
  projects/clang900-import/lib/libpmc/Makefile
  projects/clang900-import/lib/libproc/Makefile
  projects/clang900-import/lib/libprocstat/Makefile
  projects/clang900-import/lib/libradius/Makefile
  projects/clang900-import/lib/librpcsvc/Makefile
  projects/clang900-import/lib/librt/Makefile
  projects/clang900-import/lib/librtld_db/Makefile
  projects/clang900-import/lib/libsbuf/Makefile
  projects/clang900-import/lib/libsysdecode/Makefile
  projects/clang900-import/lib/libtacplus/Makefile
  projects/clang900-import/lib/libufs/Makefile
  projects/clang900-import/lib/libugidfw/Makefile
  projects/clang900-import/lib/libulog/Makefile
  projects/clang900-import/lib/libusb/Makefile
  projects/clang900-import/lib/libusbhid/Makefile
  projects/clang900-import/lib/libutil/Makefile
  projects/clang900-import/lib/libwrap/Makefile
  projects/clang900-import/lib/libxo/Makefile
  projects/clang900-import/lib/libypclnt/Makefile
  projects/clang900-import/lib/libz/Makefile
  projects/clang900-import/libexec/rc/Makefile
  projects/clang900-import/libexec/rc/rc.d/Makefile
  projects/clang900-import/libexec/rc/rc.subr
  projects/clang900-import/release/amd64/mkisoimages.sh
  projects/clang900-import/release/packages/Makefile.package
  projects/clang900-import/release/scripts/mtree-to-plist.awk   (contents, props changed)
  projects/clang900-import/sbin/bectl/bectl.8
  projects/clang900-import/sbin/bectl/bectl.c
  projects/clang900-import/sbin/bectl/bectl_list.c
  projects/clang900-import/sbin/camcontrol/attrib.c
  projects/clang900-import/sbin/camcontrol/camcontrol.c
  projects/clang900-import/sbin/camcontrol/fwdownload.c
  projects/clang900-import/sbin/camcontrol/persist.c
  projects/clang900-import/sbin/devd/Makefile
  projects/clang900-import/sbin/fsck_msdosfs/dir.c
  projects/clang900-import/sbin/ggate/shared/ggate.h
  projects/clang900-import/sbin/mount_fusefs/mount_fusefs.c
  projects/clang900-import/sbin/nfsiod/Makefile
  projects/clang900-import/sbin/nos-tun/Makefile
  projects/clang900-import/sbin/nvmecontrol/identify_ext.c
  projects/clang900-import/sbin/pfctl/tests/Makefile
  projects/clang900-import/sbin/pfctl/tests/files/Makefile
  projects/clang900-import/sbin/rcorder/Makefile
  projects/clang900-import/sbin/setkey/Makefile
  projects/clang900-import/secure/lib/libcrypto/Makefile
  projects/clang900-import/share/keys/pkg/trusted/Makefile
  projects/clang900-import/share/man/man4/acpi_wmi.4
  projects/clang900-import/share/man/man4/nvdimm.4
  projects/clang900-import/share/man/man5/passwd.5
  projects/clang900-import/share/man/man5/src.conf.5
  projects/clang900-import/share/man/man8/rc.8
  projects/clang900-import/share/man/man8/rc.subr.8
  projects/clang900-import/share/man/man9/Makefile
  projects/clang900-import/share/misc/committers-src.dot
  projects/clang900-import/share/mk/bsd.compiler.mk
  projects/clang900-import/share/mk/bsd.confs.mk
  projects/clang900-import/share/mk/bsd.dirs.mk
  projects/clang900-import/share/mk/bsd.doc.mk
  projects/clang900-import/share/mk/bsd.files.mk
  projects/clang900-import/share/mk/bsd.incs.mk
  projects/clang900-import/share/mk/bsd.lib.mk
  projects/clang900-import/share/mk/bsd.prog.mk
  projects/clang900-import/share/mk/bsd.progs.mk
  projects/clang900-import/share/mk/src.opts.mk
  projects/clang900-import/share/termcap/Makefile
  projects/clang900-import/stand/common/load_elf.c
  projects/clang900-import/stand/defs.mk
  projects/clang900-import/stand/efi/boot1/Makefile
  projects/clang900-import/stand/efi/gptboot/Makefile
  projects/clang900-import/stand/efi/include/efilib.h
  projects/clang900-import/stand/efi/libefi/Makefile
  projects/clang900-import/stand/efi/libefi/efi_console.c
  projects/clang900-import/stand/efi/loader/arch/amd64/Makefile.inc
  projects/clang900-import/stand/efi/loader/arch/i386/Makefile.inc
  projects/clang900-import/stand/efi/loader/main.c
  projects/clang900-import/stand/ficl/softwords/softcore.fr
  projects/clang900-import/stand/ficl/words.c
  projects/clang900-import/stand/forth/frames.4th
  projects/clang900-import/stand/i386/libi386/Makefile
  projects/clang900-import/stand/i386/libi386/vidconsole.c
  projects/clang900-import/stand/i386/loader/Makefile
  projects/clang900-import/stand/lua/drawer.lua
  projects/clang900-import/sys/amd64/amd64/pmap.c
  projects/clang900-import/sys/amd64/include/vmparam.h
  projects/clang900-import/sys/amd64/linux/linux_ptrace.c
  projects/clang900-import/sys/amd64/linux/linux_sysvec.c
  projects/clang900-import/sys/arm/altera/socfpga/files.socfpga
  projects/clang900-import/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
  projects/clang900-import/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
  projects/clang900-import/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h
  projects/clang900-import/sys/arm/conf/GENERIC
  projects/clang900-import/sys/arm64/conf/GENERIC
  projects/clang900-import/sys/cam/scsi/scsi_all.c
  projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/clang900-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang900-import/sys/compat/linprocfs/linprocfs.c
  projects/clang900-import/sys/compat/linuxkpi/common/include/linux/device.h
  projects/clang900-import/sys/compat/linuxkpi/common/include/linux/sysfs.h
  projects/clang900-import/sys/conf/NOTES
  projects/clang900-import/sys/conf/files
  projects/clang900-import/sys/conf/kern.mk
  projects/clang900-import/sys/conf/ldscript.riscv
  projects/clang900-import/sys/ddb/db_command.h
  projects/clang900-import/sys/ddb/db_lex.c
  projects/clang900-import/sys/ddb/db_lex.h
  projects/clang900-import/sys/ddb/db_run.c
  projects/clang900-import/sys/dev/acpi_support/acpi_wmi.c
  projects/clang900-import/sys/dev/iicbus/ads111x.c
  projects/clang900-import/sys/dev/nvme/nvme.c
  projects/clang900-import/sys/dev/nvme/nvme_ctrlr.c
  projects/clang900-import/sys/dev/nvme/nvme_pci.c
  projects/clang900-import/sys/dev/nvme/nvme_private.h
  projects/clang900-import/sys/dev/nvme/nvme_qpair.c
  projects/clang900-import/sys/dev/pci/pci_host_generic.c
  projects/clang900-import/sys/dev/ral/rt2860.c
  projects/clang900-import/sys/dev/sound/pcm/channel.h
  projects/clang900-import/sys/dev/superio/superio.c
  projects/clang900-import/sys/dev/superio/superio.h
  projects/clang900-import/sys/dev/usb/usb_hid.c
  projects/clang900-import/sys/fs/cd9660/cd9660_vfsops.c
  projects/clang900-import/sys/fs/cd9660/cd9660_vnops.c
  projects/clang900-import/sys/fs/ext2fs/ext2_alloc.c
  projects/clang900-import/sys/fs/ext2fs/ext2_balloc.c
  projects/clang900-import/sys/fs/ext2fs/ext2_extattr.c
  projects/clang900-import/sys/fs/ext2fs/ext2_extents.c
  projects/clang900-import/sys/fs/ext2fs/ext2_vfsops.c
  projects/clang900-import/sys/fs/fuse/fuse_internal.c
  projects/clang900-import/sys/fs/fuse/fuse_vnops.c
  projects/clang900-import/sys/fs/msdosfs/msdosfs_fat.c
  projects/clang900-import/sys/fs/msdosfs/msdosfs_lookup.c
  projects/clang900-import/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/clang900-import/sys/fs/msdosfs/msdosfs_vnops.c
  projects/clang900-import/sys/fs/msdosfs/msdosfsmount.h
  projects/clang900-import/sys/fs/nfs/nfs_var.h
  projects/clang900-import/sys/fs/nfsclient/nfs_clvnops.c
  projects/clang900-import/sys/fs/nfsserver/nfs_nfsdport.c
  projects/clang900-import/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang900-import/sys/fs/pseudofs/pseudofs_vnops.c
  projects/clang900-import/sys/gdb/gdb_cons.c
  projects/clang900-import/sys/gdb/gdb_int.h
  projects/clang900-import/sys/gdb/gdb_main.c
  projects/clang900-import/sys/geom/part/g_part.c
  projects/clang900-import/sys/geom/part/g_part_gpt.c
  projects/clang900-import/sys/kern/imgact_elf.c
  projects/clang900-import/sys/kern/kern_cpuset.c
  projects/clang900-import/sys/kern/kern_exec.c
  projects/clang900-import/sys/kern/kern_fork.c
  projects/clang900-import/sys/kern/kern_procctl.c
  projects/clang900-import/sys/kern/kern_shutdown.c
  projects/clang900-import/sys/kern/kern_tc.c
  projects/clang900-import/sys/kern/uipc_shm.c
  projects/clang900-import/sys/kern/vfs_bio.c
  projects/clang900-import/sys/kern/vfs_cache.c
  projects/clang900-import/sys/kern/vfs_hash.c
  projects/clang900-import/sys/kern/vfs_subr.c
  projects/clang900-import/sys/kern/vfs_vnops.c
  projects/clang900-import/sys/netinet/tcp_input.c
  projects/clang900-import/sys/netinet/tcp_lro.c
  projects/clang900-import/sys/netinet/tcp_lro.h
  projects/clang900-import/sys/netinet/tcp_output.c
  projects/clang900-import/sys/netinet/tcp_stacks/rack.c
  projects/clang900-import/sys/netinet/tcp_stacks/rack_bbr_common.c
  projects/clang900-import/sys/netinet/tcp_subr.c
  projects/clang900-import/sys/netinet/tcp_var.h
  projects/clang900-import/sys/netipsec/ipsec.c
  projects/clang900-import/sys/powerpc/aim/mmu_oea64.c
  projects/clang900-import/sys/powerpc/aim/moea64_native.c
  projects/clang900-import/sys/riscv/riscv/intr_machdep.c
  projects/clang900-import/sys/riscv/riscv/locore.S
  projects/clang900-import/sys/sys/buf.h
  projects/clang900-import/sys/sys/lockmgr.h
  projects/clang900-import/sys/sys/mbuf.h
  projects/clang900-import/sys/sys/mount.h
  projects/clang900-import/sys/sys/param.h
  projects/clang900-import/sys/sys/proc.h
  projects/clang900-import/sys/sys/procctl.h
  projects/clang900-import/sys/sys/vnode.h
  projects/clang900-import/sys/teken/teken.c
  projects/clang900-import/sys/ufs/ffs/ffs_alloc.c
  projects/clang900-import/sys/ufs/ffs/ffs_balloc.c
  projects/clang900-import/sys/ufs/ffs/ffs_snapshot.c
  projects/clang900-import/sys/ufs/ffs/ffs_softdep.c
  projects/clang900-import/sys/ufs/ffs/ffs_subr.c
  projects/clang900-import/sys/ufs/ffs/ffs_vfsops.c
  projects/clang900-import/sys/ufs/ufs/ufs_quota.c
  projects/clang900-import/sys/vm/swap_pager.c
  projects/clang900-import/sys/vm/vm_kern.c
  projects/clang900-import/sys/vm/vm_map.c
  projects/clang900-import/sys/vm/vm_map.h
  projects/clang900-import/sys/vm/vm_mmap.c
  projects/clang900-import/sys/vm/vm_object.c
  projects/clang900-import/sys/vm/vm_object.h
  projects/clang900-import/sys/vm/vm_page.c
  projects/clang900-import/sys/vm/vm_page.h
  projects/clang900-import/sys/vm/vm_pageout.c
  projects/clang900-import/sys/vm/vm_pager.h
  projects/clang900-import/sys/vm/vnode_pager.c
  projects/clang900-import/sys/vm/vnode_pager.h
  projects/clang900-import/targets/pseudo/userland/Makefile.depend
  projects/clang900-import/tests/sys/acl/Makefile
  projects/clang900-import/tests/sys/common/Makefile
  projects/clang900-import/tests/sys/fs/fusefs/allow_other.cc
  projects/clang900-import/tests/sys/fs/fusefs/bmap.cc
  projects/clang900-import/tests/sys/fs/fusefs/default_permissions.cc
  projects/clang900-import/tests/sys/fs/fusefs/dev_fuse_poll.cc
  projects/clang900-import/tests/sys/fs/fusefs/fifo.cc
  projects/clang900-import/tests/sys/fs/fusefs/interrupt.cc
  projects/clang900-import/tests/sys/fs/fusefs/io.cc
  projects/clang900-import/tests/sys/fs/fusefs/mknod.cc
  projects/clang900-import/tests/sys/fs/fusefs/mockfs.cc
  projects/clang900-import/tests/sys/fs/fusefs/notify.cc
  projects/clang900-import/tests/sys/fs/fusefs/open.cc
  projects/clang900-import/tests/sys/fs/fusefs/opendir.cc
  projects/clang900-import/tests/sys/fs/fusefs/read.cc
  projects/clang900-import/tests/sys/fs/fusefs/release.cc
  projects/clang900-import/tests/sys/fs/fusefs/setattr.cc
  projects/clang900-import/tests/sys/fs/fusefs/utils.cc
  projects/clang900-import/tests/sys/fs/fusefs/utils.hh
  projects/clang900-import/tests/sys/fs/fusefs/write.cc
  projects/clang900-import/tests/sys/sys/qmath_test.c
  projects/clang900-import/tools/boot/ci-qemu-test.sh
  projects/clang900-import/tools/boot/install-boot.sh
  projects/clang900-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang900-import/tools/tools/nanobsd/dhcpd/common
  projects/clang900-import/tools/tools/nanobsd/embedded/common
  projects/clang900-import/usr.bin/dc/dc.1
  projects/clang900-import/usr.bin/du/Makefile
  projects/clang900-import/usr.bin/fsync/Makefile
  projects/clang900-import/usr.bin/grep/tests/grep_freebsd_test.sh
  projects/clang900-import/usr.bin/m4/Makefile
  projects/clang900-import/usr.bin/m4/eval.c
  projects/clang900-import/usr.bin/m4/extern.h
  projects/clang900-import/usr.bin/m4/gnum4.c
  projects/clang900-import/usr.bin/m4/m4.1
  projects/clang900-import/usr.bin/m4/main.c
  projects/clang900-import/usr.bin/m4/misc.c
  projects/clang900-import/usr.bin/m4/tokenizer.l
  projects/clang900-import/usr.bin/passwd/Makefile
  projects/clang900-import/usr.bin/patch/Makefile
  projects/clang900-import/usr.bin/proccontrol/proccontrol.c
  projects/clang900-import/usr.bin/procstat/tests/procstat_test.sh
  projects/clang900-import/usr.bin/procstat/tests/while1.c
  projects/clang900-import/usr.bin/sed/Makefile
  projects/clang900-import/usr.bin/sort/sort.1.in
  projects/clang900-import/usr.bin/tar/Makefile
  projects/clang900-import/usr.bin/uname/Makefile
  projects/clang900-import/usr.bin/what/Makefile
  projects/clang900-import/usr.sbin/Makefile
  projects/clang900-import/usr.sbin/ip6addrctl/Makefile
  projects/clang900-import/usr.sbin/kldxref/Makefile
  projects/clang900-import/usr.sbin/mpsutil/Makefile
  projects/clang900-import/usr.sbin/mpsutil/mps_cmd.c
  projects/clang900-import/usr.sbin/mpsutil/mpsutil.h
  projects/clang900-import/usr.sbin/pwd_mkdb/Makefile
  projects/clang900-import/usr.sbin/services_mkdb/Makefile
  projects/clang900-import/usr.sbin/traceroute/Makefile
  projects/clang900-import/usr.sbin/traceroute6/Makefile
Directory Properties:
  projects/clang900-import/   (props changed)
  projects/clang900-import/cddl/   (props changed)
  projects/clang900-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang900-import/contrib/compiler-rt/   (props changed)
  projects/clang900-import/contrib/llvm/   (props changed)
  projects/clang900-import/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/clang900-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang900-import/ObsoleteFiles.inc	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/ObsoleteFiles.inc	Mon Sep  9 19:58:46 2019	(r352105)
@@ -198,6 +198,88 @@ OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/lib/libc++fs.a
+# 20190904: Remove boot1.efifat
+OLD_FILES+=boot/boot1.efifat
+# 20190903: pc-sysinstall(8) removed
+OLD_FILES+=usr/share/examples/pc-sysinstall/README
+OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
+OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
+OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
+OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
+OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
+OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
+OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
+OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
+OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
+OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
+OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
+OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
+OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
+OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
+OLD_FILES+=usr/sbin/pc-sysinstall
+OLD_DIRS+=usr/share/examples/pc-sysinstall
+OLD_DIRS+=usr/share/pc-sysinstall/backend
+OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
+OLD_DIRS+=usr/share/pc-sysinstall/backend-query
+OLD_DIRS+=usr/share/pc-sysinstall/conf/license
+OLD_DIRS+=usr/share/pc-sysinstall/conf
+OLD_DIRS+=usr/share/pc-sysinstall/doc
+OLD_DIRS+=usr/share/pc-sysinstall
 # 20190825: zlib 1.0.4 removed from kernel
 OLD_FILES+=usr/include/sys/zlib.h
 OLD_FILES+=usr/include/sys/zutil.h

Modified: projects/clang900-import/bin/dd/args.c
==============================================================================
--- projects/clang900-import/bin/dd/args.c	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/bin/dd/args.c	Mon Sep  9 19:58:46 2019	(r352105)
@@ -320,6 +320,7 @@ static const struct conv {
 	{ "ascii",	C_ASCII,	C_EBCDIC,	e2a_POSIX },
 	{ "block",	C_BLOCK,	C_UNBLOCK,	NULL },
 	{ "ebcdic",	C_EBCDIC,	C_ASCII,	a2e_POSIX },
+	{ "fsync",	C_FSYNC,	0,		NULL },
 	{ "ibm",	C_EBCDIC,	C_ASCII,	a2ibm_POSIX },
 	{ "lcase",	C_LCASE,	C_UCASE,	NULL },
 	{ "noerror",	C_NOERROR,	0,		NULL },

Modified: projects/clang900-import/bin/dd/dd.1
==============================================================================
--- projects/clang900-import/bin/dd/dd.1	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/bin/dd/dd.1	Mon Sep  9 19:58:46 2019	(r352105)
@@ -252,6 +252,10 @@ are maps used in historic
 and
 .No pre- Ns Bx 4.3 reno
 systems.
+.It Cm fsync
+Perform an
+.Xr fsync 2
+on the output file before closing it.
 .It Cm lcase
 Transform uppercase characters into lowercase characters.
 .It Cm pareven , parnone , parodd , parset

Modified: projects/clang900-import/bin/dd/dd.c
==============================================================================
--- projects/clang900-import/bin/dd/dd.c	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/bin/dd/dd.c	Mon Sep  9 19:58:46 2019	(r352105)
@@ -164,6 +164,8 @@ setup(void)
 		errx(1, "files is not supported for non-tape devices");
 
 	cap_rights_set(&rights, CAP_FTRUNCATE, CAP_IOCTL, CAP_WRITE);
+	if (ddflags & C_FSYNC)
+		cap_rights_set(&rights, CAP_FSYNC);
 	if (out.name == NULL) {
 		/* No way to check for read access here. */
 		out.fd = STDOUT_FILENO;
@@ -504,6 +506,11 @@ dd_close(void)
 	if (out.seek_offset > 0 && (out.flags & ISTRUNC)) {
 		if (ftruncate(out.fd, out.seek_offset) == -1)
 			err(1, "truncating %s", out.name);
+	}
+
+	if (ddflags & C_FSYNC) {
+		if (fsync(out.fd) == -1)
+			err(1, "fsyncing %s", out.name);
 	}
 }
 

Modified: projects/clang900-import/bin/dd/dd.h
==============================================================================
--- projects/clang900-import/bin/dd/dd.h	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/bin/dd/dd.h	Mon Sep  9 19:58:46 2019	(r352105)
@@ -101,6 +101,7 @@ typedef struct {
 #define	C_NOXFER	0x10000000
 #define	C_NOINFO	0x20000000
 #define	C_PROGRESS	0x40000000
+#define	C_FSYNC		0x80000000
 
 #define	C_PARITY	(C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET)
 

Modified: projects/clang900-import/bin/uuidgen/Makefile
==============================================================================
--- projects/clang900-import/bin/uuidgen/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/bin/uuidgen/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=runtime
 PROG=	uuidgen
 
 .include <bsd.prog.mk>

Modified: projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Mon Sep  9 19:58:46 2019	(r352105)
@@ -3278,11 +3278,18 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const 
 		}
 	} else {
 		/*
-		 * if the fs does not exist, look for it based on the
-		 * fromsnap GUID
+		 * If the fs does not exist, look for it based on the
+		 * fromsnap GUID.
 		 */
-		(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
-		    "cannot receive incremental stream"));
+		if (resuming) {
+			(void) snprintf(errbuf, sizeof (errbuf),
+			    dgettext(TEXT_DOMAIN,
+			    "cannot receive resume stream"));
+		} else {
+			(void) snprintf(errbuf, sizeof (errbuf),
+			    dgettext(TEXT_DOMAIN,
+			    "cannot receive incremental stream"));
+		}
 
 		(void) strcpy(zc.zc_name, zc.zc_value);
 		*strchr(zc.zc_name, '@') = '\0';

Modified: projects/clang900-import/cddl/lib/libavl/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libavl/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libavl/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl
 
+PACKAGE=	runtime
 LIB=	avl
 SRCS=	avl.c
 WARNS?=	3

Modified: projects/clang900-import/cddl/lib/libnvpair/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libnvpair/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libnvpair/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -5,6 +5,7 @@
 
 LIB=	nvpair
 
+PACKAGE=	runtime
 INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \

Modified: projects/clang900-import/cddl/lib/libumem/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libumem/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libumem/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
+PACKAGE=	runtime
 LIB=	umem
 SRCS=	umem.c
 WARNS?=	3

Modified: projects/clang900-import/cddl/lib/libuutil/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libuutil/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libuutil/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -3,6 +3,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl
 
+PACKAGE=	runtime
 LIB=	uutil
 SRCS=	avl.c \
 	uu_alloc.c \

Modified: projects/clang900-import/cddl/lib/libzfs/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libzfs/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libzfs/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -6,6 +6,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils/common
 
+PACKAGE=	runtime
 LIB=	zfs
 LIBADD=	md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core
 SRCS=	deviceid.c \

Modified: projects/clang900-import/cddl/lib/libzfs_core/Makefile
==============================================================================
--- projects/clang900-import/cddl/lib/libzfs_core/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/lib/libzfs_core/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -8,6 +8,7 @@
 
 LIB=	zfs_core
 LIBADD=	nvpair
+PACKAGE=	runtime
 
 INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \

Modified: projects/clang900-import/cddl/sbin/zfs/Makefile
==============================================================================
--- projects/clang900-import/cddl/sbin/zfs/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/sbin/zfs/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,6 +2,7 @@
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs
 
+PACKAGE=	runtime
 PROG=	zfs
 MAN=	zfs.8 zfs-program.8
 SRCS=	zfs_main.c zfs_iter.c

Modified: projects/clang900-import/cddl/sbin/zpool/Makefile
==============================================================================
--- projects/clang900-import/cddl/sbin/zpool/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/cddl/sbin/zpool/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,6 +4,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
 
+PACKAGE=	runtime
 PROG=	zpool
 MAN=	zpool.8 zpool-features.7
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c

Modified: projects/clang900-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
==============================================================================
--- projects/clang900-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h	Mon Sep  9 19:58:46 2019	(r352105)
@@ -114,15 +114,21 @@ namespace __sanitizer {
     long key;
   };
 
+#if !defined(__i386__)
+  typedef long long __sanitizer_time_t;
+#else
+  typedef long __sanitizer_time_t;
+#endif
+
   struct __sanitizer_shmid_ds {
     __sanitizer_ipc_perm shm_perm;
     unsigned long shm_segsz;
     unsigned int shm_lpid;
     unsigned int shm_cpid;
     int shm_nattch;
-    unsigned long shm_atime;
-    unsigned long shm_dtime;
-    unsigned long shm_ctime;
+    __sanitizer_time_t shm_atime;
+    __sanitizer_time_t shm_dtime;
+    __sanitizer_time_t shm_ctime;
   };
 
   extern unsigned struct_msqid_ds_sz;
@@ -153,12 +159,12 @@ namespace __sanitizer {
     char *pw_passwd;
     int pw_uid;
     int pw_gid;
-    long pw_change;
+    __sanitizer_time_t pw_change;
     char *pw_class;
     char *pw_gecos;
     char *pw_dir;
     char *pw_shell;
-    long pw_expire;
+    __sanitizer_time_t pw_expire;
     int pw_fields;
   };
 
@@ -168,12 +174,6 @@ namespace __sanitizer {
     int gr_gid;
     char **gr_mem;
   };
-
-#if defined(__LP64___)
-  typedef long long __sanitizer_time_t;
-#else
-  typedef long __sanitizer_time_t;
-#endif
 
   typedef long __sanitizer_suseconds_t;
 

Modified: projects/clang900-import/contrib/llvm/lib/CodeGen/IfConversion.cpp
==============================================================================
--- projects/clang900-import/contrib/llvm/lib/CodeGen/IfConversion.cpp	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/contrib/llvm/lib/CodeGen/IfConversion.cpp	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1758,9 +1758,15 @@ bool IfConverter::IfConvertDiamondCommon(
   if (!BBI1->IsBrAnalyzable)
     verifySameBranchInstructions(&MBB1, &MBB2);
 #endif
-  BBI1->NonPredSize -= TII->removeBranch(*BBI1->BB);
-  // Remove duplicated instructions.
+  // Remove duplicated instructions from the tail of MBB1: any branch
+  // instructions, and the common instructions counted by NumDups2.
   DI1 = MBB1.end();
+  while (DI1 != MBB1.begin()) {
+    MachineBasicBlock::iterator Prev = std::prev(DI1);
+    if (!Prev->isBranch() && !Prev->isDebugInstr())
+      break;
+    DI1 = Prev;
+  }
   for (unsigned i = 0; i != NumDups2; ) {
     // NumDups2 only counted non-dbg_value instructions, so this won't
     // run off the head of the list.

Modified: projects/clang900-import/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/clang900-import/etc/mtree/BSD.tests.dist	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/etc/mtree/BSD.tests.dist	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1018,6 +1018,8 @@
         ..
         opensm
         ..
+        patch
+        ..
         pr
         ..
         printf

Modified: projects/clang900-import/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/clang900-import/etc/mtree/BSD.usr.dist	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/etc/mtree/BSD.usr.dist	Mon Sep  9 19:58:46 2019	(r352105)
@@ -309,8 +309,6 @@
             ..
             netgraph
             ..
-            pc-sysinstall
-            ..
             perfmon
             ..
             pf
@@ -1172,20 +1170,6 @@
                 ..
                 man3
                 ..
-            ..
-        ..
-        pc-sysinstall
-            backend
-            ..
-            backend-partmanager
-            ..
-            backend-query
-            ..
-            conf
-                license
-                ..
-            ..
-            doc
             ..
         ..
         security

Modified: projects/clang900-import/include/Makefile
==============================================================================
--- projects/clang900-import/include/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/include/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -175,11 +175,11 @@ copies: .PHONY .META
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/bktr
 	cd ${SRCTOP}/sys/dev/evdev; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input.h \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 input.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/evdev; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/evdev; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 uinput.h \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 uinput.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/evdev
 	cd ${SRCTOP}/sys/dev/hyperv/include; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 hyperv.h \
@@ -191,7 +191,7 @@ copies: .PHONY .META
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/pci
 	cd ${SRCTOP}/sys/dev/veriexec; \
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 veriexec_ioctl.h \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 veriexec_ioctl.h \
 	    ${SDESTDIR}${INCLUDEDIR}/dev/veriexec
 	cd ${SRCTOP}/sys/fs/cd9660/; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \

Modified: projects/clang900-import/include/stdio.h
==============================================================================
--- projects/clang900-import/include/stdio.h	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/include/stdio.h	Mon Sep  9 19:58:46 2019	(r352105)
@@ -294,14 +294,16 @@ int	 vprintf(const char * __restrict, __va_list);
 int	 vsprintf(char * __restrict, const char * __restrict,
 	    __va_list);
 
-#if __ISO_C_VISIBLE >= 1999
+#if __ISO_C_VISIBLE >= 1999 || __POSIX_VISIBLE >= 199506
 int	 snprintf(char * __restrict, size_t, const char * __restrict,
 	    ...) __printflike(3, 4);
+int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
+	    __va_list) __printflike(3, 0);
+#endif
+#if __ISO_C_VISIBLE >= 1999
 int	 vfscanf(FILE * __restrict, const char * __restrict, __va_list)
 	    __scanflike(2, 0);
 int	 vscanf(const char * __restrict, __va_list) __scanflike(1, 0);
-int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
-	    __va_list) __printflike(3, 0);
 int	 vsscanf(const char * __restrict, const char * __restrict, __va_list)
 	    __scanflike(2, 0);
 #endif

Modified: projects/clang900-import/lib/csu/riscv/crt.h
==============================================================================
--- projects/clang900-import/lib/csu/riscv/crt.h	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/csu/riscv/crt.h	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,2 +1,9 @@
 /* $FreeBSD$ */
-/* Empty so we can include this unconditionally */
+
+#ifndef _CRT_H_
+#define _CRT_H_
+
+#define	HAVE_CTORS
+#define	INIT_CALL_SEQ(func)	"call " __STRING(func)
+
+#endif

Modified: projects/clang900-import/lib/geom/part/gpart.8
==============================================================================
--- projects/clang900-import/lib/geom/part/gpart.8	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/geom/part/gpart.8	Mon Sep  9 19:58:46 2019	(r352105)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 17, 2018
+.Dd September 3, 2019
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -1207,7 +1207,13 @@ variables can be used to control the behavior of the
 GEOM class.
 The default value is shown next to each variable.
 .Bl -tag -width indent
-.It Va kern.geom.part.auto_resize: No 1
+.It Va kern.geom.part.allow_nesting : No 0
+By default, some schemes (currently BSD, BSD64 and VTOC8) do not permit
+further nested partitioning.
+This variable overrides this restriction and allows arbitrary nesting (except
+within partitions created at offset 0).
+Some schemes have their own separate checks, for which see below.
+.It Va kern.geom.part.auto_resize : No 1
 This variable controls automatic resize behavior of
 .Nm
 GEOM class.
@@ -1228,6 +1234,9 @@ disk metadata.
 If some inconsistency is detected, the partition table will be
 rejected with a diagnostic message:
 .Sy "GEOM_PART: Integrity check failed (provider, scheme)" .
+.It Va kern.geom.part.gpt.allow_nesting : No 0
+By default the GPT scheme is allowed only at the outermost nesting level.
+This variable allows this restriction to be removed.
 .It Va kern.geom.part.ldm.debug : No 0
 Debug level of the Logical Disk Manager (LDM) module.
 This can be set to a number between 0 and 2 inclusive.

Modified: projects/clang900-import/lib/lib80211/Makefile
==============================================================================
--- projects/clang900-import/lib/lib80211/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/lib80211/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
 CONFS=	regdomain.xml
-PACKAGE=lib${LIB}
 LIB=	80211
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1

Modified: projects/clang900-import/lib/lib80211/regdomain.xml
==============================================================================
--- projects/clang900-import/lib/lib80211/regdomain.xml	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/lib80211/regdomain.xml	Mon Sep  9 19:58:46 2019	(r352105)
@@ -111,6 +111,44 @@
       <flags>IEEE80211_CHAN_HT40</flags>
     </band>
   </netband>
+  <netband mode="11ac">
+    <band>
+      <freqband ref="AC1_5180_5240_20"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_VHT20</flags>
+    </band>
+    <band>
+      <freqband ref="AC1_5180_5240_40"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_VHT40</flags>
+    </band>
+    <band>
+      <freqband ref="AC1_5180_5240_80"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_VHT80</flags>
+    </band>
+    <band>
+      <freqband ref="AC1_5745_5805_20"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT20</flags>
+      <flags>IEEE80211_CHAN_VHT20</flags>
+    </band>
+    <band>
+      <freqband ref="AC1_5745_5805_40"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_VHT40</flags>
+    </band>
+    <band>
+      <freqband ref="AC1_5745_5805_80"/>
+      <maxpower>17</maxpower>
+      <flags>IEEE80211_CHAN_HT40</flags>
+      <flags>IEEE80211_CHAN_VHT80</flags>
+    </band>
+  </netband>
 </rd>
 
 <!-- FCC3 is FCC w/ DFS on Upper-UNI -->
@@ -1735,6 +1773,21 @@
   <chanwidth>20</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
+<freqband id="AC1_5180_5240_20">
+  <freqstart>5180</freqstart> <freqend>5240</freqend>
+  <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="AC1_5180_5240_40">
+  <freqstart>5180</freqstart> <freqend>5240</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="AC1_5180_5240_80">
+  <freqstart>5180</freqstart> <freqend>5240</freqend>
+  <chanwidth>80</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
 <freqband id="H4_5180_5240">
   <freqstart>5180</freqstart> <freqend>5240</freqend>
   <chanwidth>40</chanwidth> <chansep>20</chansep>
@@ -1823,6 +1876,21 @@
 <freqband id="F1_5745_5805">
   <freqstart>5745</freqstart> <freqend>5805</freqend>
   <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="AC1_5745_5805_20">
+  <freqstart>5745</freqstart> <freqend>5805</freqend>
+  <chanwidth>20</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="AC1_5745_5805_40">
+  <freqstart>5745</freqstart> <freqend>5805</freqend>
+  <chanwidth>40</chanwidth> <chansep>20</chansep>
+  <flags>IEEE80211_CHAN_A</flags>
+</freqband>
+<freqband id="AC1_5745_5805_80">
+  <freqstart>5745</freqstart> <freqend>5805</freqend>
+  <chanwidth>80</chanwidth> <chansep>20</chansep>
   <flags>IEEE80211_CHAN_A</flags>
 </freqband>
 <freqband id="H4_5745_5805">

Modified: projects/clang900-import/lib/libalias/libalias/Makefile
==============================================================================
--- projects/clang900-import/lib/libalias/libalias/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libalias/libalias/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -3,7 +3,6 @@
 .PATH: ${SRCTOP}/sys/netinet/libalias
 
 CONFS=	libalias.conf
-PACKAGE=lib${LIB}
 LIB=	alias
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 7

Modified: projects/clang900-import/lib/libauditd/Makefile
==============================================================================
--- projects/clang900-import/lib/libauditd/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libauditd/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
 OPENBSMDIR=		${SRCTOP}/contrib/openbsm
 _LIBAUDITDDIR=		${OPENBSMDIR}/libauditd
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm

Modified: projects/clang900-import/lib/libbe/Makefile
==============================================================================
--- projects/clang900-import/lib/libbe/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libbe/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,6 @@ SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
-PACKAGE=	lib${LIB}
 LIB=		be
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0

Modified: projects/clang900-import/lib/libbluetooth/Makefile
==============================================================================
--- projects/clang900-import/lib/libbluetooth/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libbluetooth/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,7 +1,7 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
+PACKAGE=	bluetooth
 CONFS=		hosts protocols
 CONFSDIR=	/etc/bluetooth
 CONFSMODE_protocols=	444

Modified: projects/clang900-import/lib/libc/compat-43/creat.2
==============================================================================
--- projects/clang900-import/lib/libc/compat-43/creat.2	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libc/compat-43/creat.2	Mon Sep  9 19:58:46 2019	(r352105)
@@ -28,7 +28,7 @@
 .\"     @(#)creat.2	8.1 (Berkeley) 6/2/93
 .\" $FreeBSD$
 .\"
-.Dd June 2, 1993
+.Dd September 4, 2019
 .Dt CREAT 2
 .Os
 .Sh NAME
@@ -59,4 +59,4 @@ open(path, O_CREAT | O_TRUNC | O_WRONLY, mode);
 The
 .Fn creat
 function appeared in
-.At v6 .
+.At v1 .

Modified: projects/clang900-import/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/clang900-import/lib/libc/gen/Makefile.inc	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libc/gen/Makefile.inc	Mon Sep  9 19:58:46 2019	(r352105)
@@ -6,6 +6,7 @@
 
 CONFS+=	group master.passwd shells
 CONFSMODE_master.passwd=	600
+CONFSPACKAGE=   runtime
 
 SRCS+=	__getosreldate.c \
 	__pthread_mutex_init_calloc_cb_stub.c \

Modified: projects/clang900-import/lib/libc/nameser/ns_name.c
==============================================================================
--- projects/clang900-import/lib/libc/nameser/ns_name.c	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libc/nameser/ns_name.c	Mon Sep  9 19:58:46 2019	(r352105)
@@ -684,7 +684,7 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom)
 {
 	const u_char *cp;
 	u_int n;
-	int l;
+	int l = 0;
 
 	cp = *ptrptr;
 	while (cp < eom && (n = *cp++) != 0) {
@@ -694,7 +694,7 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom)
 			cp += n;
 			continue;
 		case NS_TYPE_ELT: /*%< EDNS0 extended label */
-			if ((l = labellen(cp - 1)) < 0) {
+			if (cp < eom && (l = labellen(cp - 1)) < 0) {
 				errno = EMSGSIZE; /*%< XXX */
 				return (-1);
 			}

Modified: projects/clang900-import/lib/libc/sys/cpuset.2
==============================================================================
--- projects/clang900-import/lib/libc/sys/cpuset.2	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libc/sys/cpuset.2	Mon Sep  9 19:58:46 2019	(r352105)
@@ -96,7 +96,7 @@ is interpreted and is of type
 The
 .Fa which
 argument may have the following values:
-.Bl -column CPU_WHICH_CPUSET -offset indent
+.Bl -column CPU_WHICH_INTRHANDLER -offset indent
 .It Dv CPU_WHICH_TID Ta "id is lwpid_t (thread id)"
 .It Dv CPU_WHICH_PID Ta "id is pid_t (process id)"
 .It Dv CPU_WHICH_JAIL Ta "id is jid (jail id)"

Modified: projects/clang900-import/lib/libc/sys/procctl.2
==============================================================================
--- projects/clang900-import/lib/libc/sys/procctl.2	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libc/sys/procctl.2	Mon Sep  9 19:58:46 2019	(r352105)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 9, 2019
+.Dd August 31, 2019
 .Dt PROCCTL 2
 .Os
 .Sh NAME
@@ -503,6 +503,67 @@ must point to a memory location that can hold a value 
 .Vt int .
 If signal delivery has not been requested, it will contain zero
 on return.
+.It Dv PROC_STACKGAP_CTL
+Controls the stack gaps in the specified process.
+A stack gap is the part of the growth area for a
+.Dv MAP_STACK
+mapped region that is reserved and never filled by memory.
+Instead, the process is guaranteed to receive a
+.Dv SIGSEGV
+signal on accessing pages in the gap.
+Gaps protect against stack overflow corrupting memory adjacent
+to the stack.
+.Pp
+The
+.Fa data
+argument must point to an integer variable containing flags.
+The following flags are allowed:
+.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC
+.It Dv PROC_STACKGAP_ENABLE
+This flag is only accepted for consistency with
+.Dv PROC_STACKGAP_STATUS .
+If stack gaps are enabled, the flag is ignored.
+If disabled, the flag causes an
+.Ev EINVAL
+error to be returned.
+After gaps are disabled in a process, they can only be re-enabled when an
+.Xr execve 2
+is performed.
+.It Dv PROC_STACKGAP_DISABLE
+Disable stack gaps for the process.
+For existing stacks, the gap is no longer a reserved part of the growth
+area and can be filled by memory on access.
+.It Dv PROC_STACKGAP_ENABLE_EXEC
+Enable stack gaps for programs started after an
+.Xr execve 2
+by the specified process.
+.It Dv PROC_STACKGAP_DISABLE_EXEC
+Inherit disabled stack gaps state after
+.Xr execve 2 .
+In other words, if the currently executing program has stack gaps disabled,
+they are kept disabled on exec.
+If gaps were enabled, they are kept enabled after exec.
+.El
+.Pp
+The stack gap state is inherited from the parent on
+.Xr fork 2 .
+.It Dv PROC_STACKGAP_STATUS
+Returns the current stack gap state for the specified process.
+.Fa data
+must point to an integer variable, which is used to return a bitmask
+consisting of the following flags:
+.Bl -tag -width PROC_STACKGAP_DISABLE_EXEC
+.It Dv PROC_STACKGAP_ENABLE
+Stack gaps are enabled.
+.It Dv PROC_STACKGAP_DISABLE
+Stack gaps are disabled.
+.It Dv PROC_STACKGAP_ENABLE_EXEC
+Stack gaps are enabled in the process after
+.Xr execve 2 .
+.It Dv PROC_STACKGAP_DISABLE_EXEC
+Stack gaps are disabled in the process after
+.Xr execve 2 .
+.El
 .El
 .Sh NOTES
 Disabling tracing on a process should not be considered a security

Modified: projects/clang900-import/lib/libcalendar/Makefile
==============================================================================
--- projects/clang900-import/lib/libcalendar/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcalendar/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
 LIB=	calendar
 
 SRCS=	calendar.c easter.c

Modified: projects/clang900-import/lib/libcam/Makefile
==============================================================================
--- projects/clang900-import/lib/libcam/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcam/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
+PACKAGE=	runtime
+
 LIB=		cam
 SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \

Modified: projects/clang900-import/lib/libcapsicum/Makefile
==============================================================================
--- projects/clang900-import/lib/libcapsicum/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcapsicum/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
-
 INCS=	capsicum_helpers.h
 
 MAN+=	capsicum_helpers.3

Modified: projects/clang900-import/lib/libcasper/libcasper/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/libcasper/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/libcasper/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
+
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
-
-PACKAGE=casper
 
 .if ${MK_CASPER} != "no"
 SHLIB=	casper

Modified: projects/clang900-import/lib/libcasper/services/cap_dns/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_dns/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_dns/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	2
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcasper/services/cap_fileargs/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_fileargs/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_fileargs/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	1
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcasper/services/cap_grp/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_grp/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_grp/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	1
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcasper/services/cap_pwd/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_pwd/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_pwd/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	1
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcasper/services/cap_sysctl/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_sysctl/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_sysctl/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	2
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcasper/services/cap_syslog/Makefile
==============================================================================
--- projects/clang900-import/lib/libcasper/services/cap_syslog/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcasper/services/cap_syslog/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib/casper
 
 .include <src.opts.mk>
 
-PACKAGE=libcasper
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	1
 INCSDIR?=	${INCLUDEDIR}/casper

Modified: projects/clang900-import/lib/libcom_err/Makefile
==============================================================================
--- projects/clang900-import/lib/libcom_err/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcom_err/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h

Modified: projects/clang900-import/lib/libcrypt/Makefile
==============================================================================
--- projects/clang900-import/lib/libcrypt/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libcrypt/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,10 +2,11 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
+
+PACKAGE=	runtime
 
 SHLIB_MAJOR=	5
 LIB=		crypt

Modified: projects/clang900-import/lib/libdevctl/Makefile
==============================================================================
--- projects/clang900-import/lib/libdevctl/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libdevctl/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devctl
 SRCS=	devctl.c
 INCS=	devctl.h

Modified: projects/clang900-import/lib/libdevinfo/Makefile
==============================================================================
--- projects/clang900-import/lib/libdevinfo/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libdevinfo/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devinfo
 SRCS=	devinfo.c
 INCS=	devinfo.h

Modified: projects/clang900-import/lib/libdevstat/Makefile
==============================================================================
--- projects/clang900-import/lib/libdevstat/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libdevstat/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.

Modified: projects/clang900-import/lib/libelf/Makefile
==============================================================================
--- projects/clang900-import/lib/libelf/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libelf/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
@@ -10,6 +9,7 @@ SRCDIR=	${ELFTCDIR}/libelf
 
 .PATH:	${SRCDIR}
 
+PACKAGE=	runtime
 LIB=	elf
 
 SRCS=	elf.c							\

Modified: projects/clang900-import/lib/libfetch/Makefile
==============================================================================
--- projects/clang900-import/lib/libfetch/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libfetch/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=		fetch
 CFLAGS+=	-I.
 SRCS=		fetch.c common.c ftp.c http.c file.c \

Modified: projects/clang900-import/lib/libgeom/Makefile
==============================================================================
--- projects/clang900-import/lib/libgeom/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libgeom/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
+
 LIB=	geom
 SHLIBDIR?= /lib
 SRCS+=	geom_getxml.c

Modified: projects/clang900-import/lib/libgpio/Makefile
==============================================================================
--- projects/clang900-import/lib/libgpio/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libgpio/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	gpio
 SHLIB_MAJOR= 0
 

Modified: projects/clang900-import/lib/libgssapi/Makefile
==============================================================================
--- projects/clang900-import/lib/libgssapi/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libgssapi/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=		gssapi
 SHLIB_MAJOR=	10
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def

Modified: projects/clang900-import/lib/libipsec/Makefile
==============================================================================
--- projects/clang900-import/lib/libipsec/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libipsec/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -27,12 +27,12 @@
 #
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
 LIB=	ipsec
+PACKAGE=	runtime
 SHLIB_MAJOR= 4
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC

Modified: projects/clang900-import/lib/libjail/Makefile
==============================================================================
--- projects/clang900-import/lib/libjail/Makefile	Mon Sep  9 19:56:20 2019	(r352104)
+++ projects/clang900-import/lib/libjail/Makefile	Mon Sep  9 19:58:46 2019	(r352105)
@@ -1,13 +1,11 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	jail
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1

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

More information about the svn-src-projects mailing list