svn commit: r338392 - in projects/clang700-import: . bin/csh bin/sh crypto/heimdal/doc/doxyout/krb5/man/man3 etc etc/root include lib/libbe lib/libmd libexec/rtld-elf/arm release/tools sbin/bectl s...

Wed Aug 29 20:55:07 UTC 2018

Author: dim
Date: Wed Aug 29 20:54:56 2018
New Revision: 338392
URL: https://svnweb.freebsd.org/changeset/base/338392

Log:
  Merge ^/head r338298 through r338391.

Added:
  projects/clang700-import/bin/csh/dot.cshrc
     - copied unchanged from r338391, head/bin/csh/dot.cshrc
  projects/clang700-import/bin/sh/dot.profile
     - copied unchanged from r338391, head/bin/sh/dot.profile
  projects/clang700-import/tools/build/options/WITHOUT_MODULE_DRM
     - copied unchanged from r338391, head/tools/build/options/WITHOUT_MODULE_DRM
  projects/clang700-import/tools/build/options/WITHOUT_MODULE_DRM2
     - copied unchanged from r338391, head/tools/build/options/WITHOUT_MODULE_DRM2
  projects/clang700-import/tools/build/options/WITH_MODULE_DRM
     - copied unchanged from r338391, head/tools/build/options/WITH_MODULE_DRM
  projects/clang700-import/tools/build/options/WITH_MODULE_DRM2
     - copied unchanged from r338391, head/tools/build/options/WITH_MODULE_DRM2
Deleted:
  projects/clang700-import/etc/root/dot.cshrc
  projects/clang700-import/etc/root/dot.profile
  projects/clang700-import/sys/dev/random/yarrow.c
  projects/clang700-import/sys/dev/random/yarrow.h
  projects/clang700-import/sys/modules/random_yarrow/Makefile
