svn commit: r304700 - in projects/clang390-import: . crypto/heimdal/lib/hx509 crypto/openssl/crypto/bn/asm crypto/openssl/crypto/sha/asm lib lib/libc/stdio lib/libpam/modules/pam_ssh release/doc/en...

Dimitry Andric dim at FreeBSD.org
Tue Aug 23 19:55:11 UTC 2016 

Author: dim
Date: Tue Aug 23 19:55:02 2016
New Revision: 304700
URL: https://svnweb.freebsd.org/changeset/base/304700

Log:
  Merge ^/head r304537 through r304699.

Added:
  projects/clang390-import/secure/lib/libcrypto/arm/
     - copied from r304699, head/secure/lib/libcrypto/arm/
  projects/clang390-import/sys/compat/cloudabi/cloudabi_vdso.lds
     - copied unchanged from r304699, head/sys/compat/cloudabi/cloudabi_vdso.lds
  projects/clang390-import/sys/compat/cloudabi32/
     - copied from r304699, head/sys/compat/cloudabi32/
  projects/clang390-import/sys/contrib/cloudabi/cloudabi32_types.h
     - copied unchanged from r304699, head/sys/contrib/cloudabi/cloudabi32_types.h
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
     - copied unchanged from r304699, head/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_i686.S
     - copied unchanged from r304699, head/sys/contrib/cloudabi/cloudabi_vdso_i686.S
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
     - copied unchanged from r304699, head/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
  projects/clang390-import/sys/contrib/cloudabi/syscalls32.master
     - copied unchanged from r304699, head/sys/contrib/cloudabi/syscalls32.master
  projects/clang390-import/sys/i386/cloudabi32/
     - copied from r304699, head/sys/i386/cloudabi32/
  projects/clang390-import/sys/net/rndis.h
     - copied unchanged from r304699, head/sys/net/rndis.h
Deleted:
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_aarch64.c
  projects/clang390-import/sys/contrib/cloudabi/cloudabi_vdso_x86_64.c
