svn commit: r325842 - in projects/bsd_rdma_4_9: . bin/freebsd-version contrib/zstd etc lib/clang/libclang lib/clang/libllvm lib/libc/string lib/libc/sys lib/libcasper/libcasper lib/libcasper/servic...

Hans Petter Selasky hselasky at FreeBSD.org
Wed Nov 15 11:28:15 UTC 2017 

Author: hselasky
Date: Wed Nov 15 11:28:11 2017
New Revision: 325842
URL: https://svnweb.freebsd.org/changeset/base/325842

Log:
  Merge ^/head r325663 through r325841.

Added:
  projects/bsd_rdma_4_9/lib/libcasper/services/cap_syslog/
     - copied from r325841, head/lib/libcasper/services/cap_syslog/
  projects/bsd_rdma_4_9/stand/
     - copied from r325841, head/stand/
     - copied from r325841, head/sys/contrib/zstd/
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/fw_qos.h
     - copied unchanged from r325841, head/sys/dev/mlx4/mlx4_core/fw_qos.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_fw_qos.c
     - copied unchanged from r325841, head/sys/dev/mlx4/mlx4_core/mlx4_fw_qos.c
  projects/bsd_rdma_4_9/sys/dts/
     - copied from r325841, head/sys/dts/
  projects/bsd_rdma_4_9/tools/build/options/WITHOUT_LOADER_GELI
     - copied unchanged from r325841, head/tools/build/options/WITHOUT_LOADER_GELI
  projects/bsd_rdma_4_9/tools/build/options/WITH_LOADER_FIREWIRE
     - copied unchanged from r325841, head/tools/build/options/WITH_LOADER_FIREWIRE
Directory Properties:
  projects/bsd_rdma_4_9/sys/contrib/zstd/   (props changed)