Modified:
  projects/clang700-import/Makefile.inc1
  projects/clang700-import/ObsoleteFiles.inc
  projects/clang700-import/UPDATING
  projects/clang700-import/bin/csh/Makefile
  projects/clang700-import/bin/sh/Makefile
  projects/clang700-import/crypto/heimdal/doc/doxyout/krb5/man/man3/krb5.3
  projects/clang700-import/etc/Makefile
  projects/clang700-import/include/stdlib.h
  projects/clang700-import/lib/libbe/Makefile
  projects/clang700-import/lib/libbe/be.c
  projects/clang700-import/lib/libbe/libbe.3
  projects/clang700-import/lib/libmd/Makefile
  projects/clang700-import/libexec/rtld-elf/arm/reloc.c
  projects/clang700-import/release/tools/ec2.conf
  projects/clang700-import/sbin/bectl/bectl.8
  projects/clang700-import/sbin/bectl/bectl.c
  projects/clang700-import/sbin/devmatch/devmatch.c
  projects/clang700-import/share/man/man4/random.4
  projects/clang700-import/share/man/man5/src.conf.5
  projects/clang700-import/share/man/man9/random_harvest.9
  projects/clang700-import/share/mk/bsd.confs.mk
  projects/clang700-import/stand/defaults/loader.conf.5
  projects/clang700-import/stand/efi/boot1/Makefile
  projects/clang700-import/stand/efi/loader/arch/arm64/start.S
  projects/clang700-import/stand/lua/config.lua
  projects/clang700-import/sys/amd64/amd64/mp_machdep.c
  projects/clang700-import/sys/amd64/amd64/pmap.c
  projects/clang700-import/sys/amd64/amd64/sys_machdep.c
  projects/clang700-import/sys/amd64/amd64/vm_machdep.c
  projects/clang700-import/sys/arm/allwinner/a10_fb.c
  projects/clang700-import/sys/arm/amlogic/aml8726/aml8726_rng.c
  projects/clang700-import/sys/arm/arm/busdma_machdep-v4.c
  projects/clang700-import/sys/arm/arm/busdma_machdep-v6.c
  projects/clang700-import/sys/arm/arm/pmap-v6.c
  projects/clang700-import/sys/arm/arm/vfp.c
  projects/clang700-import/sys/arm/broadcom/bcm2835/bcm2835_rng.c
  projects/clang700-import/sys/arm/freescale/imx/imx6_sdma.c
  projects/clang700-import/sys/arm/nvidia/tegra_sdhci.c
  projects/clang700-import/sys/arm/nvidia/tegra_xhci.c
  projects/clang700-import/sys/arm64/arm64/busdma_bounce.c
  projects/clang700-import/sys/arm64/arm64/mp_machdep.c
  projects/clang700-import/sys/arm64/arm64/pmap.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/abd.c
  projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  projects/clang700-import/sys/cddl/dev/fbt/aarch64/fbt_isa.c
  projects/clang700-import/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/clang700-import/sys/cddl/dev/fbt/fbt.c
  projects/clang700-import/sys/cddl/dev/fbt/fbt.h
  projects/clang700-import/sys/cddl/dev/fbt/mips/fbt_isa.c
  projects/clang700-import/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  projects/clang700-import/sys/cddl/dev/fbt/riscv/fbt_isa.c
  projects/clang700-import/sys/cddl/dev/fbt/x86/fbt_isa.c
  projects/clang700-import/sys/compat/freebsd32/capabilities.conf
  projects/clang700-import/sys/compat/freebsd32/freebsd32_sysent.c
  projects/clang700-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  projects/clang700-import/sys/compat/linuxkpi/common/src/linux_page.c
  projects/clang700-import/sys/conf/NOTES
  projects/clang700-import/sys/conf/files
  projects/clang700-import/sys/conf/kern.opts.mk
  projects/clang700-import/sys/conf/options
  projects/clang700-import/sys/dev/agp/agp.c
  projects/clang700-import/sys/dev/agp/agp_amd.c
  projects/clang700-import/sys/dev/agp/agp_ati.c
  projects/clang700-import/sys/dev/agp/agp_i810.c
  projects/clang700-import/sys/dev/al_eth/al_eth.c
  projects/clang700-import/sys/dev/amd_ecc_inject/ecc_inject.c
  projects/clang700-import/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/clang700-import/sys/dev/cxgbe/tom/t4_ddp.c
  projects/clang700-import/sys/dev/drm/drm.h
  projects/clang700-import/sys/dev/drm/drm_drv.c
  projects/clang700-import/sys/dev/drm/drm_scatter.c
  projects/clang700-import/sys/dev/drm2/drm_os_freebsd.c
  projects/clang700-import/sys/dev/drm2/drm_os_freebsd.h
  projects/clang700-import/sys/dev/drm2/drm_scatter.c
  projects/clang700-import/sys/dev/glxsb/glxsb.c
  projects/clang700-import/sys/dev/hifn/hifn7751.c
  projects/clang700-import/sys/dev/hyperv/vmbus/hyperv.c
  projects/clang700-import/sys/dev/liquidio/lio_network.h
  projects/clang700-import/sys/dev/mmc/mmcbrvar.h
  projects/clang700-import/sys/dev/random/build.sh
  projects/clang700-import/sys/dev/random/fortuna.c
  projects/clang700-import/sys/dev/random/other_algorithm.c
  projects/clang700-import/sys/dev/random/other_algorithm.h
  projects/clang700-import/sys/dev/random/random_harvestq.c
  projects/clang700-import/sys/dev/random/random_harvestq.h
  projects/clang700-import/sys/dev/random/randomdev.c
  projects/clang700-import/sys/dev/random/unit_test.c
  projects/clang700-import/sys/dev/random/unit_test.h
  projects/clang700-import/sys/dev/rndtest/rndtest.c
  projects/clang700-import/sys/dev/safe/safe.c
  projects/clang700-import/sys/dev/sdhci/sdhci_fdt.c
  projects/clang700-import/sys/dev/sdhci/sdhci_xenon.c
  projects/clang700-import/sys/dev/syscons/scmouse.c
  projects/clang700-import/sys/dev/syscons/syscons.c
  projects/clang700-import/sys/dev/ubsec/ubsec.c
  projects/clang700-import/sys/dev/virtio/random/virtio_random.c
  projects/clang700-import/sys/dev/vt/hw/efifb/efifb.c
  projects/clang700-import/sys/dev/vt/hw/fb/vt_early_fb.c
  projects/clang700-import/sys/dev/vt/hw/fb/vt_fb.c
  projects/clang700-import/sys/dev/vt/hw/fb/vt_fb.h
  projects/clang700-import/sys/dev/vt/hw/vga/vt_vga.c
  projects/clang700-import/sys/dev/vt/vt.h
  projects/clang700-import/sys/dev/vt/vt_core.c
  projects/clang700-import/sys/dev/vt/vt_sysmouse.c
  projects/clang700-import/sys/fs/tmpfs/tmpfs_subr.c
  projects/clang700-import/sys/i386/i386/pmap.c
  projects/clang700-import/sys/i386/i386/swtch.s
  projects/clang700-import/sys/i386/include/pmap.h
  projects/clang700-import/sys/kern/kern_intr.c
  projects/clang700-import/sys/kern/kern_malloc.c
  projects/clang700-import/sys/kern/subr_bus.c
  projects/clang700-import/sys/kern/subr_busdma_bufalloc.c
  projects/clang700-import/sys/mips/cavium/octeon_rnd.c
  projects/clang700-import/sys/mips/ingenic/jz4780_lcd.c
  projects/clang700-import/sys/mips/mips/busdma_machdep.c
  projects/clang700-import/sys/mips/mips/pmap.c
  projects/clang700-import/sys/modules/Makefile
  projects/clang700-import/sys/net/if_ethersubr.c
  projects/clang700-import/sys/net/if_tun.c
  projects/clang700-import/sys/net/iflib.c
  projects/clang700-import/sys/netgraph/ng_iface.c
  projects/clang700-import/sys/netinet6/in6_pcb.c
  projects/clang700-import/sys/netinet6/udp6_usrreq.c
  projects/clang700-import/sys/powerpc/powerpc/busdma_machdep.c
  projects/clang700-import/sys/riscv/riscv/pmap.c
  projects/clang700-import/sys/sys/interrupt.h
  projects/clang700-import/sys/sys/param.h
  projects/clang700-import/sys/sys/random.h
  projects/clang700-import/sys/ufs/ffs/ffs_inode.c
  projects/clang700-import/sys/vm/uma.h
  projects/clang700-import/sys/vm/uma_core.c
  projects/clang700-import/sys/vm/uma_int.h
  projects/clang700-import/sys/vm/vm_extern.h
  projects/clang700-import/sys/vm/vm_glue.c
  projects/clang700-import/sys/vm/vm_init.c
  projects/clang700-import/sys/vm/vm_kern.c
  projects/clang700-import/sys/vm/vm_map.c
  projects/clang700-import/sys/vm/vm_map.h
  projects/clang700-import/sys/vm/vm_page.h
  projects/clang700-import/sys/x86/acpica/madt.c
  projects/clang700-import/sys/x86/include/apicvar.h
  projects/clang700-import/sys/x86/include/intr_machdep.h
  projects/clang700-import/sys/x86/iommu/busdma_dmar.c
  projects/clang700-import/sys/x86/iommu/intel_intrmap.c
  projects/clang700-import/sys/x86/iommu/intel_qi.c
  projects/clang700-import/sys/x86/isa/atpic.c
  projects/clang700-import/sys/x86/x86/busdma_bounce.c
  projects/clang700-import/sys/x86/x86/intr_machdep.c
  projects/clang700-import/sys/x86/x86/io_apic.c
  projects/clang700-import/sys/x86/x86/local_apic.c
  projects/clang700-import/sys/x86/x86/mp_x86.c
  projects/clang700-import/sys/x86/x86/msi.c
  projects/clang700-import/sys/x86/x86/nexus.c
  projects/clang700-import/sys/x86/xen/xen_intr.c
  projects/clang700-import/sys/x86/xen/xen_msi.c
  projects/clang700-import/sys/x86/xen/xen_nexus.c
  projects/clang700-import/tools/bsdbox/Makefile.hostapd
  projects/clang700-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang700-import/tools/tools/sysdoc/tunables.mdoc
  projects/clang700-import/usr.bin/last/Makefile
  projects/clang700-import/usr.bin/last/last.1
  projects/clang700-import/usr.bin/last/last.c
  projects/clang700-import/usr.bin/sed/extern.h
  projects/clang700-import/usr.bin/sed/main.c
  projects/clang700-import/usr.bin/sed/process.c
  projects/clang700-import/usr.bin/sed/tests/sed2_test.sh
  projects/clang700-import/usr.bin/top/machine.c
  projects/clang700-import/usr.bin/vmstat/vmstat.c
  projects/clang700-import/usr.bin/xinstall/xinstall.c
  projects/clang700-import/usr.sbin/bluetooth/hcsecd/Makefile
  projects/clang700-import/usr.sbin/lastlogin/Makefile
  projects/clang700-import/usr.sbin/lastlogin/lastlogin.8
  projects/clang700-import/usr.sbin/lastlogin/lastlogin.c
  projects/clang700-import/usr.sbin/nfsuserd/nfsuserd.c
  projects/clang700-import/usr.sbin/syslogd/Makefile