Modified:
  projects/clang390-import/Makefile.inc1
  projects/clang390-import/Makefile.libcompat
  projects/clang390-import/crypto/heimdal/lib/hx509/version-script.map
  projects/clang390-import/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
  projects/clang390-import/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
  projects/clang390-import/lib/Makefile
  projects/clang390-import/lib/libc/stdio/fgetwc.c
  projects/clang390-import/lib/libc/stdio/fgetwln.c
  projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.8
  projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.c
  projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/clang390-import/sbin/ipfw/ipfw.8
  projects/clang390-import/sbin/resolvconf/Makefile
  projects/clang390-import/secure/lib/libcrypto/Makefile
  projects/clang390-import/secure/lib/libcrypto/Makefile.asm
  projects/clang390-import/secure/lib/libcrypto/Makefile.inc
  projects/clang390-import/secure/lib/libcrypto/amd64/aes-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/aesni-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/bsaes-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/cmll-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/ghash-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/md5-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/rc4-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-avx2.S
  projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/sha1-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/sha256-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/sha512-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/vpaes-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/wp-x86_64.S
  projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-gf2m.S
  projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont.S
  projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont5.S
  projects/clang390-import/secure/lib/libcrypto/amd64/x86_64cpuid.S
  projects/clang390-import/secure/lib/libcrypto/i386/aes-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/aesni-x86.S
  projects/clang390-import/secure/lib/libcrypto/i386/bf-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/bf-686.S
  projects/clang390-import/secure/lib/libcrypto/i386/bn-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/cmll-x86.S
  projects/clang390-import/secure/lib/libcrypto/i386/co-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/crypt586.S
  projects/clang390-import/secure/lib/libcrypto/i386/des-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/ghash-x86.S
  projects/clang390-import/secure/lib/libcrypto/i386/md5-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/rc4-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/rc5-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/rmd-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/sha1-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/sha256-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/sha512-586.S
  projects/clang390-import/secure/lib/libcrypto/i386/vpaes-x86.S
  projects/clang390-import/secure/lib/libcrypto/i386/wp-mmx.S
  projects/clang390-import/secure/lib/libcrypto/i386/x86-gf2m.S
  projects/clang390-import/secure/lib/libcrypto/i386/x86-mont.S
  projects/clang390-import/secure/lib/libcrypto/i386/x86cpuid.S
  projects/clang390-import/share/i18n/esdb/Makefile.part
  projects/clang390-import/share/man/man4/alc.4
  projects/clang390-import/share/man/man4/man4.i386/ep.4
  projects/clang390-import/share/man/man4/sn.4
  projects/clang390-import/share/man/man5/src.conf.5
  projects/clang390-import/share/mk/bsd.dep.mk
  projects/clang390-import/share/mk/bsd.obj.mk
  projects/clang390-import/share/mk/bsd.subdir.mk
  projects/clang390-import/share/mk/src.opts.mk
  projects/clang390-import/sys/amd64/include/intr_machdep.h
  projects/clang390-import/sys/arm/allwinner/a10_gpio.c
  projects/clang390-import/sys/arm/allwinner/files.allwinner
  projects/clang390-import/sys/arm/arm/elf_trampoline.c
  projects/clang390-import/sys/arm64/arm64/gic_v3.c
  projects/clang390-import/sys/arm64/arm64/pmap.c
  projects/clang390-import/sys/arm64/arm64/trap.c
  projects/clang390-import/sys/boot/common/dev_net.c
  projects/clang390-import/sys/boot/efi/libefi/Makefile
  projects/clang390-import/sys/boot/efi/loader/Makefile
  projects/clang390-import/sys/boot/efi/loader/conf.c
  projects/clang390-import/sys/compat/cloudabi/cloudabi_clock.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_fd.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_poll.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_sock.c
  projects/clang390-import/sys/compat/cloudabi64/cloudabi64_util.h
  projects/clang390-import/sys/conf/NOTES
  projects/clang390-import/sys/conf/files
  projects/clang390-import/sys/conf/files.amd64
  projects/clang390-import/sys/conf/files.arm64
  projects/clang390-import/sys/conf/files.i386
  projects/clang390-import/sys/conf/kern.post.mk
  projects/clang390-import/sys/conf/options
  projects/clang390-import/sys/dev/alc/if_alc.c
  projects/clang390-import/sys/dev/alc/if_alcreg.h
  projects/clang390-import/sys/dev/alc/if_alcvar.h
  projects/clang390-import/sys/dev/bhnd/bhndb/bhndb.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.h
  projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h
  projects/clang390-import/sys/dev/intpm/intpm.c
  projects/clang390-import/sys/dev/ioat/ioat.c
  projects/clang390-import/sys/dev/mlx5/mlx5_en/en.h
  projects/clang390-import/sys/dev/pci/pci.c
  projects/clang390-import/sys/dev/usb/controller/xhci.c
  projects/clang390-import/sys/dev/usb/input/ukbd.c
  projects/clang390-import/sys/dev/usb/net/if_urndis.c
  projects/clang390-import/sys/dev/usb/net/if_urndisreg.h
  projects/clang390-import/sys/i386/conf/NOTES
  projects/clang390-import/sys/i386/include/intr_machdep.h
  projects/clang390-import/sys/kern/kern_prot.c
  projects/clang390-import/sys/kern/vfs_vnops.c
  projects/clang390-import/sys/mips/mips/elf_machdep.c
  projects/clang390-import/sys/modules/cloudabi64/Makefile
  projects/clang390-import/sys/netinet/ip_ipsec.c
  projects/clang390-import/sys/netinet/sctp_output.c
  projects/clang390-import/sys/netinet/sctp_usrreq.c
  projects/clang390-import/sys/netinet/sctputil.c
  projects/clang390-import/sys/netinet/udp_usrreq.c
  projects/clang390-import/sys/netinet6/ip6_ipsec.c
  projects/clang390-import/sys/netinet6/udp6_usrreq.c
  projects/clang390-import/sys/powerpc/booke/pmap.c
  projects/clang390-import/sys/powerpc/powerpc/machdep.c
  projects/clang390-import/sys/security/audit/audit.h
  projects/clang390-import/sys/security/audit/audit_bsm.c
  projects/clang390-import/sys/sys/param.h
  projects/clang390-import/sys/x86/x86/msi.c
  projects/clang390-import/sys/x86/xen/hvm.c
  projects/clang390-import/usr.bin/bsdiff/bspatch/bspatch.c
  projects/clang390-import/usr.bin/getconf/getconf.c
  projects/clang390-import/usr.bin/getconf/pathconf.gperf
  projects/clang390-import/usr.bin/indent/args.c
  projects/clang390-import/usr.bin/indent/indent.c
  projects/clang390-import/usr.bin/indent/io.c
  projects/clang390-import/usr.bin/indent/lexi.c
  projects/clang390-import/usr.bin/indent/parse.c
  projects/clang390-import/usr.sbin/cron/cron/cron.8
  projects/clang390-import/usr.sbin/cron/cron/cron.c
  projects/clang390-import/usr.sbin/ctld/chap.c
  projects/clang390-import/usr.sbin/ctld/keys.c
  projects/clang390-import/usr.sbin/ctld/pdu.c
  projects/clang390-import/usr.sbin/fifolog/lib/fifolog_int.c
  projects/clang390-import/usr.sbin/fifolog/lib/fifolog_reader.c
  projects/clang390-import/usr.sbin/iscsid/chap.c
  projects/clang390-import/usr.sbin/iscsid/keys.c
  projects/clang390-import/usr.sbin/iscsid/pdu.c
  projects/clang390-import/usr.sbin/kldxref/kldxref.c