Deleted:
  projects/bsd_rdma_4_9/contrib/zstd/
  projects/bsd_rdma_4_9/share/man/man7/mailaddr.7
  projects/bsd_rdma_4_9/share/misc/eqnchar
  projects/bsd_rdma_4_9/sys/boot/
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_sys_tune.c
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/fortunes
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/fortunes.sp.ok
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/gerrold.limerick
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/limerick
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/limerick.sp.ok
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/murphy
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/murphy-o
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/murphy.sp.ok
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/startrek
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/startrek.sp.ok
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/zippy
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/zippy.sp.ok
Modified:
  projects/bsd_rdma_4_9/MAINTAINERS   (contents, props changed)
  projects/bsd_rdma_4_9/Makefile
  projects/bsd_rdma_4_9/Makefile.inc1
  projects/bsd_rdma_4_9/ObsoleteFiles.inc
  projects/bsd_rdma_4_9/UPDATING
  projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.1
  projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.sh.in
  projects/bsd_rdma_4_9/etc/Makefile
  projects/bsd_rdma_4_9/etc/devd.conf
  projects/bsd_rdma_4_9/lib/clang/libclang/Makefile
  projects/bsd_rdma_4_9/lib/clang/libllvm/Makefile
  projects/bsd_rdma_4_9/lib/libc/string/memcpy.3
  projects/bsd_rdma_4_9/lib/libc/string/strcat.3
  projects/bsd_rdma_4_9/lib/libc/string/strcpy.3
  projects/bsd_rdma_4_9/lib/libc/sys/_umtx_op.2
  projects/bsd_rdma_4_9/lib/libcasper/libcasper/libcasper.h
  projects/bsd_rdma_4_9/lib/libcasper/services/Makefile
  projects/bsd_rdma_4_9/lib/libefivar/Makefile
  projects/bsd_rdma_4_9/lib/libefivar/efivar.c
  projects/bsd_rdma_4_9/lib/libefivar/efivar.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_aarch64.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_amd64.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_amd64.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_arm.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_i386.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_i386.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_minidump_aarch64.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_minidump_amd64.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_minidump_arm.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_minidump_i386.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_minidump_mips.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_mips.h
  projects/bsd_rdma_4_9/lib/libkvm/kvm_private.c
  projects/bsd_rdma_4_9/lib/libkvm/kvm_private.h
  projects/bsd_rdma_4_9/lib/libutil/hexdump.3
  projects/bsd_rdma_4_9/lib/libzstd/Makefile
  projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S
  projects/bsd_rdma_4_9/release/Makefile.mirrors
  projects/bsd_rdma_4_9/release/arm/GUMSTIX.conf
  projects/bsd_rdma_4_9/release/arm64/PINE64.conf
  projects/bsd_rdma_4_9/release/arm64/RPI3.conf
  projects/bsd_rdma_4_9/release/powerpc/generate-hfs.sh
  projects/bsd_rdma_4_9/release/release.sh
  projects/bsd_rdma_4_9/release/tools/vmimage.subr
  projects/bsd_rdma_4_9/sbin/dhclient/Makefile
  projects/bsd_rdma_4_9/sbin/dhclient/dhclient.c
  projects/bsd_rdma_4_9/sbin/dhclient/dhcpd.h
  projects/bsd_rdma_4_9/sbin/dhclient/dispatch.c
  projects/bsd_rdma_4_9/sbin/dhclient/errwarn.c
  projects/bsd_rdma_4_9/sbin/ping/ping.c
  projects/bsd_rdma_4_9/secure/Makefile
  projects/bsd_rdma_4_9/share/examples/bootforth/README
  projects/bsd_rdma_4_9/share/examples/etc/make.conf
  projects/bsd_rdma_4_9/share/man/man4/fdt.4
  projects/bsd_rdma_4_9/share/man/man4/gpioiic.4
  projects/bsd_rdma_4_9/share/man/man4/gpioled.4
  projects/bsd_rdma_4_9/share/man/man4/owc.4
  projects/bsd_rdma_4_9/share/man/man5/forward.5
  projects/bsd_rdma_4_9/share/man/man5/make.conf.5
  projects/bsd_rdma_4_9/share/man/man7/Makefile
  projects/bsd_rdma_4_9/share/man/man7/arch.7
  projects/bsd_rdma_4_9/share/man/man7/hostname.7
  projects/bsd_rdma_4_9/share/man/man8/diskless.8
  projects/bsd_rdma_4_9/share/misc/Makefile
  projects/bsd_rdma_4_9/share/misc/pci_vendors
  projects/bsd_rdma_4_9/share/mk/bsd.crunchgen.mk
  projects/bsd_rdma_4_9/share/mk/bsd.dep.mk
  projects/bsd_rdma_4_9/share/mk/bsd.libnames.mk
  projects/bsd_rdma_4_9/share/mk/src.libnames.mk
  projects/bsd_rdma_4_9/share/mk/src.opts.mk
  projects/bsd_rdma_4_9/share/mk/src.sys.obj.mk
  projects/bsd_rdma_4_9/share/mk/sys.mk
  projects/bsd_rdma_4_9/sys/Makefile
  projects/bsd_rdma_4_9/sys/amd64/amd64/machdep.c
  projects/bsd_rdma_4_9/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
  projects/bsd_rdma_4_9/sys/cam/cam_ccb.h
  projects/bsd_rdma_4_9/sys/cam/nvme/nvme_all.c
  projects/bsd_rdma_4_9/sys/cam/nvme/nvme_all.h
  projects/bsd_rdma_4_9/sys/cam/nvme/nvme_xpt.c
  projects/bsd_rdma_4_9/sys/compat/linux/linux_signal.c
  projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/timer.h
  projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/src/linux_current.c
  projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/src/linux_schedule.c
  projects/bsd_rdma_4_9/sys/conf/dtb.mk
  projects/bsd_rdma_4_9/sys/conf/files
  projects/bsd_rdma_4_9/sys/conf/makeLINT.mk
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/acpica_prep.sh
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/changes.txt
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/common/dmtable.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dttable2.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/debugger/dbexec.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/events/evregion.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/parser/psargs.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utdecode.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/uterror.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utmutex.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/uttrack.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/components/utilities/utxferror.c
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acdebug.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acdisasm.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/aclocal.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acmacros.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acnamesp.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acpixf.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/actbl1.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/actbl2.h
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/include/acutils.h
  projects/bsd_rdma_4_9/sys/contrib/octeon-sdk/cvmx-app-init.h
  projects/bsd_rdma_4_9/sys/contrib/octeon-sdk/cvmx-helper-board.c
  projects/bsd_rdma_4_9/sys/dev/cxgbe/adapter.h
  projects/bsd_rdma_4_9/sys/dev/cxgbe/common/t4_hw.c
  projects/bsd_rdma_4_9/sys/dev/hwpmc/hwpmc_logging.c
  projects/bsd_rdma_4_9/sys/dev/hwpmc/hwpmc_mod.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/cmd.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/cq.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/device.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/driver.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/fw.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/icm.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_alloc.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_catas.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_cmd.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_cq.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_eq.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_fw.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_icm.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_intf.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_main.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_mcg.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_mr.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_pd.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_port.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_profile.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_qp.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_reset.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_resource_tracker.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_sense.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_core/mlx4_srq.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/en.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/en_port.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_cq.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_main.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_port.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_resources.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c
  projects/bsd_rdma_4_9/sys/dev/mlx4/qp.h
  projects/bsd_rdma_4_9/sys/dev/mlx4/stats.h
  projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
  projects/bsd_rdma_4_9/sys/dev/mpr/mpr.c
  projects/bsd_rdma_4_9/sys/dev/mps/mps.c
  projects/bsd_rdma_4_9/sys/dev/nvme/nvme.h
  projects/bsd_rdma_4_9/sys/dev/nvme/nvme_sim.c
  projects/bsd_rdma_4_9/sys/dev/usb/net/if_ure.c
  projects/bsd_rdma_4_9/sys/dev/usb/quirk/usb_quirk.c
  projects/bsd_rdma_4_9/sys/dev/vnic/nicvf_main.c
  projects/bsd_rdma_4_9/sys/dev/vnic/nicvf_queues.c
  projects/bsd_rdma_4_9/sys/dev/vt/vt_core.c
  projects/bsd_rdma_4_9/sys/kern/kern_event.c
  projects/bsd_rdma_4_9/sys/kern/kern_proc.c
  projects/bsd_rdma_4_9/sys/kern/kern_rwlock.c
  projects/bsd_rdma_4_9/sys/kern/kern_shutdown.c
  projects/bsd_rdma_4_9/sys/kern/kern_sig.c
  projects/bsd_rdma_4_9/sys/kern/kern_sysctl.c
  projects/bsd_rdma_4_9/sys/kern/kern_time.c
  projects/bsd_rdma_4_9/sys/kern/p1003_1b.c
  projects/bsd_rdma_4_9/sys/kern/sys_process.c
  projects/bsd_rdma_4_9/sys/mips/beri/beri_machdep.c
  projects/bsd_rdma_4_9/sys/modules/mlx4/Makefile
  projects/bsd_rdma_4_9/sys/modules/nvme/Makefile
  projects/bsd_rdma_4_9/sys/netinet/sctp_input.c
  projects/bsd_rdma_4_9/sys/netinet/tcp_output.c
  projects/bsd_rdma_4_9/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
  projects/bsd_rdma_4_9/sys/sys/aio.h
  projects/bsd_rdma_4_9/sys/sys/proc.h
  projects/bsd_rdma_4_9/sys/sys/shm.h
  projects/bsd_rdma_4_9/sys/sys/umtx.h
  projects/bsd_rdma_4_9/sys/tools/fdt/make_dtb.sh
  projects/bsd_rdma_4_9/sys/x86/include/specialreg.h
  projects/bsd_rdma_4_9/targets/pseudo/userland/Makefile.depend
  projects/bsd_rdma_4_9/targets/pseudo/userland/lib/Makefile.depend
  projects/bsd_rdma_4_9/targets/pseudo/userland/misc/Makefile.depend
  projects/bsd_rdma_4_9/targets/pseudo/userland/share/Makefile.depend
  projects/bsd_rdma_4_9/tests/sys/aio/aio_kqueue_test.c
  projects/bsd_rdma_4_9/tests/sys/aio/lio_kqueue_test.c
  projects/bsd_rdma_4_9/tools/boot/universe.sh
  projects/bsd_rdma_4_9/tools/tools/bootparttest/Makefile
  projects/bsd_rdma_4_9/tools/tools/sysdoc/tunables.mdoc
  projects/bsd_rdma_4_9/tools/tools/zfsboottest/Makefile
  projects/bsd_rdma_4_9/usr.bin/find/function.c
  projects/bsd_rdma_4_9/usr.bin/fortune/datfiles/Makefile
  projects/bsd_rdma_4_9/usr.bin/mail/mail.1
  projects/bsd_rdma_4_9/usr.bin/rctl/rctl.c
  projects/bsd_rdma_4_9/usr.bin/vmstat/vmstat.c
  projects/bsd_rdma_4_9/usr.bin/zstd/Makefile
  projects/bsd_rdma_4_9/usr.sbin/bhyve/uart_emul.c
  projects/bsd_rdma_4_9/usr.sbin/bhyveload/Makefile
  projects/bsd_rdma_4_9/usr.sbin/efivar/Makefile
  projects/bsd_rdma_4_9/usr.sbin/efivar/efivar.c
  projects/bsd_rdma_4_9/usr.sbin/jail/command.c
  projects/bsd_rdma_4_9/usr.sbin/jail/jail.8
  projects/bsd_rdma_4_9/usr.sbin/jail/jail.c
  projects/bsd_rdma_4_9/usr.sbin/jexec/jexec.c