Directory Properties:
  projects/clang700-import/   (props changed)
  projects/clang700-import/crypto/heimdal/   (props changed)
  projects/clang700-import/sys/cddl/contrib/opensolaris/   (props changed)

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

--- projects/clang700-import/Makefile.inc1	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/Makefile.inc1	Wed Aug 29 20:54:56 2018	(r338392)
@@ -1334,7 +1334,7 @@ distributeworld installworld stageworld: _installcheck
 	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
 	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
-	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+	${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

Modified: projects/clang700-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang700-import/ObsoleteFiles.inc	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/ObsoleteFiles.inc	Wed Aug 29 20:54:56 2018	(r338392)
@@ -174,6 +174,8 @@ OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
+# 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
+OLD_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 OLD_FILES+=usr/share/man/man3/arc4random_addrandom.3.gz
 OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz

Modified: projects/clang700-import/UPDATING
==============================================================================
--- projects/clang700-import/UPDATING	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/UPDATING	Wed Aug 29 20:54:56 2018	(r338392)
@@ -31,8 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
-20170822:
-	devctl freeze/that have gone into the tree, the rc scripts have been
+20180826:
+	The Yarrow CSPRNG has been removed from the kernel as it has not been
+	supported by its designers since at least 2003. Fortuna has been the
+	default since FreeBSD-11.
+
+20180822:
+	devctl freeze/thaw have gone into the tree, the rc scripts have been
 	updated to use them and devmatch has been changed.  You should update
 	kernel, userland and rc scripts all at the same time.
 

Modified: projects/clang700-import/bin/csh/Makefile
==============================================================================
--- projects/clang700-import/bin/csh/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/bin/csh/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -8,8 +8,12 @@
 
 .include <src.opts.mk>
 
-CONFGROUPS=	ETC
+CONFGROUPS=	ETC ROOT
 ETC=	csh.cshrc csh.login csh.logout
+ROOT=	dot.cshrc dot.login
+ROOTDIR=	/root
+ROOTNAME_dot.cshrc=	.cshrc
+ROOTNAME_dot.login=	.login
 PACKAGE=runtime
 TCSHDIR= ${SRCTOP}/contrib/tcsh
 .PATH: ${TCSHDIR}
@@ -149,5 +153,11 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
+
+beforeinstallconfig:
+	rm -f ${DESTDIR}/.cshrc
+
+afterinstallconfig:
+	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
 
 .include <bsd.prog.mk>

Copied: projects/clang700-import/bin/csh/dot.cshrc (from r338391, head/bin/csh/dot.cshrc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang700-import/bin/csh/dot.cshrc	Wed Aug 29 20:54:56 2018	(r338392, copy of r338391, head/bin/csh/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias h		history 25
+alias j		jobs -l
+alias la	ls -aF
+alias lf	ls -FA
+alias ll	ls -lAF
+
+# A righteous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
+
+setenv	EDITOR	vi
+setenv	PAGER	less
+setenv	BLOCKSIZE	K
+
+if ($?prompt) then
+	# An interactive shell -- set some stuff up
+	set prompt = "%N@%m:%~ %# "
+	set promptchars = "%#"
+
+	set filec
+	set history = 1000
+	set savehist = (1000 merge)
+	set autolist = ambiguous
+	# Use history to aid expansion
+	set autoexpand
+	set autorehash
+	set mail = (/var/mail/$USER)
+	if ( $?tcsh ) then
+		bindkey "^W" backward-delete-word
+		bindkey -k up history-search-backward
+		bindkey -k down history-search-forward
+	endif
+
+endif

Modified: projects/clang700-import/bin/sh/Makefile
==============================================================================
--- projects/clang700-import/bin/sh/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/bin/sh/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -3,7 +3,9 @@
 
 .include <src.opts.mk>
 
-CONFS=	profile
+CONFS=	dot.profile profile
+CONFSDIR_dot.profile=	/root
+CONFSNAME_dot.profile=	.profile
 PACKAGE=runtime
 PROG=	sh
 INSTALLFLAGS= -S
@@ -60,5 +62,11 @@ token.h: mktokens
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
+
+beforeinstallconfig:
+	rm -f ${DESTDIR}/.profile
+
+afterinstallconfig:
+	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 
 .include <bsd.prog.mk>

Copied: projects/clang700-import/bin/sh/dot.profile (from r338391, head/bin/sh/dot.profile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang700-import/bin/sh/dot.profile	Wed Aug 29 20:54:56 2018	(r338392, copy of r338391, head/bin/sh/dot.profile)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-xterm}
+export TERM
+PAGER=less
+export PAGER
+
+# Query terminal size; useful for serial lines.
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
+# Uncomment to display a random cookie on each login.
+# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi

Modified: projects/clang700-import/crypto/heimdal/doc/doxyout/krb5/man/man3/krb5.3
==============================================================================
--- projects/clang700-import/crypto/heimdal/doc/doxyout/krb5/man/man3/krb5.3	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/crypto/heimdal/doc/doxyout/krb5/man/man3/krb5.3	Wed Aug 29 20:54:56 2018	(r338392)
@@ -2,9 +2,8 @@
 .ad l
 .nh
 .SH NAME
-Heimdal Kerberos 5 library \- 
-.SS "Functions"
-
+krb5 \- Heimdal Kerberos 5 library
+.SH SYNOPSIS
 .in +1c
 .ti -1c
 .RI "KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL \fBkrb5_add_et_list\fP (krb5_context context, void(*func)(struct et_list **))"

Modified: projects/clang700-import/etc/Makefile
==============================================================================
--- projects/clang700-import/etc/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/etc/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -155,18 +155,6 @@ distribution:
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
 .endif
-	cd ${.CURDIR}/root; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.profile ${DESTDIR}/root/.profile; \
-	    rm -f ${DESTDIR}/.profile; \
-	    ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
-.if ${MK_TCSH} != "no"
-	cd ${.CURDIR}/root; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.cshrc ${DESTDIR}/root/.cshrc; \
-	    rm -f ${DESTDIR}/.cshrc; \
-	    ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
-.endif
 
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \

Modified: projects/clang700-import/include/stdlib.h
==============================================================================
--- projects/clang700-import/include/stdlib.h	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/include/stdlib.h	Wed Aug 29 20:54:56 2018	(r338392)
@@ -254,12 +254,6 @@ void	 arc4random_buf(void *, size_t);
 __uint32_t 
 	 arc4random_uniform(__uint32_t);
 
-#if !defined(BURN_BRIDGES)
-/* Deprecated arc4random() functions */
-#define arc4random_stir()
-#define arc4random_addrandom(a,b)
-#endif
-
 #ifdef __BLOCKS__
 int	 atexit_b(void (^ _Nonnull)(void));
 void	*bsearch_b(const void *, const void *, size_t,

Modified: projects/clang700-import/lib/libbe/Makefile
==============================================================================
--- projects/clang700-import/lib/libbe/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/lib/libbe/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -2,6 +2,7 @@
 
 PACKAGE=	lib${LIB}
 LIB=		be
+SHLIBDIR?= /lib
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 

Modified: projects/clang700-import/lib/libbe/be.c
==============================================================================
--- projects/clang700-import/lib/libbe/be.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/lib/libbe/be.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -623,10 +623,6 @@ be_rename(libbe_handle_t *lbh, const char *old, const 
 	if ((err = be_root_concat(lbh, new, full_new)) != 0)
 		return (set_error(lbh, err));
 
-	/* Check if old is active BE */
-	if (strcmp(full_old, be_active_path(lbh)) == 0)
-		return (set_error(lbh, BE_ERR_MOUNTED));
-
 	if (!zfs_dataset_exists(lbh->lzh, full_old, ZFS_TYPE_DATASET))
 		return (set_error(lbh, BE_ERR_NOENT));
 
@@ -637,14 +633,10 @@ be_rename(libbe_handle_t *lbh, const char *old, const 
 	    ZFS_TYPE_FILESYSTEM)) == NULL)
 		return (set_error(lbh, BE_ERR_ZFSOPEN));
 
-	/* XXX TODO: Allow a force flag */
-	if (zfs_is_mounted(zfs_hdl, NULL)) {
-		zfs_close(zfs_hdl);
-		return (set_error(lbh, BE_ERR_MOUNTED));
-	}
-
 	/* recurse, nounmount, forceunmount */
-	struct renameflags flags = { 0, 0, 0 };
+	struct renameflags flags = {
+		.nounmount = 1,
+	};
 
 	err = zfs_rename(zfs_hdl, NULL, full_new, flags);
 

Modified: projects/clang700-import/lib/libbe/libbe.3
==============================================================================
--- projects/clang700-import/lib/libbe/libbe.3	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/lib/libbe/libbe.3	Wed Aug 29 20:54:56 2018	(r338392)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 16, 2018
+.Dd August 24, 2018
 .Dt LIBBE 3
 .Os
 .Sh NAME
@@ -222,7 +222,12 @@ snapshot.
 .Pp
 The
 .Fn be_rename
-function renames a boot environment.
+function renames a boot environment without unmounting it, as if renamed with
+the
+.Fl u
+argument were passed to
+.Nm zfs
+.Cm rename
 .Pp
 The
 .Fn be_activate

Modified: projects/clang700-import/lib/libmd/Makefile
==============================================================================
--- projects/clang700-import/lib/libmd/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/lib/libmd/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
+SHLIBDIR?= /lib
+
 .include <src.opts.mk>
 
 PACKAGE=lib${LIB}
 LIB=	md
 SHLIB_MAJOR= 6
-SHLIBDIR?= /lib
 SRCS=	md4c.c md5c.c md4hl.c md5hl.c \
 	rmd160c.c rmd160hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c \

Modified: projects/clang700-import/libexec/rtld-elf/arm/reloc.c
==============================================================================
--- projects/clang700-import/libexec/rtld-elf/arm/reloc.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/libexec/rtld-elf/arm/reloc.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -324,9 +324,7 @@ reloc_nonplt_object(Obj_Entry *obj, const Elf_Rel *rel
 			if (!defobj->tls_done && allocate_tls_offset(obj))
 				return -1;
 
-			/* XXX: FIXME */
-			tmp = (Elf_Addr)def->st_value + defobj->tlsoffset +
-			    TLS_TCB_SIZE;
+			tmp = (Elf_Addr)def->st_value + defobj->tlsoffset;
 			if (__predict_true(RELOC_ALIGNED_P(where)))
 				*where = tmp;
 			else

Modified: projects/clang700-import/release/tools/ec2.conf
==============================================================================
--- projects/clang700-import/release/tools/ec2.conf	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/release/tools/ec2.conf	Wed Aug 29 20:54:56 2018	(r338392)
@@ -68,6 +68,13 @@ vm_extra_pre_umount() {
 	echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
 	echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf
 
+	# The emulated keyboard attached to EC2 instances is inaccessible to
+	# users, and there is no mouse attached at all; disable to keyboard
+	# and the keyboard controller (to which the mouse would attach, if
+	# one existed) in order to save time in device probing.
+	echo 'hint.atkbd.0.disabled=1' >> ${DESTDIR}/boot/loader.conf
+	echo 'hint.atkbdc.0.disabled=1' >> ${DESTDIR}/boot/loader.conf
+
 	# EC2 has two consoles: An emulated serial port ("system log"),
 	# which has been present since 2006; and a VGA console ("instance
 	# screenshot") which was introduced in 2016.

Modified: projects/clang700-import/sbin/bectl/bectl.8
==============================================================================
--- projects/clang700-import/sbin/bectl/bectl.8	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sbin/bectl/bectl.8	Wed Aug 29 20:54:56 2018	(r338392)
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 22, 2018
+.Dd August 24, 2018
 .Dt BECTL 8
 .Os
 .Sh NAME
@@ -132,7 +132,8 @@ Destroys the given
 .Ar beName
 boot environment or
 .Ar beName at snapshot
-snapshot.
+snapshot without confirmation, unlike in
+.Nm beadm .
 Specifying
 .Fl F
 will automatically unmount without confirmation.
@@ -239,10 +240,11 @@ Mount at the specified
 .Ar mountpoint
 if provided.
 .It Cm rename Ar origBeName newBeName
-Renames the given nonactive
+Renames the given
 .Ar origBeName
 to the given
 .Ar newBeName .
+The boot environment will not be unmounted in order for this rename to occur.
 .It Cm unjail Brq Ar jailID | jailName | beName
 Destroys the jail created from the given boot environment.
 .It Xo

Modified: projects/clang700-import/sbin/bectl/bectl.c
==============================================================================
--- projects/clang700-import/sbin/bectl/bectl.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sbin/bectl/bectl.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -491,10 +491,8 @@ main(int argc, char *argv[])
 	const char *command;
 	int command_index, rc;
 
-	if (argc < 2) {
-		fprintf(stderr, "missing command\n");
+	if (argc < 2)
 		return (usage(false));
-	}
 
 	command = argv[1];
 

Modified: projects/clang700-import/sbin/devmatch/devmatch.c
==============================================================================
--- projects/clang700-import/sbin/devmatch/devmatch.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sbin/devmatch/devmatch.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -386,7 +386,7 @@ search_hints(const char *bus, const char *dev, const c
 						if (all_flag)
 							printf("%s: %s", *dev ? dev : "unattached", lastmod);
 						else
-							printf("%s", lastmod);
+							printf("%s\n", lastmod);
 						if (verbose_flag)
 							printf("Matches --- %s ---\n", lastmod);
 					}

Modified: projects/clang700-import/share/man/man4/random.4
==============================================================================
--- projects/clang700-import/share/man/man4/random.4	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/share/man/man4/random.4	Wed Aug 29 20:54:56 2018	(r338392)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 17, 2015
+.Dd August 26, 2018
 .Dt RANDOM 4
 .Os
 .Sh NAME
@@ -153,26 +153,15 @@ the
 device is not created
 until an "algorithm module"
 is loaded.
-Two of these modules
-are built by default,
-.Em random_fortuna
-and
-.Em random_yarrow .
+The only module built by default is
+.Em random_fortuna .
 The
 .Em random_yarrow
-module is deprecated,
-and will be removed in
-.Fx 12.
-Use of the Yarrow algorithm
-is not encouraged,
-but while still present
-in the kernel source,
-it can be selected with the
-.Cd "options RANDOM_YARROW"
-kernel option.
-Note that these loadable modules
-are slightly less efficient
-than their compiled-in equivalents.
+module was removed in
+.Fx 12 .
+Note that this loadable module
+is slightly less efficient
+than its compiled-in equivalent.
 This is because some functions
 must be locked against
 load and unload events,
@@ -351,4 +340,4 @@ introduced in
 The Yarrow algorithm
 is no longer supported
 by its authors,
-and is therefore deprecated.
+and is therefore no longer available.

Modified: projects/clang700-import/share/man/man5/src.conf.5
==============================================================================
--- projects/clang700-import/share/man/man5/src.conf.5	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/share/man/man5/src.conf.5	Wed Aug 29 20:54:56 2018	(r338392)
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd August 16, 2018
+.Dd August 28, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1184,8 +1184,14 @@ Enable firewire support in /boot/loader on x86. This o
 on all other platforms.
 .It Va WITHOUT_LOADER_GELI
 Disable inclusion of GELI crypto support in the boot chain binaries.
+.Pp
+This is a default setting on
+sparc64/sparc64.
 .It Va WITH_LOADER_LUA
 Set to build LUA bindings for the boot loader.
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
 .It Va WITHOUT_LOADER_OFW
 Disable building of openfirmware bootloader components.
 .Pp
@@ -1342,6 +1348,11 @@ Set to build
 .Pp
 This is a default setting on
 amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and sparc64/sparc64.
+.It Va WITHOUT_MODULE_DRM
+Disable creation of old drm video modules.
+
+.It Va WITHOUT_MODULE_DRM2
+Disable creation of old drm2 video modules.
 .It Va WITH_NAND
 Set to build the NAND Flash components.
 .It Va WITHOUT_NDIS

Modified: projects/clang700-import/share/man/man9/random_harvest.9
==============================================================================
--- projects/clang700-import/share/man/man9/random_harvest.9	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/share/man/man9/random_harvest.9	Wed Aug 29 20:54:56 2018	(r338392)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 13, 2015
+.Dd August 26, 2018
 .Dt RANDOM_HARVEST 9
 .Os
 .Sh NAME
@@ -38,21 +38,18 @@
 .Fo random_harvest_direct
 .Fa "void *entropy"
 .Fa "u_int size"
-.Fa "u_int bits"
 .Fa "enum esource source"
 .Fc
 .Ft void
 .Fo random_harvest_fast
 .Fa "void *entropy"
 .Fa "u_int size"
-.Fa "u_int bits"
 .Fa "enum esource source"
 .Fc
 .Ft void
 .Fo random_harvest_queue
 .Fa "void *entropy"
 .Fa "u_int size"
-.Fa "u_int bits"
 .Fa "enum esource source"
 .Fc
 .Sh DESCRIPTION
@@ -107,18 +104,6 @@ and is the default
 choice for most entropy sources
 such as interrupts
 or console events.
-.Pp
-The
-.Fa bits
-argument is only used
-by the deprecated Yarrow algorithm.
-For compatibility,
-the caller should
-.Em "very conservatively"
-estimate the number of random bits
-in the sample,
-and pass this in
-.Fa bits .
 .Pp
 Interrupt harvesting has been
 in part simplified

Modified: projects/clang700-import/share/mk/bsd.confs.mk
==============================================================================
--- projects/clang700-import/share/mk/bsd.confs.mk	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/share/mk/bsd.confs.mk	Wed Aug 29 20:54:56 2018	(r338392)
@@ -29,8 +29,11 @@ all: buildconfig
 .      if !target(afterinstallconfig)
 afterinstallconfig:
 .      endif
-installconfig:	realinstallconfig afterinstallconfig
-.ORDER:		realinstallconfig afterinstallconfig
+.      if !target(beforeinstallconfig)
+beforeinstallconfig:
+.      endif
+installconfig:	beforeinstallconfig realinstallconfig afterinstallconfig
+.ORDER:		beforeinstallconfig realinstallconfig afterinstallconfig
 
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}

Modified: projects/clang700-import/stand/defaults/loader.conf.5
==============================================================================
--- projects/clang700-import/stand/defaults/loader.conf.5	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/stand/defaults/loader.conf.5	Wed Aug 29 20:54:56 2018	(r338392)
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd March 23, 2018
+.Dd August 28, 2018
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -289,6 +289,29 @@ See the entropy entries in
 .Pq Dq /boot/entropy
 The name of the very early
 boot-time entropy cache file.
+.It Va cpu_microcode_load
+.Pq Dq NO
+If set to
+.Dq YES ,
+the microcode update file specified by
+.Va cpu_microcode_name
+will be loaded and applied very early during boot.
+This provides functionality similar to
+.Xr cpucontrol 8
+but ensures that CPU features enabled by microcode updates can be
+used by the kernel.
+The update will be re-applied automatically when resuming from an
+ACPI sleep state.
+If the update file contains updates for multiple processor models,
+the kernel will search for and extract a matching update.
+Currently this setting is supported only on Intel
+.Dv i386
+and
+.Dv amd64
+processors.
+It has no effect on other processor types.
+.It Va cpu_microcode_name
+A path to a microcode update file.
 .El
 .Sh OTHER SETTINGS
 Other settings that may be used in
@@ -319,6 +342,7 @@ machine-specific settings for sites with a common load
 .Sh SEE ALSO
 .Xr rc.conf 5 ,
 .Xr boot 8 ,
+.Xr cpucontrol 8 ,
 .Xr loader 8 ,
 .Xr loader.4th 8
 .Sh HISTORY

Modified: projects/clang700-import/stand/efi/boot1/Makefile
==============================================================================
--- projects/clang700-import/stand/efi/boot1/Makefile	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/stand/efi/boot1/Makefile	Wed Aug 29 20:54:56 2018	(r338392)
@@ -6,6 +6,7 @@ PROG=		boot1.sym
 INTERNALPROG=
 WARNS?=		6
 
+CFLAGS+=	-DEFI_BOOT1
 # We implement a slightly non-standard %S in that it always takes a
 # CHAR16 that's common in UEFI-land instead of a wchar_t. This only
 # seems to matter on arm64 where wchar_t defaults to an int instead

Modified: projects/clang700-import/stand/efi/loader/arch/arm64/start.S
==============================================================================
--- projects/clang700-import/stand/efi/loader/arch/arm64/start.S	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/stand/efi/loader/arch/arm64/start.S	Wed Aug 29 20:54:56 2018	(r338392)
@@ -160,6 +160,23 @@ _start:
 
 	ldp	x0, x1, [sp], #16
 
+#ifndef EFI_BOOT1
+	/*
+	 * Load the stack to use. The default stack may be too small for
+	 * the lua loader.
+	 */
+	adr	x2, initstack_end
+	mov	sp, x2
+#endif
+
 	bl	efi_main
 
 1:	b	1b
+
+#ifndef EFI_BOOT1
+.bss
+	.align	4
+initstack:
+	.space	(64 * 1024)
+initstack_end:
+#endif

Modified: projects/clang700-import/stand/lua/config.lua
==============================================================================
--- projects/clang700-import/stand/lua/config.lua	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/stand/lua/config.lua	Wed Aug 29 20:54:56 2018	(r338392)
@@ -479,6 +479,21 @@ function config.loadKernel(other_kernel)
 		return nil
 	end
 
+	local function getModulePath()
+		local module_path = loader.getenv("module_path")
+		local kernel_path = loader.getenv("kernel_path")
+
+		if kernel_path == nil then
+			return module_path
+		end
+
+		-- Strip the loaded kernel path from module_path. This currently assumes
+		-- that the kernel path will be prepended to the module_path when it's
+		-- found.
+		kernel_path = escapeName(kernel_path .. ';')
+		return module_path:gsub(kernel_path, '')
+	end
+
 	local function loadBootfile()
 		local bootfile = loader.getenv("bootfile")
 
@@ -507,7 +522,7 @@ function config.loadKernel(other_kernel)
 	else
 		-- Use our cached module_path, so we don't end up with multiple
 		-- automatically added kernel paths to our final module_path
-		local module_path = config.module_path
+		local module_path = getModulePath()
 		local res
 
 		if other_kernel ~= nil then
@@ -527,6 +542,7 @@ function config.loadKernel(other_kernel)
 				if module_path ~= nil then
 					loader.setenv("module_path", v .. ";" ..
 					    module_path)
+					loader.setenv("kernel_path", v)
 				end
 				return true
 			end
@@ -563,8 +579,6 @@ function config.load(file, reloading)
 
 	checkNextboot()
 
-	-- Cache the provided module_path at load time for later use
-	config.module_path = loader.getenv("module_path")
 	local verbose = loader.getenv("verbose_loading") or "no"
 	config.verbose = verbose:lower() == "yes"
 	if not reloading then

Modified: projects/clang700-import/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/clang700-import/sys/amd64/amd64/mp_machdep.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/amd64/amd64/mp_machdep.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
 #include <x86/apicreg.h>
@@ -87,6 +86,8 @@ __FBSDID("$FreeBSD$");
 
 #define GiB(v)			(v ## ULL << 30)
 
+#define	AP_BOOTPT_SZ		(PAGE_SIZE * 3)
+
 extern	struct pcpu __pcpu[];
 
 /* Temporary variables for init_secondary()  */
@@ -101,45 +102,79 @@ char *dbg_stack;
 
 static int	start_ap(int apic_id);
 
+static bool
+is_kernel_paddr(vm_paddr_t pa)
+{
+
+	return (pa >= trunc_2mpage(btext - KERNBASE) &&
+	   pa < round_page(_end - KERNBASE));
+}
+
+static bool
+is_mpboot_good(vm_paddr_t start, vm_paddr_t end)
+{
+
+	return (start + AP_BOOTPT_SZ <= GiB(4) && atop(end) < Maxmem);
+}
+
 /*
  * Calculate usable address in base memory for AP trampoline code.
  */
 void
 mp_bootaddress(vm_paddr_t *physmap, unsigned int *physmap_idx)
 {
+	vm_paddr_t start, end;
 	unsigned int i;
 	bool allocated;
 
 	alloc_ap_trampoline(physmap, physmap_idx);
 
+	/*
+	 * Find a memory region big enough below the 4GB boundary to
+	 * store the initial page tables.  Region must be mapped by
+	 * the direct map.
+	 *
+	 * Note that it needs to be aligned to a page boundary.
+	 */
 	allocated = false;
 	for (i = *physmap_idx; i <= *physmap_idx; i -= 2) {
 		/*
-		 * Find a memory region big enough below the 4GB
-		 * boundary to store the initial page tables.  Region
-		 * must be mapped by the direct map.
-		 *
-		 * Note that it needs to be aligned to a page
-		 * boundary.
+		 * First, try to chomp at the start of the physmap region.
+		 * Kernel binary might claim it already.
 		 */
-		if (physmap[i] >= GiB(4) || physmap[i + 1] -
-		    round_page(physmap[i]) < PAGE_SIZE * 3 ||
-		    atop(physmap[i + 1]) > Maxmem)
-			continue;
+		start = round_page(physmap[i]);
+		end = start + AP_BOOTPT_SZ;
+		if (start < end && end <= physmap[i + 1] &&
+		    is_mpboot_good(start, end) &&
+		    !is_kernel_paddr(start) && !is_kernel_paddr(end - 1)) {
+			allocated = true;
+			physmap[i] = end;
+			break;
+		}
 
-		allocated = true;
-		mptramp_pagetables = round_page(physmap[i]);
-		physmap[i] = round_page(physmap[i]) + (PAGE_SIZE * 3);
+		/*
+		 * Second, try to chomp at the end.  Again, check
+		 * against kernel.
+		 */
+		end = trunc_page(physmap[i + 1]);
+		start = end - AP_BOOTPT_SZ;
+		if (start < end && start >= physmap[i] &&
+		    is_mpboot_good(start, end) &&
+		    !is_kernel_paddr(start) && !is_kernel_paddr(end - 1)) {
+			allocated = true;
+			physmap[i + 1] = start;
+			break;
+		}
+	}
+	if (allocated) {
+		mptramp_pagetables = start;
 		if (physmap[i] == physmap[i + 1] && *physmap_idx != 0) {
 			memmove(&physmap[i], &physmap[i + 2],
 			    sizeof(*physmap) * (*physmap_idx - i + 2));
 			*physmap_idx -= 2;
 		}
-		break;
-	}
-
-	if (!allocated) {
-		mptramp_pagetables = trunc_page(boot_address) - (PAGE_SIZE * 3);
+	} else {
+		mptramp_pagetables = trunc_page(boot_address) - AP_BOOTPT_SZ;
 		if (bootverbose)
 			printf(
 "Cannot find enough space for the initial AP page tables, placing them at %#x",
@@ -343,7 +378,6 @@ init_secondary(void)
 	while (atomic_load_acq_int(&aps_ready) == 0)
 		ia32_pause();
 
-	pmap_activate_boot(vmspace_pmap(proc0.p_vmspace));
 	init_secondary_tail();
 }
 

Modified: projects/clang700-import/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/clang700-import/sys/amd64/amd64/pmap.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/amd64/amd64/pmap.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -3094,8 +3094,8 @@ pmap_growkernel(vm_offset_t addr)
 		return;
 
 	addr = roundup2(addr, NBPDR);
-	if (addr - 1 >= kernel_map->max_offset)
-		addr = kernel_map->max_offset;
+	if (addr - 1 >= vm_map_max(kernel_map))
+		addr = vm_map_max(kernel_map);
 	while (kernel_vm_end < addr) {
 		pdpe = pmap_pdpe(kernel_pmap, kernel_vm_end);
 		if ((*pdpe & X86_PG_V) == 0) {
@@ -3115,8 +3115,8 @@ pmap_growkernel(vm_offset_t addr)
 		pde = pmap_pdpe_to_pde(pdpe, kernel_vm_end);
 		if ((*pde & X86_PG_V) != 0) {
 			kernel_vm_end = (kernel_vm_end + NBPDR) & ~PDRMASK;
-			if (kernel_vm_end - 1 >= kernel_map->max_offset) {
-				kernel_vm_end = kernel_map->max_offset;
+			if (kernel_vm_end - 1 >= vm_map_max(kernel_map)) {
+				kernel_vm_end = vm_map_max(kernel_map);
 				break;                       
 			}
 			continue;
@@ -3134,8 +3134,8 @@ pmap_growkernel(vm_offset_t addr)
 		pde_store(pde, newpdir);
 
 		kernel_vm_end = (kernel_vm_end + NBPDR) & ~PDRMASK;
-		if (kernel_vm_end - 1 >= kernel_map->max_offset) {
-			kernel_vm_end = kernel_map->max_offset;
+		if (kernel_vm_end - 1 >= vm_map_max(kernel_map)) {
+			kernel_vm_end = vm_map_max(kernel_map);
 			break;                       
 		}
 	}

Modified: projects/clang700-import/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- projects/clang700-import/sys/amd64/amd64/sys_machdep.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/amd64/amd64/sys_machdep.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -479,7 +479,7 @@ user_ldt_alloc(struct proc *p, int force)
 	pldt = mdp->md_ldt;
 	if (pldt != NULL && !force) {
 		pmap_pti_remove_kva(sva, sva + sz);
-		kmem_free(kernel_arena, sva, sz);
+		kmem_free(sva, sz);
 		free(new_ldt, M_SUBPROC);
 		return (pldt);
 	}
@@ -533,7 +533,7 @@ user_ldt_derefl(struct proc_ldt *pldt)
 		sva = (vm_offset_t)pldt->ldt_base;
 		sz = max_ldt_segment * sizeof(struct user_segment_descriptor);
 		pmap_pti_remove_kva(sva, sva + sz);
-		kmem_free(kernel_arena, sva, sz);
+		kmem_free(sva, sz);
 		free(pldt, M_SUBPROC);
 	}
 }

Modified: projects/clang700-import/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- projects/clang700-import/sys/amd64/amd64/vm_machdep.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/amd64/amd64/vm_machdep.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -331,8 +331,7 @@ cpu_thread_clean(struct thread *td)
 	if (pcb->pcb_tssp != NULL) {
 		pmap_pti_remove_kva((vm_offset_t)pcb->pcb_tssp,
 		    (vm_offset_t)pcb->pcb_tssp + ctob(IOPAGES + 1));
-		kmem_free(kernel_arena, (vm_offset_t)pcb->pcb_tssp,
-		    ctob(IOPAGES + 1));
+		kmem_free((vm_offset_t)pcb->pcb_tssp, ctob(IOPAGES + 1));
 		pcb->pcb_tssp = NULL;
 	}
 }

Modified: projects/clang700-import/sys/arm/allwinner/a10_fb.c
==============================================================================
--- projects/clang700-import/sys/arm/allwinner/a10_fb.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/allwinner/a10_fb.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -192,7 +192,7 @@ a10fb_allocfb(struct a10fb_softc *sc)
 static void
 a10fb_freefb(struct a10fb_softc *sc)
 {
-	kmem_free(kernel_arena, sc->vaddr, sc->fbsize);
+	kmem_free(sc->vaddr, sc->fbsize);
 }
 
 static int

Modified: projects/clang700-import/sys/arm/amlogic/aml8726/aml8726_rng.c
==============================================================================
--- projects/clang700-import/sys/arm/amlogic/aml8726/aml8726_rng.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/amlogic/aml8726/aml8726_rng.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -75,8 +75,7 @@ aml8726_rng_harvest(void *arg)
 	rn[0] = CSR_READ_4(sc, AML_RNG_0_REG);
 	rn[1] = CSR_READ_4(sc, AML_RNG_1_REG);
 
-	random_harvest(rn, sizeof(rn), sizeof(rn) * NBBY / 2,
-	    RANDOM_PURE_AML8726);
+	random_harvest(rn, sizeof(rn), RANDOM_PURE_AML8726);
 
 	callout_reset(&sc->co, sc->ticks, aml8726_rng_harvest, sc);
 }

Modified: projects/clang700-import/sys/arm/arm/busdma_machdep-v4.c
==============================================================================
--- projects/clang700-import/sys/arm/arm/busdma_machdep-v4.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/arm/busdma_machdep-v4.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -792,7 +792,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_d
 	    !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr))
 		uma_zfree(bufzone->umazone, vaddr);
 	else
-		kmem_free(kernel_arena, (vm_offset_t)vaddr, dmat->maxsize);
+		kmem_free((vm_offset_t)vaddr, dmat->maxsize);
 
 	dmat->map_count--;
 	if (map->flags & DMAMAP_COHERENT)

Modified: projects/clang700-import/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/clang700-import/sys/arm/arm/busdma_machdep-v6.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/arm/busdma_machdep-v6.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -858,7 +858,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_d
 	    !exclusion_bounce(dmat))
 		uma_zfree(bufzone->umazone, vaddr);
 	else
-		kmem_free(kernel_arena, (vm_offset_t)vaddr, dmat->maxsize);
+		kmem_free((vm_offset_t)vaddr, dmat->maxsize);
 
 	dmat->map_count--;
 	if (map->flags & DMAMAP_COHERENT)

Modified: projects/clang700-import/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/clang700-import/sys/arm/arm/pmap-v6.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/arm/pmap-v6.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -2043,21 +2043,21 @@ pmap_growkernel(vm_offset_t addr)
 	 *       not called, it could be first unused KVA (which is not
 	 *       rounded up to PTE1_SIZE),
 	 *
-	 *   (2) when all KVA space is mapped and kernel_map->max_offset
+	 *   (2) when all KVA space is mapped and vm_map_max(kernel_map)
 	 *       address is not rounded up to PTE1_SIZE. (For example,
 	 *       it could be 0xFFFFFFFF.)
 	 */
 	kernel_vm_end = pte1_roundup(kernel_vm_end);
 	mtx_assert(&kernel_map->system_mtx, MA_OWNED);
 	addr = roundup2(addr, PTE1_SIZE);
-	if (addr - 1 >= kernel_map->max_offset)
-		addr = kernel_map->max_offset;
+	if (addr - 1 >= vm_map_max(kernel_map))
+		addr = vm_map_max(kernel_map);
 	while (kernel_vm_end < addr) {
 		pte1 = pte1_load(kern_pte1(kernel_vm_end));
 		if (pte1_is_valid(pte1)) {
 			kernel_vm_end += PTE1_SIZE;
-			if (kernel_vm_end - 1 >= kernel_map->max_offset) {
-				kernel_vm_end = kernel_map->max_offset;
+			if (kernel_vm_end - 1 >= vm_map_max(kernel_map)) {
+				kernel_vm_end = vm_map_max(kernel_map);
 				break;
 			}
 			continue;
@@ -2099,8 +2099,8 @@ pmap_growkernel(vm_offset_t addr)
 		pmap_kenter_pte1(kernel_vm_end, PTE1_LINK(pt2_pa));
 
 		kernel_vm_end = kernel_vm_end_new;
-		if (kernel_vm_end - 1 >= kernel_map->max_offset) {
-			kernel_vm_end = kernel_map->max_offset;
+		if (kernel_vm_end - 1 >= vm_map_max(kernel_map)) {
+			kernel_vm_end = vm_map_max(kernel_map);
 			break;
 		}
 	}
@@ -2242,8 +2242,7 @@ pmap_pinit(pmap_t pmap)
 			 *      UMA_ZONE_NOFREE flag, it's important to leave
 			 *      no allocation in pmap if initialization failed.
 			 */
-			kmem_free(kernel_arena, (vm_offset_t)pmap->pm_pt1,
-			    NB_IN_PT1);
+			kmem_free((vm_offset_t)pmap->pm_pt1, NB_IN_PT1);
 			pmap->pm_pt1 = NULL;
 			return (0);
 		}

Modified: projects/clang700-import/sys/arm/arm/vfp.c
==============================================================================
--- projects/clang700-import/sys/arm/arm/vfp.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/arm/vfp.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -293,7 +293,7 @@ vfp_store(struct vfp_state *vfpsave, boolean_t disable
 		    " .fpu	vfpv3\n"
 		    " vstmia	%0!, {d0-d15}\n"	/* d0-d15 */
 		    " cmp	%1, #0\n"		/* -D16 or -D32? */
-		    " vstmiane	r0!, {d16-d31}\n"	/* d16-d31 */
+		    " vstmiane	%0!, {d16-d31}\n"	/* d16-d31 */
 		    " addeq	%0, %0, #128\n"		/* skip missing regs */
 		    : "+&r" (vfpsave) : "r" (is_d32) : "cc"
 		    );

Modified: projects/clang700-import/sys/arm/broadcom/bcm2835/bcm2835_rng.c
==============================================================================
--- projects/clang700-import/sys/arm/broadcom/bcm2835/bcm2835_rng.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/broadcom/bcm2835/bcm2835_rng.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -289,8 +289,7 @@ bcm2835_rng_harvest(void *arg)
 
 	cnt = nread * sizeof(uint32_t);
 	if (cnt > 0)
-		random_harvest_queue(sc->sc_buf, cnt, cnt * NBBY / 2,
-		    RANDOM_PURE_BROADCOM);
+		random_harvest_queue(sc->sc_buf, cnt, RANDOM_PURE_BROADCOM);
 
 	callout_reset(&sc->sc_rngto, RNG_CALLOUT_TICKS, bcm2835_rng_harvest, sc);
 }

Modified: projects/clang700-import/sys/arm/freescale/imx/imx6_sdma.c
==============================================================================
--- projects/clang700-import/sys/arm/freescale/imx/imx6_sdma.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/freescale/imx/imx6_sdma.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -196,8 +196,7 @@ sdma_free(int chn)
 	channel = &sc->channel[chn];
 	channel->in_use = 0;
 
-	kmem_free(kernel_arena, (vm_offset_t)channel->bd,
-			PAGE_SIZE);
+	kmem_free((vm_offset_t)channel->bd, PAGE_SIZE);
 
 	return (0);
 }

Modified: projects/clang700-import/sys/arm/nvidia/tegra_sdhci.c
==============================================================================
--- projects/clang700-import/sys/arm/nvidia/tegra_sdhci.c	Wed Aug 29 20:53:24 2018	(r338391)
+++ projects/clang700-import/sys/arm/nvidia/tegra_sdhci.c	Wed Aug 29 20:54:56 2018	(r338392)
@@ -465,7 +465,7 @@ static DEFINE_CLASS_0(sdhci, tegra_sdhci_driver, tegra
     sizeof(struct tegra_sdhci_softc));
 DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, tegra_sdhci_devclass,
     NULL, NULL);
-#ifndef MMCCAM
 MODULE_DEPEND(sdhci_tegra, sdhci, 1, 1, 1);
+#ifndef MMCCAM

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