Directory Properties:
  projects/clang390-import/   (props changed)
  projects/clang390-import/crypto/heimdal/   (props changed)
  projects/clang390-import/crypto/openssl/   (props changed)

Modified: projects/clang390-import/Makefile.inc1
==============================================================================
--- projects/clang390-import/Makefile.inc1	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/Makefile.inc1	Tue Aug 23 19:55:02 2016	(r304700)
@@ -550,8 +550,18 @@ CROSSENV+=	CC="${XCC} ${XCFLAGS}" CXX="$
 BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
-# External compiler needs sysroot and target flags.
-.if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
+
+# The internal bootstrap compiler has a default sysroot set by TOOLS_PREFIX
+# and target set by TARGET/TARGET_ARCH.  However, there are several needs to
+# always pass an explicit --sysroot and -target.
+# - External compiler needs sysroot and target flags.
+# - External ld needs sysroot.
+# - To be clear about the use of a sysroot when using the internal compiler.
+# - Easier debugging.
+# - Allowing WITH_SYSTEM_COMPILER+WITH_META_MODE to work together due to
+#   the flip-flopping build command when sometimes using external and
+#   sometimes using internal.
+# - Allow using lld which has no support for default paths.
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
@@ -562,24 +572,28 @@ TARGET_ABI=	gnueabihf
 TARGET_ABI=	gnueabi
 .endif
 .endif
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+.if ${WANT_COMPILER_TYPE} == gcc || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem and -L when using a cross-compiler.  --sysroot
 # won't set header path and -L is used to ensure the base library path
 # is added before the port PREFIX library path.
 XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+# GCC requires -B to find /usr/lib/crti.o when using a cross-compiler
+# combined with --sysroot.
+XCFLAGS+=	-B${WORLDTMP}/usr/lib
 # Force using libc++ for external GCC.
 # XXX: This should be checking MK_GNUCXX == no
 .if ${X_COMPILER_VERSION} >= 40800
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++ -L${WORLDTMP}/../lib/libc++
 .endif
-.else
+.elif ${WANT_COMPILER_TYPE} == clang || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang)
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd12.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
-.endif # ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}

Modified: projects/clang390-import/Makefile.libcompat
==============================================================================
--- projects/clang390-import/Makefile.libcompat	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/Makefile.libcompat	Tue Aug 23 19:55:02 2016	(r304700)
@@ -73,7 +73,8 @@ LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
 # Clang/GCC.
 LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat}
 
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+.if ${WANT_COMPILER_TYPE} == gcc || \
+    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 # GCC requires -isystem when using a cross-compiler and --sysroot.  Note that
 # Makefile.inc1 only applies this with an external compiler but libcompat
 # always does since even in-tree GCC 4.2 needs this to override the built-in