Directory Properties:
  projects/bsd_rdma_4_9/   (props changed)
  projects/bsd_rdma_4_9/sys/contrib/dev/acpica/   (props changed)
  projects/bsd_rdma_4_9/sys/contrib/octeon-sdk/   (props changed)

Modified: projects/bsd_rdma_4_9/MAINTAINERS
==============================================================================
--- projects/bsd_rdma_4_9/MAINTAINERS	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/MAINTAINERS	Wed Nov 15 11:28:11 2017	(r325842)
@@ -86,7 +86,7 @@ sh(1)		jilles		Pre-commit review requested. This also 
 				compiled in as builtins.
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
-sys/boot/forth		dteske	Pre-commit review requested.
+stand/forth		dteske	Pre-commit review requested.
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.

Modified: projects/bsd_rdma_4_9/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/Makefile	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/Makefile	Wed Nov 15 11:28:11 2017	(r325842)
@@ -130,7 +130,7 @@ TGTS=	all all-man buildenv buildenvvars buildkernel bu
 	installkernel.debug packagekernel packageworld \
 	reinstallkernel reinstallkernel.debug \
 	installworld kernel-toolchain libraries lint maninstall \
-	obj objlink rerelease showconfig tags toolchain update \
+	obj objlink showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _build-metadata _cross-tools _includes _libraries \
 	build32 distribute32 install32 buildsoft distributesoft installsoft \
@@ -167,6 +167,18 @@ META_TGT_WHITELIST+= \
 	tinderbox toolchain \
 	toolchains universe world worlds xdev xdev-build
 
+# Likewise for AUTO_OBJ.  Many targets do not need object directories created
+# for each visited directory.  Only when things are being built are they
+# needed.  Having AUTO_OBJ disabled in a build target is fine as it should
+# fallback to running 'make obj' as needed.  If a target is not in this list
+# then it is ran with MK_AUTO_OBJ=no in environment.
+# 'showconfig' is in the list to avoid forcing MK_AUTO_OBJ=no for it.
+AUTO_OBJ_TGT_WHITELIST+= \
+	_* all all-man build* depend everything *toolchain* includes \
+	libraries obj objlink showconfig tags xdev xdev-build native-xtools \
+	stage* create-packages* real-packages sign-packages package-pkg \
+	tinderbox universe* kernel kernels world worlds bmake
+
 .ORDER: buildworld installworld
 .ORDER: buildworld distrib-dirs
 .ORDER: buildworld distribution
@@ -235,8 +247,11 @@ SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
 _MAKE=	PATH=${PATH} MAKE_CMD="${MAKE}" ${SUB_MAKE} -f Makefile.inc1 \
 	TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
 
+.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
 # Only allow meta mode for the whitelisted targets.  See META_TGT_WHITELIST
-# above.
+# above.  If overridden as a make argument then don't bother trying to
+# disable it.
+.if empty(.MAKEOVERRIDES:MMK_META_MODE)
 .for _tgt in ${META_TGT_WHITELIST}
 .if make(${_tgt})
 _CAN_USE_META_MODE?= yes
@@ -244,18 +259,38 @@ _CAN_USE_META_MODE?= yes
 .endfor
 .if !defined(_CAN_USE_META_MODE)
 _MAKE+=	MK_META_MODE=no
+MK_META_MODE= no
 .if defined(.PARSEDIR)
 .unexport META_MODE
 .endif
-.elif defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
+.endif	# !defined(_CAN_USE_META_MODE)
+.endif	# empty(.MAKEOVERRIDES:MMK_META_MODE)
+
+.if ${MK_META_MODE} == "yes"
 .if !exists(/dev/filemon) && !defined(NO_FILEMON) && !make(showconfig)
 # Require filemon be loaded to provide a working incremental build
 .error ${.newline}ERROR: The filemon module (/dev/filemon) is not loaded. \
     ${.newline}ERROR: WITH_META_MODE is enabled but requires filemon for an incremental build. \
     ${.newline}ERROR: 'kldload filemon' or pass -DNO_FILEMON to suppress this error.
 .endif	# !exists(/dev/filemon) && !defined(NO_FILEMON)
-.endif	# !defined(_CAN_USE_META_MODE)
+.endif	# ${MK_META_MODE} == yes
+.endif	# defined(MK_META_MODE) && ${MK_META_MODE} == yes
 
+# Only allow AUTO_OBJ for the whitelisted targets.  See AUTO_OBJ_TGT_WHITELIST
+# above.  MK_AUTO_OBJ not checked here for "yes" as it may not yet be enabled
+# since it is opportunistic.
+.if empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
+.for _tgt in ${AUTO_OBJ_TGT_WHITELIST}
+.if make(${_tgt})
+_CAN_USE_AUTO_OBJ?= yes
+.endif
+.endfor
+.if !defined(_CAN_USE_AUTO_OBJ)
+_MAKE+=	MK_AUTO_OBJ=no
+MK_AUTO_OBJ= no
+.endif
+.endif	# empty(.MAKEOVERRIDES:MMK_AUTO_OBJ)
+
 # Guess target architecture from target type, and vice versa, based on
 # historic FreeBSD practice of tending to have TARGET == TARGET_ARCH
 # expanding to TARGET == TARGET_CPUARCH in recent times, with known
@@ -290,6 +325,15 @@ ${XTGTS}: _assert_target
 _TARGET?=	${MACHINE}
 _TARGET_ARCH?=	${MACHINE_ARCH}
 
+.if make(native-xtools*)
+NXB_TARGET:=		${_TARGET}
+NXB_TARGET_ARCH:=	${_TARGET_ARCH}
+_TARGET=		${MACHINE}
+_TARGET_ARCH=		${MACHINE_ARCH}
+_MAKE+=			NXB_TARGET=${NXB_TARGET} \
+			NXB_TARGET_ARCH=${NXB_TARGET_ARCH}
+.endif
+
 .if make(print-dir)
 .SILENT:
 .endif
@@ -554,7 +598,7 @@ universe_${target}_kernels: universe_${target}_worlds 
 universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
 .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
 	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
-	    ${SUB_MAKE} -DNO_OBJ LINT \
+	    ${SUB_MAKE} LINT \
 	    > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
 	    (echo "${target} 'make LINT' failed," \
 	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))

Modified: projects/bsd_rdma_4_9/Makefile.inc1
==============================================================================
--- projects/bsd_rdma_4_9/Makefile.inc1	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/Makefile.inc1	Wed Nov 15 11:28:11 2017	(r325842)
@@ -251,6 +251,9 @@ SUBDIR+=secure
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
+.if ${MK_BOOT} != "no"
+SUBDIR+=stand
+.endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
@@ -1986,6 +1989,9 @@ _rescue=rescue/rescue
 .if ${MK_TCSH} != "no"
 _tcsh=bin/csh
 .endif
+.if ${MK_FILE} != "no"
+_libmagic=lib/libmagic
+.endif
 
 # kernel-toolchain skips _cleanobj, so handle cleaning up previous
 # build-tools directories if needed.
@@ -2002,7 +2008,7 @@ _bt_clean=	${CLEANDIR}
     ${_rescue} \
     ${_share} \
     usr.bin/awk \
-    lib/libmagic \
+    ${_libmagic} \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
     usr.bin/vi/catalog \
@@ -2079,7 +2085,7 @@ _clang_libs=	lib/clang
 _gcc=		gnu/usr.bin/cc
 .endif
 .if ${MK_USB} != "no"
-_usb_tools=	sys/boot/usb/tools
+_usb_tools=	stand/usb/tools
 .endif
 
 cross-tools: .MAKE .PHONY
@@ -2110,7 +2116,7 @@ cross-tools: .MAKE .PHONY
 # to pickup.
 #
 NXBOBJROOT=	${OBJROOT}${MACHINE}.${MACHINE_ARCH}/nxb/