Modified: projects/clang390-import/crypto/heimdal/lib/hx509/version-script.map
==============================================================================
--- projects/clang390-import/crypto/heimdal/lib/hx509/version-script.map	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/crypto/heimdal/lib/hx509/version-script.map	Tue Aug 23 19:55:02 2016	(r304700)
@@ -23,7 +23,6 @@ HEIMDAL_X509_1.2 {
 		_hx509_request_print;
 		_hx509_request_set_email;
 		_hx509_request_to_pkcs10;
-		_hx509_request_to_pkcs10;
 		_hx509_unmap_file_os;
 		_hx509_write_file;
 		hx509_bitstring_print;

Modified: projects/clang390-import/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
==============================================================================
--- projects/clang390-import/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl	Tue Aug 23 19:55:02 2016	(r304700)
@@ -213,8 +213,8 @@ $code.=<<___;
 .align	5
 .LNEON:
 	ldr		r12, [sp]		@ 5th argument
-	vmov.32		$a, r2, r1
-	vmov.32		$b, r12, r3
+	vmov		$a, r2, r1
+	vmov		$b, r12, r3
 	vmov.i64	$k48, #0x0000ffffffffffff
 	vmov.i64	$k32, #0x00000000ffffffff
 	vmov.i64	$k16, #0x000000000000ffff

Modified: projects/clang390-import/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
==============================================================================
--- projects/clang390-import/crypto/openssl/crypto/sha/asm/sha256-armv4.pl	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/crypto/openssl/crypto/sha/asm/sha256-armv4.pl	Tue Aug 23 19:55:02 2016	(r304700)
@@ -595,7 +595,7 @@ sha256_block_data_order_armv8:
 	adr	$Ktbl,.LARMv8
 	sub	$Ktbl,$Ktbl,#.LARMv8-K256
 # else
-	adrl	$Ktbl,K256
+	sub	$Ktbl,$Ktbl,#256+32
 # endif
 	add	$len,$inp,$len,lsl#6	@ len to point at the end of inp
 

Modified: projects/clang390-import/lib/Makefile
==============================================================================
--- projects/clang390-import/lib/Makefile	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/lib/Makefile	Tue Aug 23 19:55:02 2016	(r304700)
@@ -3,12 +3,13 @@
 
 .include <src.opts.mk>
 
-# The SUBDIR_ORDERED list is a small set of libraries which are used by many
+# The SUBDIR_BOOTSTRAP list is a small set of libraries which are used by many
 # of the other libraries.  These are built first with a .WAIT between them
 # and the main list to avoid needing a SUBDIR_DEPEND line on every library
 # naming just these few items.
 
-SUBDIR_ORDERED=	csu \
+SUBDIR_BOOTSTRAP= \
+	csu \
 	.WAIT \
 	libc \
 	libc_nonshared \
@@ -21,7 +22,7 @@ SUBDIR_ORDERED=	csu \
 
 # The main list; please keep these sorted alphabetically.
 
-SUBDIR=	${SUBDIR_ORDERED} \
+SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	.WAIT \
 	libalias \
 	libarchive \

Modified: projects/clang390-import/lib/libc/stdio/fgetwc.c
==============================================================================
--- projects/clang390-import/lib/libc/stdio/fgetwc.c	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/lib/libc/stdio/fgetwc.c	Tue Aug 23 19:55:02 2016	(r304700)
@@ -79,18 +79,9 @@ __fgetwc_mbs(FILE *fp, mbstate_t *mbs, i
 	size_t nconv;
 	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
 
-	if (fp->_r <= 0 && __srefill(fp)) {
-		*nread = 0;
-		return (WEOF);
-	}
-	if (MB_CUR_MAX == 1) {
-		/* Fast path for single-byte encodings. */
-		wc = *fp->_p++;
-		fp->_r--;
-		*nread = 1;
-		return (wc);
-	}
 	*nread = 0;
+	if (fp->_r <= 0 && __srefill(fp))
+		return (WEOF);
 	do {
 		nconv = l->__mbrtowc(&wc, fp->_p, fp->_r, mbs);
 		if (nconv == (size_t)-1)

Modified: projects/clang390-import/lib/libc/stdio/fgetwln.c
==============================================================================
--- projects/clang390-import/lib/libc/stdio/fgetwln.c	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/lib/libc/stdio/fgetwln.c	Tue Aug 23 19:55:02 2016	(r304700)
@@ -53,11 +53,14 @@ fgetwln_l(FILE * __restrict fp, size_t *
 	ORIENT(fp, 1);
 
 	len = 0;
+	/* WEOF or error: return partial line, see fgetln(3). */
 	while ((wc = __fgetwc(fp, locale)) != WEOF) {
 #define	GROW	512
 		if (len * sizeof(wchar_t) >= fp->_lb._size &&
-		    __slbexpand(fp, (len + GROW) * sizeof(wchar_t)))
+		    __slbexpand(fp, (len + GROW) * sizeof(wchar_t))) {
+			fp->_flags |= __SERR;
 			goto error;
+		}
 		*((wchar_t *)fp->_lb._base + len++) = wc;
 		if (wc == L'\n')
 			break;
@@ -74,6 +77,7 @@ error:
 	*lenp = 0;
 	return (NULL);
 }
+
 wchar_t *
 fgetwln(FILE * __restrict fp, size_t *lenp)
 {

Modified: projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.8
==============================================================================
--- projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.8	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.8	Tue Aug 23 19:55:02 2016	(r304700)
@@ -128,15 +128,15 @@ Start an agent even if no keys were decr
 authentication phase.
 .El
 .Sh FILES
-.Bl -tag -width ".Pa $HOME/.ssh/identity" -compact
-.It Pa $HOME/.ssh/identity
-SSH1 RSA key
+.Bl -tag -width ".Pa $HOME/.ssh/id_ed25519" -compact
 .It Pa $HOME/.ssh/id_rsa
 SSH2 RSA key
 .It Pa $HOME/.ssh/id_dsa
 SSH2 DSA key
 .It Pa $HOME/.ssh/id_ecdsa
 SSH2 ECDSA key
+.It Pa $HOME/.ssh/id_ed25519
+SSH2 Ed25519 key
 .El
 .Sh SEE ALSO
 .Xr ssh-agent 1 ,

Modified: projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.c	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/lib/libpam/modules/pam_ssh/pam_ssh.c	Tue Aug 23 19:55:02 2016	(r304700)
@@ -77,10 +77,10 @@ static const char *pam_ssh_prompt = "SSH
 static const char *pam_ssh_have_keys = "pam_ssh_have_keys";
 
 static const char *pam_ssh_keyfiles[] = {
-	".ssh/identity",	/* SSH1 RSA key */
 	".ssh/id_rsa",		/* SSH2 RSA key */
 	".ssh/id_dsa",		/* SSH2 DSA key */
 	".ssh/id_ecdsa",	/* SSH2 ECDSA key */
+	".ssh/id_ed25519",	/* SSH2 Ed25519 key */
 	NULL
 };
 

Modified: projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Tue Aug 23 19:55:02 2016	(r304700)
@@ -836,8 +836,6 @@
 
       &hwlist.hme;
 
-      &hwlist.ie;
-
       &hwlist.igb;
 
       &hwlist.ipheth;

Modified: projects/clang390-import/sbin/ipfw/ipfw.8
==============================================================================
--- projects/clang390-import/sbin/ipfw/ipfw.8	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/sbin/ipfw/ipfw.8	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 2016
+.Dd August 21, 2016
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -1588,8 +1588,7 @@ Matches IPv4 packets whose precedence fi
 .It Cm ipsec
 Matches packets that have IPSEC history associated with them
 (i.e., the packet comes encapsulated in IPSEC, the kernel
-has IPSEC support and IPSEC_FILTERTUNNEL option, and can correctly
-decapsulate it).
+has IPSEC support, and can correctly decapsulate it).
 .Pp
 Note that specifying
 .Cm ipsec

Modified: projects/clang390-import/sbin/resolvconf/Makefile
==============================================================================
--- projects/clang390-import/sbin/resolvconf/Makefile	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/sbin/resolvconf/Makefile	Tue Aug 23 19:55:02 2016	(r304700)
@@ -16,6 +16,7 @@ CLEANFILES=	${SCRIPTS} ${FILES} ${MAN}
 SYSCONFDIR=	/etc
 RCDIR=		${SYSCONFDIR}/rc.d
 VARDIR=		/var/run/resolvconf
+SBINDIR=	/sbin
 
 # We don't assume to restart the services in /sbin.  So, though
 # our service(8) is in /usr/sbin, we can use it, here.
@@ -28,13 +29,13 @@ RESTARTCMD=	"/usr/sbin/service ${CMD1} \
 
 .for f in ${SCRIPTS} ${FILES} ${MAN}
 ${f}:	${f}.in
-	sed -e 's:@PREFIX@::g' \
-		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
+	sed	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
 		-e 's:@LIBEXECDIR@:${FILESDIR}:g' \
 		-e 's:@VARDIR@:${VARDIR}:g' \
 		-e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD_WITH_ARG}:g' \
 		-e 's:@RESTARTCMD@:${RESTARTCMD}:g' \
 		-e 's:@RCDIR@:${RCDIR}:g' \
+		-e 's:@SBINDIR@:${SBINDIR}:g' \
 		-e 's: vpn : ng[0-9]*&:g' \
 		${DIST}/$@.in > $@
 .endfor

Modified: projects/clang390-import/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/Makefile	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/Makefile	Tue Aug 23 19:55:02 2016	(r304700)
@@ -24,6 +24,8 @@ SRCS=	cpt_err.c cryptlib.c cversion.c ex
 	o_fips.c o_init.c o_str.c o_time.c uid.c
 .if defined(ASM_amd64)
 SRCS+=	x86_64cpuid.S
+.elif defined(ASM_arm)
+SRCS+=	armcap.c armv4cpuid.S
 .elif defined(ASM_i386)
 SRCS+=	x86cpuid.S
 .else
@@ -36,6 +38,8 @@ SRCS+=	aes_cfb.c aes_ctr.c aes_ecb.c aes
 .if defined(ASM_amd64)
 SRCS+=	aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S \
 	aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S
+.elif defined(ASM_arm)
+SRCS+= aes-armv4.S aes_cbc.c aesv8-armx.S bsaes-armv7.S
 .elif defined(ASM_i386)
 SRCS+=	aes-586.S aesni-x86.S vpaes-x86.S
 .else
@@ -85,6 +89,8 @@ SRCS+=	bn_add.c bn_blind.c bn_const.c bn
 .if defined(ASM_amd64)
 SRCS+=	rsaz-avx2.S rsaz-x86_64.S rsaz_exp.c x86_64-gcc.c x86_64-gf2m.S \
 	x86_64-mont.S x86_64-mont5.S
+.elif defined(ASM_arm)
+SRCS+=	armv4-mont.S armv4-gf2m.S bn_asm.c
 .elif defined(ASM_i386)
 SRCS+=	bn-586.S co-586.S x86-gf2m.S x86-mont.S
 .else
@@ -234,6 +240,8 @@ SRCS+=	cbc128.c ccm128.c cfb128.c ctr128
 	wrap128.c xts128.c
 .if defined(ASM_amd64)
 SRCS+=	aesni-gcm-x86_64.S ghash-x86_64.S
+.elif defined(ASM_arm)
+SRCS+=	ghash-armv4.S ghashv8-armx.S
 .elif defined(ASM_i386)
 SRCS+=	ghash-x86.S
 .endif
@@ -319,6 +327,8 @@ SRCS+=	sha1_one.c sha1dgst.c sha256.c sh
 .if defined(ASM_amd64)
 SRCS+=	sha1-mb-x86_64.S sha1-x86_64.S sha256-mb-x86_64.S sha256-x86_64.S \
 	sha512-x86_64.S
+.elif defined(ASM_arm)
+SRCS+=	sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
 .elif defined(ASM_i386)
 SRCS+=	sha1-586.S sha256-586.S sha512-586.S
 .endif

Modified: projects/clang390-import/secure/lib/libcrypto/Makefile.asm
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/Makefile.asm	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/Makefile.asm	Tue Aug 23 19:55:02 2016	(r304700)
@@ -64,8 +64,8 @@ CLEANFILES=	${ASM} ${SHA_ASM:S/$/.s/}
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	env CC=cc perl ${.IMPSRC} elf ) > ${.TARGET}
 
 ${SHA_TMP}: ${SHA_SRC}
@@ -73,11 +73,51 @@ ${SHA_TMP}: ${SHA_SRC}
 
 .for s in ${SHA_ASM}
 ${s}.S: ${s}.s
-	( echo '	# $$'FreeBSD'$$' ;\
-	echo '	# Do not modify. This file is auto-generated from ${SHA_SRC}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${SHA_SRC}. */' ;\
 	cat ${s}.s ) > ${.TARGET}
 .endfor
 
+.elif defined(ASM_arm)
+
+.PATH:	${LCRYPTO_SRC}/crypto \
+	${LCRYPTO_SRC}/crypto/aes/asm \
+	${LCRYPTO_SRC}/crypto/bn/asm \
+	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/sha/asm
+
+PERLPATH=	-I${LCRYPTO_SRC}/crypto/perlasm
+
+# aes
+SRCS=	aesv8-armx.pl bsaes-armv7.pl
+
+# bn
+SRCS+=	armv4-mont.pl armv4-gf2m.pl
+
+# modes
+SRCS+=	ghash-armv4.pl ghashv8-armx.pl
+
+# sha
+SRCS+=	sha1-armv4-large.pl sha256-armv4.pl sha512-armv4.pl
+
+ASM=	aes-armv4.S ${SRCS:R:S/$/.S/}
+
+all:	${ASM}
+
+CLEANFILES=	${ASM} ${SRCS:R:S/$/.s/}
+.SUFFIXES:	.pl
+
+aes-armv4.S:	aes-armv4.pl
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\
+	env CC=cc perl ${.ALLSRC} elf ) > ${.TARGET}
+
+.pl.S:
+	env CC=cc perl ${.IMPSRC} elf ${.TARGET:R:S/$/.s/}
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\
+	cat ${.TARGET:R:S/$/.s/}) > ${.TARGET}
+
 .elif defined(ASM_i386)
 
 .PATH:	${LCRYPTO_SRC}/crypto \