-NXBOBJTOP=	${NXBOBJROOT}${TARGET}.${TARGET_ARCH}
+NXBOBJTOP=	${NXBOBJROOT}${NXB_TARGET}.${NXB_TARGET_ARCH}
 NXTP?=		/nxb-bin
 .if ${NXTP:N/*}
 .error NXTP variable should be an absolute path
@@ -2180,20 +2186,27 @@ NXBDIRS+= \
     usr.bin/yacc \
     usr.sbin/chown
 
+SUBDIR_DEPEND_usr.bin/clang=	lib/clang
 .if ${MK_CLANG} != "no"
 NXBDIRS+=	lib/clang
-SUBDIR_DEPEND_usr.bin/clang=	lib/clang
 NXBDIRS+=	usr.bin/clang
-.elif ${MK_GCC} != "no"
+.endif
+.if ${MK_GCC} != "no"
 NXBDIRS+=	gnu/usr.bin/cc
 .endif
 .if ${MK_BINUTILS} != "no"
 NXBDIRS+=	gnu/usr.bin/binutils
 .endif
+# XXX: native-xtools passes along ${NXBDIRS} in SUBDIR_OVERRIDE that needs
+# to be evaluated after NXBDIRS is set.
+.if make(install) && !empty(SUBDIR_OVERRIDE)
+SUBDIR=	${SUBDIR_OVERRIDE}
+.endif
 
 NXBMAKEARGS+= \
 	OBJTOP=${NXBOBJTOP:Q} \
 	OBJROOT=${NXBOBJROOT:Q} \
+	MAKEOBJDIRPREFIX= \
 	-DNO_SHARED \
 	-DNO_CPU_CFLAGS \
 	-DNO_PIC \
@@ -2216,7 +2229,10 @@ NXBMAKEARGS+= \
 	MK_WARNS=no \
 	MK_ZFS=no
 
-
+.if make(native-xtools*) && \
+    (!defined(NXB_TARGET) || !defined(NXB_TARGET_ARCH))
+.error Missing NXB_TARGET / NXB_TARGET_ARCH
+.endif
 # For 'toolchain' we want to produce native binaries that themselves generate
 # native binaries.
 NXBTMAKE=	${NXBMAKEENV} ${MAKE} ${NXBMAKEARGS:N-DNO_PIC:N-DNO_SHARED} \
@@ -2224,11 +2240,32 @@ NXBTMAKE=	${NXBMAKEENV} ${MAKE} ${NXBMAKEARGS:N-DNO_PI
 # For 'everything' we want to produce native binaries (hence -target to
 # be MACHINE) that themselves generate TARGET.TARGET_ARCH binaries.
 # TARGET/TARGET_ARCH are still passed along from user.
-NXBMAKE=	${NXBMAKEENV} ${MAKE} ${NXBMAKEARGS} \
+#
+# Use the toolchain we create as an external toolchain.
+.if ${USING_SYSTEM_COMPILER} == "yes" || ${XCC:N${CCACHE_BIN}:M/*}
+NXBMAKE+=	XCC="${XCC}" \
+		XCXX="${XCXX}" \
+		XCPP="${XCPP}"
+.else
+NXBMAKE+=	XCC="${NXBOBJTOP}/tmp/usr/bin/cc" \
+		XCXX="${NXBOBJTOP}/tmp/usr/bin/c++" \
+		XCPP="${NXBOBJTOP}/tmp/usr/bin/cpp"
+.endif
+NXBMAKE+=	${NXBMAKEENV} ${MAKE} -f Makefile.inc1 ${NXBMAKEARGS} \
+		TARGET=${NXB_TARGET} TARGET_ARCH=${NXB_TARGET_ARCH} \
 		TARGET_TRIPLE=${MACHINE_TRIPLE:Q}
+# NXBDIRS is improperly based on MACHINE rather than NXB_TARGET.  Need to
+# invoke a sub-make to reevaluate MK_GCC, etc, for NXBDIRS.
+NXBMAKE+=	SUBDIR_OVERRIDE='$${NXBDIRS:M*}'
+# Need to avoid the -isystem logic when using clang as an external toolchain
+# even if the TARGET being built for wants GCC.
+NXBMAKE+=	WANT_COMPILER_TYPE='$${X_COMPILER_TYPE}'
 native-xtools: .PHONY
+	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _cleanobj
 	# Build the bootstrap/host/cross tools that produce native binaries
-	${_+_}cd ${.CURDIR}; ${NXBTMAKE} kernel-toolchain
+	# Pass along MK_GCC=yes to ensure GCC-needed build tools are built.
+	# We don't quite know what the NXB_TARGET wants so just build it.
+	${_+_}cd ${.CURDIR}; ${NXBTMAKE} kernel-toolchain MK_GCC=yes
 	# Populate includes/libraries sysroot that produce native binaries.
 	# This is split out from 'toolchain' above mostly so that target LLVM
 	# libraries have a proper LLVM_DEFAULT_TARGET_TRIPLE without
@@ -2238,10 +2275,9 @@ native-xtools: .PHONY
 	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _includes MK_CLANG=no MK_GCC=no
 	${_+_}cd ${.CURDIR}; ${NXBTMAKE} _libraries MK_CLANG=no MK_GCC=no
 .if !defined(NO_OBJWALK)
-	${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" _obj
+	${_+_}cd ${.CURDIR}; ${NXBMAKE} _obj
 .endif
-	${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \
-	    everything
+	${_+_}cd ${.CURDIR}; ${NXBMAKE} everything
 	@echo ">> native-xtools done.  Use 'make native-xtools-install' to install to a given DESTDIR"
 
 native-xtools-install: .PHONY
@@ -2250,9 +2286,8 @@ native-xtools-install: .PHONY
 	    -p ${NXBDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${NXBDESTDIR}/usr/include >/dev/null
-	${_+_}cd ${.CURDIR}; ${NXBMAKE} -f Makefile.inc1 \
+	${_+_}cd ${.CURDIR}; ${NXBMAKE} \
 	    DESTDIR=${NXBDESTDIR} \
-	    SUBDIR_OVERRIDE="${NXBDIRS:M*}" \
 	    -DNO_ROOT \
 	    install
 
@@ -2785,7 +2820,8 @@ cleanworld cleanuniverse: .PHONY
 	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}*
 .endif
-.if make(cleanworld) && ${MK_AUTO_OBJ} == "no"
+.if make(cleanworld) && ${MK_AUTO_OBJ} == "no" && \
+    (empty(BW_CANONICALOBJDIR) || ${.CURDIR:tA} == ${BW_CANONICALOBJDIR:tA})
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${MAKE} cleandir

Modified: projects/bsd_rdma_4_9/ObsoleteFiles.inc
==============================================================================
--- projects/bsd_rdma_4_9/ObsoleteFiles.inc	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/ObsoleteFiles.inc	Wed Nov 15 11:28:11 2017	(r325842)
@@ -38,6 +38,25 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20171114: Removal of all fortune datfiles other than freebsd-tips
+OLD_FILES+=usr/share/games/fortune/fortunes
+OLD_FILES+=usr/share/games/fortune/fortunes.dat
+OLD_FILES+=usr/share/games/fortune/gerrold.limerick
+OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
+OLD_FILES+=usr/share/games/fortune/limerick
+OLD_FILES+=usr/share/games/fortune/limerick.dat
+OLD_FILES+=usr/share/games/fortune/murphy
+OLD_FILES+=usr/share/games/fortune/murphy-o
+OLD_FILES+=usr/share/games/fortune/murphy-o.dat
+OLD_FILES+=usr/share/games/fortune/murphy.dat
+OLD_FILES+=usr/share/games/fortune/startrek
+OLD_FILES+=usr/share/games/fortune/startrek.dat
+OLD_FILES+=usr/share/games/fortune/zippy
+OLD_FILES+=usr/share/games/fortune/zippy.dat
+# 20171112: Removal of eqnchar definition
+OLD_FILES+=usr/share/misc/eqnchar
+# 20171110: Removal of mailaddr man page
+OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
 # 20171108: badsect(8) removal
 OLD_FILES+=sbin/badsect
 OLD_FILES+=rescue/badsect
@@ -71,7 +90,7 @@ OLD_FILES+=usr/lib/libcap_random.a
 OLD_FILES+=usr/lib/libcap_random_p.a
 OLD_FILES+=usr/lib/libcap_sysctl.a
 OLD_FILES+=usr/lib/libcap_sysctl_p.a
-# 20171031: Removal of obsolete man files
+# 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 OLD_DIRS+=usr/tests/lib/libpathconv

Modified: projects/bsd_rdma_4_9/UPDATING
==============================================================================
--- projects/bsd_rdma_4_9/UPDATING	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/UPDATING	Wed Nov 15 11:28:11 2017	(r325842)
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+201711xx:
+	The LOADER_FIREWIRE_SUPPORT build variable as been renamed to
+	WITH/OUT_LOADER_FIREWIRE. LOADER_{NO_,}GELI_SUPPORT has been renamed
+	to WITH/OUT_LOADER_GELI.
+
 20171106:
 	The naive and non-compliant support of posix_fallocate(2) in ZFS
 	has been removed as of r325320.  The system call now returns EINVAL

Modified: projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.1
==============================================================================
--- projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.1	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.1	Wed Nov 15 11:28:11 2017	(r325842)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 5, 2013
+.Dd November 14, 2017
 .Dt FREEBSD-VERSION 1
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@
 .Nd print the version and patch level of the installed system
 .Sh SYNOPSIS
 .Nm
-.Op Fl ku
+.Op Fl kru
 .Sh DESCRIPTION
 The
 .Nm
@@ -50,6 +50,11 @@ if a new kernel has been installed but the system has 
 rebooted,
 .Nm
 will print the version and patch level of the new kernel.
+.It Fl r
+Print the version and patch level of the running kernel.
+Unlike
+.Xr uname 1 ,
+this is unaffected by environment variables.
 .It Fl u
 Print the version and patch level of the installed userland.
 These are hardcoded into
@@ -57,14 +62,10 @@ These are hardcoded into
 during the build.
 .El
 .Pp
-If both
-.Fl k
-and
-.Fl u
-are specified,
+If several of the above options are specified,
 .Nm
-will print the kernel version first, then the userland version, on
-separate lines.
+will print the installed kernel version first, then the running kernel
+version, and finally the userland version, on separate lines.
 If neither is specified, it will print the userland version only.
 .Sh IMPLEMENTATION NOTES
 The

Modified: projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.sh.in
==============================================================================
--- projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.sh.in	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/bin/freebsd-version/freebsd-version.sh.in	Wed Nov 15 11:28:11 2017	(r325842)
@@ -38,7 +38,7 @@ LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\
 LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$'
 KERNEL_RE='^@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
 
-progname=$(basename $0)
+progname=${0##*/}
 
 #
 # Print an error message and exit.
@@ -71,6 +71,13 @@ kernel_version() {
 }
 
 #
+# Print the version of the currently running kernel.
+#
+running_version() {
+	sysctl -n kern.osrelease
+}
+
+#
 # Print the hardcoded userland version.
 #
 userland_version() {
@@ -81,7 +88,7 @@ userland_version() {
 # Print a usage string and exit.
 #
 usage() {
-	echo "usage: $progname [-ku]" >&2
+	echo "usage: $progname [-kru]" >&2
 	exit 1
 }
 
@@ -90,11 +97,14 @@ usage() {
 #
 main() {
 	# parse command-line arguments
-	while getopts "ku" option ; do
+	while getopts "kru" option ; do
 		case $option in
 		k)
 			opt_k=1
 			;;
+		r)
+			opt_r=1
+			;;
 		u)
 			opt_u=1
 			;;
@@ -108,13 +118,18 @@ main() {
 	fi
 
 	# default is -u
-	if [ $((opt_k + opt_u)) -eq 0 ] ; then
+	if [ $((opt_k + opt_r + opt_u)) -eq 0 ] ; then
 		opt_u=1
 	fi
 
-	# print kernel version
+	# print installed kernel version
 	if [ $opt_k ] ; then
 		kernel_version
+	fi
+
+	# print running kernel version
+	if [ $opt_r ] ; then
+		running_version
 	fi
 
 	# print userland version

Modified: projects/bsd_rdma_4_9/etc/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/etc/Makefile	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/etc/Makefile	Wed Nov 15 11:28:11 2017	(r325842)
@@ -152,8 +152,6 @@ BIN1+= regdomain.xml
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
-PPPCNF=	ppp.conf
-
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else

Modified: projects/bsd_rdma_4_9/etc/devd.conf
==============================================================================
--- projects/bsd_rdma_4_9/etc/devd.conf	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/etc/devd.conf	Wed Nov 15 11:28:11 2017	(r325842)
@@ -20,7 +20,8 @@ options {
 	#XXX Yes, these are gross -- imp
 	set scsi-controller-regex
 		"(aac|adv|adw|aha|ahc|ahd|aic|amr|bt|ciss|dpt|\
-		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm)\
+		esp|ida|iir|ips|isp|mlx|mly|mpr|mps|mpt|ncr|ncv|nsp|stg|sym|\
+		trm)\
 		[0-9]+";
 	set wifi-driver-regex
 		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rtwn|rum|run|\

Modified: projects/bsd_rdma_4_9/lib/clang/libclang/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/lib/clang/libclang/Makefile	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/clang/libclang/Makefile	Wed Nov 15 11:28:11 2017	(r325842)
@@ -790,16 +790,7 @@ clang/StaticAnalyzer/Checkers/Checkers.inc: \
 	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
 TGHDRS+=	clang/StaticAnalyzer/Checkers/Checkers.inc
 
-.for dep in ${TGHDRS:C/$/.d/}
-. if ${MAKE_VERSION} < 20160220
-.  if !make(depend)
-.   sinclude "${dep}"
-.  endif
-. else
-.   dinclude "${dep}"
-. endif
-.endfor
-
+DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 

Modified: projects/bsd_rdma_4_9/lib/clang/libllvm/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/lib/clang/libllvm/Makefile	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/clang/libllvm/Makefile	Wed Nov 15 11:28:11 2017	(r325842)
@@ -1412,16 +1412,7 @@ TGHDRS+=	X86GenRegisterBank.inc
 TGHDRS+=	X86GenRegisterInfo.inc
 TGHDRS+=	X86GenSubtargetInfo.inc
 
-.for dep in ${TGHDRS:C/$/.d/}
-. if ${MAKE_VERSION} < 20160220
-.  if !make(depend)
-.   sinclude "${dep}"
-.  endif
-. else
-.   dinclude "${dep}"
-. endif
-.endfor
-
+DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 

Modified: projects/bsd_rdma_4_9/lib/libc/string/memcpy.3
==============================================================================
--- projects/bsd_rdma_4_9/lib/libc/string/memcpy.3	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/libc/string/memcpy.3	Wed Nov 15 11:28:11 2017	(r325842)
@@ -54,6 +54,11 @@ bytes from string
 .Fa src
 to string
 .Fa dst .
+If
+.Fa src
+and
+.Fa dst
+overlap, the results are not defined.
 .Sh RETURN VALUES
 The
 .Fn memcpy

Modified: projects/bsd_rdma_4_9/lib/libc/string/strcat.3
==============================================================================
--- projects/bsd_rdma_4_9/lib/libc/string/strcat.3	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/libc/string/strcat.3	Wed Nov 15 11:28:11 2017	(r325842)
@@ -62,6 +62,11 @@ then add a terminating
 The string
 .Fa s
 must have sufficient space to hold the result.
+If
+.Fa s
+and
+.Fa append
+overlap, the results are undefined.
 .Pp
 The
 .Fn strncat
@@ -72,6 +77,11 @@ characters from
 .Fa append ,
 and then adds a terminating
 .Ql \e0 .
+If
+.Fa s
+and
+.Fa append
+overlap, the results are undefined.
 .Sh RETURN VALUES
 The
 .Fn strcat

Modified: projects/bsd_rdma_4_9/lib/libc/string/strcpy.3
==============================================================================
--- projects/bsd_rdma_4_9/lib/libc/string/strcpy.3	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/libc/string/strcpy.3	Wed Nov 15 11:28:11 2017	(r325842)
@@ -63,6 +63,11 @@ to
 (including the terminating
 .Ql \e0
 character.)
+If
+.Fa src
+and
+.Fa dst
+overlap, the results are undefined.
 .Pp
 The
 .Fn stpncpy
@@ -89,6 +94,11 @@ Otherwise,
 is
 .Em not
 terminated.
+If
+.Fa src
+and
+.Fa dst
+overlap, the results are undefined.
 .Sh RETURN VALUES
 The
 .Fn strcpy

Modified: projects/bsd_rdma_4_9/lib/libc/sys/_umtx_op.2
==============================================================================
--- projects/bsd_rdma_4_9/lib/libc/sys/_umtx_op.2	Wed Nov 15 11:14:39 2017	(r325841)
+++ projects/bsd_rdma_4_9/lib/libc/sys/_umtx_op.2	Wed Nov 15 11:28:11 2017	(r325842)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 23, 2017
+.Dd November 13, 2017
 .Dt _UMTX_OP 2
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ All objects require ABI-mandated alignment, but this i
 enforced consistently on all architectures.
 .Pp
 The following flags are defined for flag fields of all structures:
-.Bl -tag -width "Dv USYNC_PROCESS_SHARED"
+.Bl -tag -width indent
 .It Dv USYNC_PROCESS_SHARED
 Allow selection of the process-shared sleep queue for the thread sleep
 container, when the lock ownership cannot be granted immediately,
@@ -77,7 +77,6 @@ See the
 .Sx SLEEP QUEUES
 subsection below for more details on sleep queues.
 .El
-.Pp
 .Bl -hang -offset indent
 .It Sy Mutex
 .Bd -literal
@@ -96,7 +95,7 @@ It contains either the thread identifier of the lock o
 locked state, or zero when the lock is unowned.
 The highest bit set indicates that there is contention on the lock.
 The constants are defined for special values:
-.Bl -tag -width "Dv UMUTEX_RB_OWNERDEAD"
+.Bl -tag -width indent
 .It Dv UMUTEX_UNOWNED
 Zero, the value stored in the unowned lock.
 .It Dv UMUTEX_CONTESTED
@@ -113,7 +112,7 @@ The
 .Dv m_flags
 field may contain the following umutex-specific flags, in addition to
 the common flags:
-.Bl -tag -width "Dv UMUTEX_NONCONSISTENT"
+.Bl -tag -width indent
 .It Dv UMUTEX_PRIO_INHERIT
 Mutex implements
 .Em Priority Inheritance
@@ -136,8 +135,9 @@ In the manual page, mutexes not having
 and
 .Dv UMUTEX_PRIO_PROTECT
 flags set, are called normal mutexes.
-Each type of mutex, i.e. normal mutexes, priority-inherited mutexes,
-and priority-protected mutexes, have a separate sleep queue associated
+Each type of mutex
+.Pq normal, priority-inherited, and priority-protected
+has a separate sleep queue associated
 with the given key.
 .Pp
 For priority protected mutexes, the
@@ -182,8 +182,8 @@ request.
 The
 .Dv c_flags
 field contains flags.
-Only the common flags, i.e.
-.Dv USYNC_PROCESS_SHARED ,
+Only the common flags
+.Pq Dv USYNC_PROCESS_SHARED
 are defined for ucond.
 .Pp
 The
@@ -193,23 +193,34 @@ member provides the clock identifier to use for timeou
 request has both the
 .Dv CVWAIT_CLOCKID
 flag and the timeout specified.
-Valid clock identifiers are subset of the valid clock ids for the
-.Xr clock_gettime 2
-syscall, namely,
-.Dv CLOCK_REALTIME ,
-.Dv CLOCK_VIRTUAL ,
-.Dv CLOCK_PROF ,
-.Dv CLOCK_MONOTONIC ,
-.Dv CLOCK_UPTIME ,
-.Dv CLOCK_UPTIME_PRECISE ,
-.Dv CLOCK_UPTIME_FAST ,
-.Dv CLOCK_REALTIME_PRECISE ,
-.Dv CLOCK_REALTIME_FAST ,
-.Dv CLOCK_MONOTONIC_PRECISE ,
-.Dv CLOCK_MONOTONIC_FAST ,
-and
+Valid clock identifiers are a subset of those for
+.Xr clock_gettime 2 :
+.Bl -bullet -compact
+.It
+.Dv CLOCK_MONOTONIC
+.It
+.Dv CLOCK_MONOTONIC_FAST
+.It
+.Dv CLOCK_MONOTONIC_PRECISE
+.It
+.Dv CLOCK_PROF
+.It
+.Dv CLOCK_REALTIME
+.It
+.Dv CLOCK_REALTIME_FAST
+.It
+.Dv CLOCK_REALTIME_PRECISE
+.It
 .Dv CLOCK_SECOND
-are allowed.
+.It
+.Dv CLOCK_UPTIME
+.It
+.Dv CLOCK_UPTIME_FAST
+.It
+.Dv CLOCK_UPTIME_PRECISE
+.It
+.Dv CLOCK_VIRTUAL
+.El
 .It Sy Reader/writer lock
 .Bd -literal
 struct urwlock {
@@ -228,7 +239,7 @@ granted.
 Names of the
 .Dv rw_state
 bits are following:
-.Bl -tag -width "Dv URWLOCK_WRITE_WAITERS"
+.Bl -tag -width indent
 .It Dv URWLOCK_WRITE_OWNER
 Write lock was granted.
 .It Dv URWLOCK_WRITE_WAITERS
@@ -253,7 +264,7 @@ The following flags for the
 member of
 .Vt struct urwlock
 are defined, in addition to the common flags:
-.Bl -tag -width "Dv URWLOCK_PREFER_READER"
+.Bl -tag -width indent
 .It Dv URWLOCK_PREFER_READER
 If specified, immediately grant read lock requests when
 .Dv urwlock
@@ -302,7 +313,7 @@ The
 .Dv USEM_COUNT()
 macro, applied to the
 .Dv _count
-word, returns the current semaphore counter, i.e. the number of posts
+word, returns the current semaphore counter, which is the number of posts
 issued on the semaphore.
 .Pp
 The following bits for the
@@ -310,7 +321,7 @@ The following bits for the
 member of
 .Vt struct _usem2
 are defined, in addition to the common flags:
-.Bl -tag -width "Dv USEM_NAMED"
+.Bl -tag -width indent
 .It Dv USEM_NAMED
 Flag is ignored by kernel.
 .El
@@ -359,7 +370,7 @@ Interval counting is always performed by the monotonic
 The
 .Dv _flags
 argument allows the following flags to further define the timeout behaviour:
-.Bl -tag -width "It Dv UMTX_ABSTIME"
+.Bl -tag -width indent
 .It Dv UMTX_ABSTIME
 The
 .Dv _timeout
@@ -374,7 +385,6 @@ start.
 .El
 .El
 .Ss SLEEP QUEUES
-.Pp
 When a locking request cannot be immediately satisfied, the thread is
 typically put to
 .Em sleep ,
@@ -416,7 +426,7 @@ regardless of the kind of backing memory.
 .Pp
 Only the address of the start byte of the variable specified as key is
 important for determining corresponding sleep queue.
-The size of the variable does not matter, so e.g. sleep on the same
+The size of the variable does not matter, so, for example, sleep on the same
 address interpeted as
 .Vt uint32_t
 and
@@ -505,11 +515,11 @@ error for lock attempts, without granting the lock.
 The following operations, requested by the
 .Fa op
 argument to the function, are implemented:
-.Bl -tag -width "It Dv UMTX_OP_WAIT_UINT_PRIVATE"
+.Bl -tag -width indent
 .It Dv UMTX_OP_WAIT
 Wait.
 The arguments for the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to a variable of type
 .Vt long .
@@ -558,7 +568,7 @@ Optionally, a timeout for the request may be specified
 Wake the threads possibly sleeping due to
 .Dv UMTX_OP_WAIT .
 The arguments for the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to a variable, used as a key to find sleeping threads.
 .It Fa val
@@ -572,7 +582,7 @@ to wake up all waiters.
 .It Dv UMTX_OP_MUTEX_TRYLOCK
 Try to lock umutex.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the umutex.
 .El
@@ -585,7 +595,7 @@ instead of sleeping if the lock cannot be obtained imm
 .It Dv UMTX_OP_MUTEX_LOCK
 Lock umutex.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the umutex.
 .El
@@ -624,7 +634,7 @@ from a signal handler.
 .It Dv UMTX_OP_MUTEX_UNLOCK
 Unlock umutex.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the umutex.
 .El
@@ -661,7 +671,7 @@ priority protected protocol mutex.
 .It Dv UMTX_OP_SET_CEILING
 Set ceiling for the priority protected umutex.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "uaddr"
 .It Fa obj
 Pointer to the umutex.
 .It Fa val
@@ -696,7 +706,7 @@ interface.
 .It Dv UMTX_OP_CV_WAIT
 Wait for a condition.
 The arguments to the request are:
-.Bl -tag -width "It Fa uaddr2"
+.Bl -tag -width "uaddr2"
 .It Fa obj
 Pointer to the
 .Vt struct ucond .
@@ -743,7 +753,7 @@ After wakeup, the
 umutex is not relocked.
 .Pp
 The following flags are defined:
-.Bl -tag -width "Dv CVWAIT_CLOCKID"
+.Bl -tag -width "CVWAIT_CLOCKID"
 .It Dv CVWAIT_ABSTIME
 Timeout is absolute.
 .It Dv CVWAIT_CLOCKID
@@ -782,7 +792,7 @@ error.
 .It Dv UMTX_OP_CV_SIGNAL
 Wake up one condition waiter.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to
 .Vt struct ucond .
@@ -800,7 +810,7 @@ is cleared.
 .It Dv UMTX_OP_CV_BROADCAST
 Wake up all condition waiters.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to
 .Vt struct ucond .
@@ -820,14 +830,14 @@ Same as
 but the type of the variable pointed to by
 .Fa obj
 is
-.Vt u_int ,
-i.e. 32-bit integer.
+.Vt u_int
+.Pq a 32-bit integer .
 .It Dv UMTX_OP_RW_RDLOCK
 Read-lock a
 .Vt struct rwlock
 lock.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the lock (of type
 .Vt struct rwlock )
@@ -837,7 +847,7 @@ Additional flags to augment locking behaviour.
 The valid flags in the
 .Fa val
 argument are:
-.Bl -tag -width "It Dv URWLOCK_PREFER_READER"
+.Bl -tag -width indent
 .It Dv URWLOCK_PREFER_READER
 .El
 .El
@@ -889,7 +899,7 @@ Write-lock a
 .Vt struct rwlock
 lock.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the lock (of type
 .Vt struct rwlock )
@@ -925,7 +935,7 @@ error.
 .It Dv UMTX_OP_RW_UNLOCK
 Unlock rwlock.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the lock (of type
 .Vt struct rwlock )
@@ -967,7 +977,7 @@ but unconditionally select the process-private sleep q
 .It Dv UMTX_OP_MUTEX_WAIT
 Wait for mutex availability.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Address of the mutex.
 .El
@@ -991,7 +1001,6 @@ priority inherited protocol mutexes.
 .Pp
 Optionally, a timeout for the request may be specified.
 .Pp
-.Pp
 A request with a timeout specified is not restartable.
 An unblocked signal delivered during the wait always results in sleep
 interruption and
@@ -1007,7 +1016,7 @@ member
 .It Dv UMTX_OP_NWAKE_PRIVATE
 Wake up a batch of sleeping threads.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the array of pointers.
 .It Fa val
@@ -1024,7 +1033,7 @@ being the byte addressed by the array element.
 .It Dv UMTX_OP_MUTEX_WAKE
 Check if a normal umutex is unlocked and wake up a waiter.
 The arguments for the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the umutex.
 .El
@@ -1058,7 +1067,7 @@ bit may then modify freed memory.
 .It Dv UMTX_OP_MUTEX_WAKE2
 Check if a umutex is unlocked and wake up a waiter.
 The arguments for the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the umutex.
 .It Fa val
@@ -1088,11 +1097,12 @@ word of the
 .It Dv UMTX_OP_SEM2_WAIT
 Wait until semaphore is available.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the semaphore (of type
 .Vt struct _usem2 ) .
 .El
+.Pp
 Put the requesting thread onto a sleep queue if the semaphore counter
 is zero.
 If the thread is put to sleep, the
@@ -1117,7 +1127,7 @@ error.
 .It Dv UMTX_OP_SEM2_WAKE
 Wake up waiters on semaphore lock.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "obj"
 .It Fa obj
 Pointer to the semaphore (of type
 .Vt struct _usem2 ) .
@@ -1145,7 +1155,7 @@ The
 argument specifies the sub-request of the
 .Dv UMTX_OP_SHM
 request:
-.Bl -tag -width "Dv UMTX_SHM_DESTROY"
+.Bl -tag -width indent
 .It Dv UMTX_SHM_CREAT
 Creates the anonymous shared memory object, which can be looked up
 with the specified key
@@ -1191,7 +1201,7 @@ creation or lookup.
 .It Dv UMTX_OP_ROBUST_LISTS
 Register the list heads for the current thread's robust mutex lists.
 The arguments to the request are:
-.Bl -tag -width "It Fa obj"
+.Bl -tag -width "uaddr"
 .It Fa val
 Size of the structure passed in the
 .Fa uaddr
@@ -1261,8 +1271,8 @@ variable is set to indicate the error.
 .Sh ERRORS
 The
 .Fn _umtx_op
-operations will return the following errors:
-.Bl -tag -width "Bq Er ENOTRECOVERABLE"
+operations can fail with the following errors:
+.Bl -tag -width "[ETIMEDOUT]"
 .It Bq Er EFAULT
 One of the arguments point to invalid memory.
 .It Bq Er EINVAL

Modified: projects/bsd_rdma_4_9/lib/libcasper/libcasper/libcasper.h
==============================================================================
--- projects/bsd_rdma_4_9/lib/libcasper/libcasper/libcasper.h	Wed Nov 15 11:14:39 2017	(r325841)

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

More information about the svn-src-projects mailing list