@@ -143,8 +183,8 @@ CLEANFILES=	${ASM}
 .SUFFIXES:	.pl
 
 .pl.S:
-	( echo '# $$'FreeBSD'$$' ;\
-	echo '# Do not modify. This file is auto-generated from ${.IMPSRC:T}.' ;\
+	( echo '/* $$'FreeBSD'$$ */' ;\
+	echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\
 	echo '#ifdef PIC' ;\
 	env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ;\
 	echo '#else' ;\

Modified: projects/clang390-import/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/Makefile.inc	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/Makefile.inc	Tue Aug 23 19:55:02 2016	(r304700)
@@ -29,6 +29,8 @@ _ASM_AVX!=	{ \
 .if ${_ASM_AVX} == yes
 ASM_${MACHINE_CPUARCH}=
 .endif
+.elif ${MACHINE_CPUARCH} == "arm"
+ASM_arm=
 .endif
 
 .if defined(ASM_amd64)
@@ -40,6 +42,11 @@ CFLAGS+=-DMD5_ASM
 CFLAGS+=-DGHASH_ASM
 CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 CFLAGS+=-DWHIRLPOOL_ASM
+.elif defined(ASM_arm)
+CFLAGS+=-DAES_ASM -DBSAES_ASM
+CFLAGS+=-DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
+CFLAGS+=-DGHASH_ASM
+CFLAGS+=-DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
 .elif defined(ASM_i386)
 CFLAGS+=-DOPENSSL_IA32_SSE2
 CFLAGS+=-DAES_ASM -DVPAES_ASM

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aes-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aes-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aes-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-x86_64.pl. */
 .text	
 .type	_x86_64_AES_encrypt, at function
 .align	16

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-gcm-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-gcm-x86_64.pl. */
 .text	
 
 .type	_aesni_ctr32_ghash_6x, at function

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-mb-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-sha1-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-sha1-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-sha256-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-sha256-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/aesni-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/aesni-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/aesni-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-x86_64.pl. */
 .text	
 
 .globl	aesni_encrypt

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/bsaes-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/bsaes-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/bsaes-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bsaes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bsaes-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/cmll-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/cmll-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/cmll-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from cmll-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from cmll-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ecp_nistz256-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ecp_nistz256-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/ghash-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/ghash-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/ghash-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ghash-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/md5-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/md5-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/md5-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from md5-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from md5-x86_64.pl. */
 .text	
 .align	16
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-md5-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-md5-x86_64.pl. */
 .text	
 .align	16
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/rc4-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/rc4-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/rc4-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-avx2.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-avx2.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-avx2.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rsaz-avx2.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rsaz-avx2.pl. */
 .text	
 
 .globl	rsaz_1024_sqr_avx2

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/rsaz-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rsaz-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rsaz-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-mb-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/sha1-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/sha1-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/sha1-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha256-mb-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-mb-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/sha256-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/sha256-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/sha256-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha512-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/sha512-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/sha512-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/sha512-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-	# $FreeBSD$
-	# Do not modify. This file is auto-generated from sha512-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/vpaes-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/vpaes-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/vpaes-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from vpaes-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from vpaes-x86_64.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/wp-x86_64.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/wp-x86_64.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/wp-x86_64.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from wp-x86_64.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from wp-x86_64.pl. */
 .text	
 
 .globl	whirlpool_block

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-gf2m.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-gf2m.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-gf2m.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-gf2m.pl. */
 .text	
 
 .type	_mul_1x1, at function

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-mont.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont5.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont5.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/x86_64-mont5.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64-mont5.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64-mont5.pl. */
 .text	
 
 

Modified: projects/clang390-import/secure/lib/libcrypto/amd64/x86_64cpuid.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/amd64/x86_64cpuid.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/amd64/x86_64cpuid.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86_64cpuid.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86_64cpuid.pl. */
 
 .hidden	OPENSSL_cpuid_setup
 .section	.init

Modified: projects/clang390-import/secure/lib/libcrypto/i386/aes-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/aes-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/aes-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-586.pl. */
 #ifdef PIC
 .file	"aes-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/aesni-x86.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/aesni-x86.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/aesni-x86.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-x86.pl. */
 #ifdef PIC
 .file	"aesni-x86.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/bf-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/bf-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/bf-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-586.pl. */
 #ifdef PIC
 .file	"bf-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/bf-686.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/bf-686.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/bf-686.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-686.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-686.pl. */
 #ifdef PIC
 .file	"bf-686.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/bn-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/bn-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/bn-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bn-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bn-586.pl. */
 #ifdef PIC
 .file	"bn-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/cmll-x86.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/cmll-x86.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/cmll-x86.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from cmll-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from cmll-x86.pl. */
 #ifdef PIC
 .file	"cmll-x86.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/co-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/co-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/co-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from co-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from co-586.pl. */
 #ifdef PIC
 .file	"co-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/crypt586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/crypt586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/crypt586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from crypt586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from crypt586.pl. */
 #ifdef PIC
 .file	"crypt586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/des-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/des-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/des-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from des-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from des-586.pl. */
 #ifdef PIC
 .file	"des-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/ghash-x86.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/ghash-x86.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/ghash-x86.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ghash-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-x86.pl. */
 #ifdef PIC
 .file	"ghash-x86.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/md5-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/md5-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/md5-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from md5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from md5-586.pl. */
 #ifdef PIC
 .file	"md5-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/rc4-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/rc4-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/rc4-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-586.pl. */
 #ifdef PIC
 .file	"rc4-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/rc5-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/rc5-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/rc5-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc5-586.pl. */
 #ifdef PIC
 .file	"rc5-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/rmd-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/rmd-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/rmd-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rmd-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rmd-586.pl. */
 #ifdef PIC
 .file	"rmd-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/sha1-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/sha1-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/sha1-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-586.pl. */
 #ifdef PIC
 .file	"sha1-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/sha256-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/sha256-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/sha256-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha256-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-586.pl. */
 #ifdef PIC
 .file	"sha256-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/sha512-586.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/sha512-586.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/sha512-586.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha512-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-586.pl. */
 #ifdef PIC
 .file	"sha512-586.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/vpaes-x86.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/vpaes-x86.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/vpaes-x86.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from vpaes-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from vpaes-x86.pl. */
 #ifdef PIC
 .file	"vpaes-x86.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/wp-mmx.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/wp-mmx.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/wp-mmx.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from wp-mmx.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from wp-mmx.pl. */
 #ifdef PIC
 .file	"wp-mmx.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/x86-gf2m.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/x86-gf2m.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/x86-gf2m.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-gf2m.pl. */
 #ifdef PIC
 .file	"x86-gf2m.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/x86-mont.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/x86-mont.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/x86-mont.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-mont.pl. */
 #ifdef PIC
 .file	"x86-mont.S"
 .text

Modified: projects/clang390-import/secure/lib/libcrypto/i386/x86cpuid.S
==============================================================================
--- projects/clang390-import/secure/lib/libcrypto/i386/x86cpuid.S	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/secure/lib/libcrypto/i386/x86cpuid.S	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86cpuid.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86cpuid.pl. */
 #ifdef PIC
 .file	"x86cpuid.S"
 .text

Modified: projects/clang390-import/share/i18n/esdb/Makefile.part
==============================================================================
--- projects/clang390-import/share/i18n/esdb/Makefile.part	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/share/i18n/esdb/Makefile.part	Tue Aug 23 19:55:02 2016	(r304700)
@@ -67,9 +67,11 @@ codesets: ${ESDB}
 
 .if !defined(NO_PREPROC)
 .for i in ${PART}
+.if !exists(${.CURDIR}/${EPREFIX}${i:S/:/@/}.src)
 ${EPREFIX}${i:S/:/@/}.src: ${CODE}.src
 	sed ${SED_EXP:S@%%PART%%@${i}@} ${.ALLSRC} > ${.TARGET}
 	@echo ${.TARGET} >>.tmpfiles
+.endif
 .endfor
 .endif
 

Modified: projects/clang390-import/share/man/man4/alc.4
==============================================================================
--- projects/clang390-import/share/man/man4/alc.4	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/share/man/man4/alc.4	Tue Aug 23 19:55:02 2016	(r304700)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 8, 2014
+.Dd August 22, 2016
 .Dt ALC 4
 .Os
 .Sh NAME
@@ -122,6 +122,8 @@ Atheros AR8171 PCI Express Gigabit Ether
 Atheros AR8172 PCI Express Fast Ethernet controller
 .It
 Killer E2200 Gigabit Ethernet controller
+.It
+Killer E2400 Gigabit Ethernet controller
 .El
 .Sh LOADER TUNABLES
 Tunables can be set at the

Modified: projects/clang390-import/share/man/man4/man4.i386/ep.4
==============================================================================
--- projects/clang390-import/share/man/man4/man4.i386/ep.4	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/share/man/man4/man4.i386/ep.4	Tue Aug 23 19:55:02 2016	(r304700)
@@ -200,8 +200,6 @@ This should never happen.
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr ed 4 ,
-.Xr el 4 ,
-.Xr ie 4 ,
 .Xr intro 4 ,
 .Xr ng_ether 4 ,
 .Xr sn 4 ,

Modified: projects/clang390-import/share/man/man4/sn.4
==============================================================================
--- projects/clang390-import/share/man/man4/sn.4	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/share/man/man4/sn.4	Tue Aug 23 19:55:02 2016	(r304700)
@@ -97,7 +97,6 @@ driver.
 .Sh SEE ALSO
 .Xr ed 4 ,
 .Xr ep 4 ,
-.Xr ie 4 ,
 .Xr intro 4 ,
 .Xr ng_ether 4 ,
 .Xr vx 4 ,

Modified: projects/clang390-import/share/man/man5/src.conf.5
==============================================================================
--- projects/clang390-import/share/man/man5/src.conf.5	Tue Aug 23 19:50:16 2016	(r304699)
+++ projects/clang390-import/share/man/man5/src.conf.5	Tue Aug 23 19:55:02 2016	(r304700)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 292283 2015-12-15 18:42:30Z bdrewery
 .\" $FreeBSD$
-.Dd July 28, 2016
+.Dd August 23, 2016
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -479,9 +479,15 @@ When set, it also enforces the following
 .It
 .Va WITHOUT_CLANG_FULL
 .It
+.Va WITHOUT_DTRACE_TESTS
+.It
 .Va WITHOUT_GNUCXX
 .It
 .Va WITHOUT_GROFF
+.It
+.Va WITHOUT_TESTS
+.It
+.Va WITHOUT_TESTS_SUPPORT
 .El
 .It Va WITHOUT_DEBUG_FILES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_DEBUG_FILES 290059 2015-10-27 20:49:56Z emaste
@@ -536,10 +542,6 @@ When set, it also enforces the following
 When set, the following options are also in effect:
 .Pp
 .Bl -inset -compact
-.It Va WITHOUT_SYSTEM_COMPILER
-(unless
-.Va WITH_SYSTEM_COMPILER
-is set explicitly)
 .It Va WITH_AUTO_OBJ
 (unless
 .Va WITHOUT_AUTO_OBJ
@@ -1141,14 +1143,6 @@ to
 .Pp
 Currently this also enforces
 .Va WITHOUT_SYSTEM_COMPILER .
-When set, the following options are also in effect:
-.Pp
-.Bl -inset -compact
-.It Va WITHOUT_SYSTEM_COMPILER
-(unless

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

More information about the svn-src-projects mailing list