svn commit: r303357 - in user/alc/PQ_LAUNDRY: . contrib/elftoolchain/libelftc contrib/libdivsufsort include lib/libc/stdlib sbin/geom/class/part share/man/man3 share/man/man4 share/misc share/mk sh...

Alan Cox alc at FreeBSD.org
Wed Jul 27 04:00:26 UTC 2016 

Author: alc
Date: Wed Jul 27 04:00:22 2016
New Revision: 303357
URL: https://svnweb.freebsd.org/changeset/base/303357

Log:
  MFH r303356

Added:
  user/alc/PQ_LAUNDRY/contrib/libdivsufsort/
     - copied from r303356, head/contrib/libdivsufsort/
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-3160-16.fw.uu
     - copied unchanged from r303356, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-7260-16.fw.uu
     - copied unchanged from r303356, head/sys/contrib/dev/iwm/iwm-7260-16.fw.uu
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-7265-16.fw.uu
     - copied unchanged from r303356, head/sys/contrib/dev/iwm/iwm-7265-16.fw.uu
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-8000C-16.fw.uu
     - copied unchanged from r303356, head/sys/contrib/dev/iwm/iwm-8000C-16.fw.uu
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_brvar.h
     - copied unchanged from r303356, head/sys/dev/hyperv/vmbus/vmbus_brvar.h
  user/alc/PQ_LAUNDRY/sys/dev/nvram2env/nvram2env.h
     - copied unchanged from r303356, head/sys/dev/nvram2env/nvram2env.h
  user/alc/PQ_LAUNDRY/sys/dev/nvram2env/nvram2env_mips.c
     - copied unchanged from r303356, head/sys/dev/nvram2env/nvram2env_mips.c
  user/alc/PQ_LAUNDRY/sys/modules/iwmfw/iwm8000Cfw/
     - copied from r303356, head/sys/modules/iwmfw/iwm8000Cfw/
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bsdiff/config.h
     - copied unchanged from r303356, head/usr.bin/bsdiff/bsdiff/config.h
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bsdiff/divsufsort64.h
     - copied unchanged from r303356, head/usr.bin/bsdiff/bsdiff/divsufsort64.h
Deleted:
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
Modified:
  user/alc/PQ_LAUNDRY/Makefile
  user/alc/PQ_LAUNDRY/Makefile.inc1
  user/alc/PQ_LAUNDRY/Makefile.libcompat
  user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
  user/alc/PQ_LAUNDRY/include/stdlib.h
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.3
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c
  user/alc/PQ_LAUNDRY/sbin/geom/class/part/gpart.8
  user/alc/PQ_LAUNDRY/share/man/man3/Makefile
  user/alc/PQ_LAUNDRY/share/man/man4/iwm.4
  user/alc/PQ_LAUNDRY/share/man/man4/iwmfw.4
  user/alc/PQ_LAUNDRY/share/misc/committers-src.dot
  user/alc/PQ_LAUNDRY/share/misc/organization.dot
  user/alc/PQ_LAUNDRY/share/mk/bsd.sys.mk
  user/alc/PQ_LAUNDRY/share/timedef/zh_TW.UTF-8.src
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/machdep.c
  user/alc/PQ_LAUNDRY/sys/amd64/include/pc/bios.h
  user/alc/PQ_LAUNDRY/sys/arm/arm/machdep.c
  user/alc/PQ_LAUNDRY/sys/arm/ti/files.ti
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/machdep.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/mp_machdep.c
  user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/cam/nvme/nvme_xpt.c
  user/alc/PQ_LAUNDRY/sys/compat/freebsd32/freebsd32_ipc.h
  user/alc/PQ_LAUNDRY/sys/compat/svr4/svr4_sockio.c
  user/alc/PQ_LAUNDRY/sys/conf/NOTES
  user/alc/PQ_LAUNDRY/sys/conf/files
  user/alc/PQ_LAUNDRY/sys/conf/files.mips
  user/alc/PQ_LAUNDRY/sys/conf/kern.mk
  user/alc/PQ_LAUNDRY/sys/conf/options
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-3160-9.fw.uu
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-7260-9.fw.uu
  user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-7265-9.fw.uu
  user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_main.c
  user/alc/PQ_LAUNDRY/sys/dev/etherswitch/arswitch/arswitch_7240.c
  user/alc/PQ_LAUNDRY/sys/dev/etherswitch/arswitch/arswitch_8316.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/hv_ring_buffer.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/hyperv.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/hyperv_reg.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chan.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chanvar.h
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_led.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_led.h
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_mac_ctxt.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_pcie_trans.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_phy_ctxt.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_phy_db.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_power.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_scan.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_scan.h
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_time_event.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_util.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_util.h
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwmreg.h
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwmvar.h
  user/alc/PQ_LAUNDRY/sys/dev/kbd/kbd.c
  user/alc/PQ_LAUNDRY/sys/dev/ntb/ntb_hw/ntb_hw.c
  user/alc/PQ_LAUNDRY/sys/dev/nvram2env/nvram2env.c
  user/alc/PQ_LAUNDRY/sys/dev/uart/uart_cpu_fdt.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/u3g.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uark.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ubsa.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uchcom.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/ufoma.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umcs.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umct.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umodem.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/umoscom.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uplcom.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/serial/uslcom.c
  user/alc/PQ_LAUNDRY/sys/dev/vt/vt_core.c
  user/alc/PQ_LAUNDRY/sys/fs/devfs/devfs_vnops.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_subr.c
  user/alc/PQ_LAUNDRY/sys/i386/include/pc/bios.h
  user/alc/PQ_LAUNDRY/sys/kern/kern_sig.c
  user/alc/PQ_LAUNDRY/sys/kern/sysv_shm.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_vnops.c
  user/alc/PQ_LAUNDRY/sys/modules/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/iwmfw/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/iwmfw/iwm3160fw/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/iwmfw/iwm7260fw/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/iwmfw/iwm7265fw/Makefile
  user/alc/PQ_LAUNDRY/sys/net/if.c
  user/alc/PQ_LAUNDRY/sys/netinet/cc/cc.c
  user/alc/PQ_LAUNDRY/sys/sys/efi.h
  user/alc/PQ_LAUNDRY/sys/sys/shm.h
  user/alc/PQ_LAUNDRY/sys/sys/sysent.h
  user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bsdiff/Makefile
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bsdiff/bsdiff.c
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bspatch/bspatch.c
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendar.1
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.common
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.holiday
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.military
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.orthodox
  user/alc/PQ_LAUNDRY/usr.bin/calendar/calendars/ru_RU.UTF-8/calendar.pagan
  user/alc/PQ_LAUNDRY/usr.sbin/bhyve/pci_fbuf.c   (contents, props changed)
  user/alc/PQ_LAUNDRY/usr.sbin/bhyve/pci_xhci.c   (contents, props changed)
Directory Properties:
  user/alc/PQ_LAUNDRY/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/elftoolchain/   (props changed)

Modified: user/alc/PQ_LAUNDRY/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/Makefile	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/Makefile	Wed Jul 27 04:00:22 2016	(r303357)
@@ -131,7 +131,8 @@ TGTS=	all all-man buildenv buildenvvars 
 	builddtb xdev xdev-build xdev-install \
 	xdev-links native-xtools stageworld stagekernel stage-packages \
 	create-world-packages create-kernel-packages create-packages \
-	packages installconfig real-packages sign-packages package-pkg
+	packages installconfig real-packages sign-packages package-pkg \
+	test-system-compiler
 
 # XXX: r156740: This can't work since bsd.subdir.mk is not included ever.
 # It will only work for SUBDIR_TARGETS in make.conf.
@@ -151,7 +152,8 @@ TGTS+=	${BITGTS}
 META_TGT_WHITELIST+= \
 	_* build32 buildfiles buildincludes buildkernel buildsoft \
 	buildworld everything kernel-toolchain kernel-toolchains kernel \
-	kernels libraries native-xtools showconfig tinderbox toolchain \
+	kernels libraries native-xtools showconfig test-system-compiler \
+	tinderbox toolchain \
 	toolchains universe world worlds xdev xdev-build
 
 .ORDER: buildworld installworld

Modified: user/alc/PQ_LAUNDRY/Makefile.inc1
==============================================================================
--- user/alc/PQ_LAUNDRY/Makefile.inc1	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/Makefile.inc1	Wed Jul 27 04:00:22 2016	(r303357)
@@ -74,7 +74,8 @@ X${COMPILER}?=	${${COMPILER}}
 # If a full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:N${CCACHE_BIN}:M/*}
-MK_CROSS_COMPILER=	no
+MK_CLANG_BOOTSTRAP=	no
+MK_GCC_BOOTSTRAP=	no
 .endif
 
 # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
@@ -82,50 +83,68 @@ MK_CROSS_COMPILER=	no
 .include "share/mk/src.opts.mk"
 
 # Check if there is a local compiler that can satisfy as an external compiler.
-.if ${MK_SYSTEM_COMPILER} == "yes" && ${MK_CROSS_COMPILER} == "yes" && \
-    (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \
-    !make(showconfig) && !make(native-xtools) && !make(xdev*)
 # Which compiler is expected to be used?
 .if ${MK_CLANG_BOOTSTRAP} == "yes"
-_expected_compiler_type=	clang
+WANT_COMPILER_TYPE=	clang
 .elif ${MK_GCC_BOOTSTRAP} == "yes"
-_expected_compiler_type=	gcc
+WANT_COMPILER_TYPE=	gcc
+.else
+WANT_COMPILER_TYPE=
 .endif
-# If the expected vs CC is different then we can't skip.
-# GCC cannot be used for cross-arch yet.  For clang we pass -target later if
-# TARGET_ARCH!=MACHINE_ARCH.
-.if ${_expected_compiler_type} == ${COMPILER_TYPE} && \
-    (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH})
-# It needs to be the same revision as we would build for the bootstrap.
-.if !defined(CROSS_COMPILER_FREEBSD_VERSION)
-.if ${_expected_compiler_type} == "clang"
-CROSS_COMPILER_FREEBSD_VERSION!= \
+.if !defined(WANT_COMPILER_FREEBSD_VERSION)
+.if ${WANT_COMPILER_TYPE} == "clang"
+WANT_COMPILER_FREEBSD_VERSION_FILE= lib/clang/freebsd_cc_version.h
+WANT_COMPILER_FREEBSD_VERSION!= \
 	awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \
-	${SRCDIR}/lib/clang/freebsd_cc_version.h || echo unknown
-CROSS_COMPILER_VERSION!= \
+	${SRCDIR}/${WANT_COMPILER_FREEBSD_VERSION_FILE} || echo unknown
+WANT_COMPILER_VERSION_FILE= lib/clang/include/clang/Basic/Version.inc
+WANT_COMPILER_VERSION!= \
 	awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \
-	${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown
-.elif ${_expected_compiler_type} == "gcc"
-CROSS_COMPILER_FREEBSD_VERSION!= \
+	${SRCDIR}/${WANT_COMPILER_VERSION_FILE} || echo unknown
+.elif ${WANT_COMPILER_TYPE} == "gcc"
+WANT_COMPILER_FREEBSD_VERSION_FILE= gnu/usr.bin/cc/cc_tools/freebsd-native.h
+WANT_COMPILER_FREEBSD_VERSION!= \
 	awk '$$2 == "FBSD_CC_VER" {printf("%d\n", $$3)}' \
-	${SRCDIR}/gnu/usr.bin/cc/cc_tools/freebsd-native.h || echo unknown
-CROSS_COMPILER_VERSION!= \
+	${SRCDIR}/${WANT_COMPILER_FREEBSD_VERSION_FILE} || echo unknown
+WANT_COMPILER_VERSION_FILE= contrib/gcc/BASE-VER
+WANT_COMPILER_VERSION!= \
 	awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3}' \
-	${SRCDIR}/contrib/gcc/BASE-VER || echo unknown
+	${SRCDIR}/${WANT_COMPILER_VERSION_FILE} || echo unknown
 .endif
-.export CROSS_COMPILER_FREEBSD_VERSION CROSS_COMPILER_VERSION
-.endif	# !defined(CROSS_COMPILER_FREEBSD_VERSION)
-.if ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION} && \
-    ${COMPILER_FREEBSD_VERSION} == ${CROSS_COMPILER_FREEBSD_VERSION}
+.export WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_VERSION
+.endif	# !defined(WANT_COMPILER_FREEBSD_VERSION)
+# It needs to be the same revision as we would build for the bootstrap.
+# If the expected vs CC is different then we can't skip.
+# GCC cannot be used for cross-arch yet.  For clang we pass -target later if
+# TARGET_ARCH!=MACHINE_ARCH.
+.if ${MK_SYSTEM_COMPILER} == "yes" && \
+    (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \
+    !make(showconfig) && !make(native-xtools) && !make(xdev*) && \
+    ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE} && \
+    (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
+    ${COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \
+    ${COMPILER_FREEBSD_VERSION} == ${WANT_COMPILER_FREEBSD_VERSION}
 # Everything matches, disable the bootstrap compiler.
 MK_CLANG_BOOTSTRAP=	no
 MK_GCC_BOOTSTRAP=	no
-.if make(buildworld)
+USING_SYSTEM_COMPILER=	yes
+.endif	# ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE}
+USING_SYSTEM_COMPILER?=	no
+TEST_SYSTEM_COMPILER_VARS= \
+	USING_SYSTEM_COMPILER MK_SYSTEM_COMPILER \
+	MK_CROSS_COMPILER MK_CLANG_BOOTSTRAP MK_GCC_BOOTSTRAP \
+	WANT_COMPILER_TYPE WANT_COMPILER_VERSION WANT_COMPILER_VERSION_FILE \
+	WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \
+	CC COMPILER_TYPE COMPILER_VERSION COMPILER_FREEBSD_VERSION
+test-system-compiler: .PHONY
+.for v in ${TEST_SYSTEM_COMPILER_VARS}
+	${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}"
+.endfor
+.if ${USING_SYSTEM_COMPILER} == "yes" && \
+    (make(buildworld) || make(buildkernel) || make(kernel-toolchain) || \
+    make(toolchain) || make(_cross-tools))
 .info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree.  Not bootstrapping a cross-compiler.
 .endif
-.endif	# ${COMPILER_VERSION} == ${CROSS_COMPILER_VERSION}
-.endif	# ${_expected_compiler_type} == ${COMPILER_TYPE}
-.endif	# ${XCC:N${CCACHE_BIN}:M/*}
 
 # For installworld need to ensure that the looked-up compiler metadata is
 # passed along rather than trying to run cc from the restricted
@@ -532,8 +551,7 @@ BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 
 # External compiler needs sysroot and target flags.
-.if ${MK_CROSS_COMPILER} == "no" || \
-    (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
+.if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
 .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX})
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
@@ -561,7 +579,7 @@ TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x8
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
-.endif # ${MK_CROSS_COMPILER} == "no"
+.endif # ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"
 
 .if !empty(BFLAGS)
 XCFLAGS+=	${BFLAGS}
@@ -1802,7 +1820,6 @@ _elftctools=	lib/libelftc \
 		usr.bin/elfcopy
 .endif
 
-.if ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
@@ -1810,7 +1827,6 @@ _clang_libs=	lib/clang
 .if ${MK_GCC_BOOTSTRAP} != "no"
 _cc=		gnu/usr.bin/cc
 .endif
-.endif
 .if ${MK_USB} != "no"
 _usb_tools=	sys/boot/usb/tools
 .endif

Modified: user/alc/PQ_LAUNDRY/Makefile.libcompat
==============================================================================
--- user/alc/PQ_LAUNDRY/Makefile.libcompat	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/Makefile.libcompat	Wed Jul 27 04:00:22 2016	(r303357)
@@ -81,8 +81,8 @@ LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/
 LIBCOMPATCFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include
 # Force using libc++ for external GCC.
 # XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800 && (${MK_CROSS_COMPILER} == "no" || \
-    (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"))
+.if ${X_COMPILER_VERSION} >= 40800 && \
+    (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
 LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
 			-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++
 .endif

Modified: user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -2551,7 +2551,7 @@ again:
 
 	case 'w':
 		/* wchar_t */
-		if (!cpp_demangle_push_str(ddata, "wchar_t", 6))
+		if (!cpp_demangle_push_str(ddata, "wchar_t", 7))
 			goto clean;
 		++ddata->cur;
 		goto rtn;

Modified: user/alc/PQ_LAUNDRY/include/stdlib.h
==============================================================================
--- user/alc/PQ_LAUNDRY/include/stdlib.h	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/include/stdlib.h	Wed Jul 27 04:00:22 2016	(r303357)
@@ -204,7 +204,7 @@ double	 erand48(unsigned short[3]);
 /* char	*fcvt(double, int, int * __restrict, int * __restrict); */
 /* char	*gcvt(double, int, int * __restrict, int * __restrict); */
 int	 grantpt(int);
-char	*initstate(unsigned long /* XSI requires u_int */, char *, long);
+char	*initstate(unsigned int, char *, size_t);
 long	 jrand48(unsigned short[3]);
 char	*l64a(long);
 void	 lcong48(unsigned short[7]);
@@ -227,7 +227,7 @@ int	 setkey(const char *);
 #endif
 char	*setstate(/* const */ char *);
 void	 srand48(long);
-void	 srandom(unsigned long);
+void	 srandom(unsigned int);
 int	 unlockpt(int);
 #endif /* __XSI_VISIBLE */
 

Modified: user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.3
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.3	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.3	Wed Jul 27 04:00:22 2016	(r303357)
@@ -28,7 +28,7 @@
 .\"     @(#)random.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2013
+.Dd July 26, 2016
 .Dt RANDOM 3
 .Os
 .Sh NAME
@@ -45,11 +45,11 @@
 .Ft long
 .Fn random void
 .Ft void
-.Fn srandom "unsigned long seed"
+.Fn srandom "unsigned int seed"
 .Ft void
 .Fn srandomdev void
 .Ft char *
-.Fn initstate "unsigned long seed" "char *state" "long n"
+.Fn initstate "unsigned int seed" "char *state" "size_t n"
 .Ft char *
 .Fn setstate "char *state"
 .Sh DESCRIPTION

Modified: user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -236,7 +236,7 @@ good_rand(uint32_t ctx)
  * for default usage relies on values produced by this routine.
  */
 void
-srandom(unsigned long x)
+srandom(unsigned int x)
 {
 	int i, lim;
 
@@ -311,7 +311,7 @@ srandomdev(void)
  * complain about mis-alignment, but you should disregard these messages.
  */
 char *
-initstate(unsigned long seed, char *arg_state, long n)
+initstate(unsigned int seed, char *arg_state, size_t n)
 {
 	char *ostate = (char *)(&state[-1]);
 	uint32_t *int_arg_state = (uint32_t *)arg_state;

Modified: user/alc/PQ_LAUNDRY/sbin/geom/class/part/gpart.8
==============================================================================
--- user/alc/PQ_LAUNDRY/sbin/geom/class/part/gpart.8	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sbin/geom/class/part/gpart.8	Wed Jul 27 04:00:22 2016	(r303357)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 10, 2015
+.Dd July 25, 2016
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -1193,86 +1193,112 @@ Otherwise the values will be left unchan
 .Sh EXIT STATUS
 Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
-Create a GPT scheme on
-.Pa ada0 :
+The examples below assume that the disk's logical block size is 512
+bytes, regardless of its physical block size.
+.Ss GPT
+In this example, we will format
+.Pa ada0
+with the GPT scheme and create boot, swap and root partitions.
+First, we need to create the partition table:
 .Bd -literal -offset indent
 /sbin/gpart create -s GPT ada0
 .Ed
 .Pp
-Embed GPT bootstrap code into a protective MBR:
+Next, we install a protective MBR with the first-stage bootstrap code.
+The protective MBR lists a single, bootable partition spanning the
+entire disk, thus allowing non-GPT-aware BIOSes to boot from the disk
+and preventing tools which do not understand the GPT scheme from
+considering the disk to be unformatted.
 .Bd -literal -offset indent
 /sbin/gpart bootcode -b /boot/pmbr ada0
 .Ed
 .Pp
-Create a dedicated
+We then create a dedicated
 .Cm freebsd-boot
-partition that can boot
+partition to hold the second-stage boot loader, which will load the
 .Fx
-from a
-.Cm freebsd-ufs
-partition, and install bootstrap code into it.
+kernel and modules from a UFS or ZFS filesystem.
 This partition must be larger than the bootstrap code
 .Po
-usually either
+either
 .Pa /boot/gptboot
-or
+for UFS or
 .Pa /boot/gptzfsboot
+for ZFS
 .Pc ,
 but smaller than 545 kB since the first-stage loader will load the
 entire partition into memory during boot, regardless of how much data
 it actually contains.
-This example uses 88 blocks (44 kB) so the next partition will be
-aligned on a 64 kB boundary without the need to specify an explicit
-offset or alignment.
-The boot partition itself is aligned on a 4 kB boundary.
+We create a 472-block (236 kB) boot partition at offset 40, which is
+the size of the partition table (34 blocks or 17 kB) rounded up to the
+nearest 4 kB boundary.
 .Bd -literal -offset indent
-/sbin/gpart add -b 40 -s 88 -t freebsd-boot ada0
+/sbin/gpart add -b 40 -s 472 -t freebsd-boot ada0
 /sbin/gpart bootcode -p /boot/gptboot -i 1 ada0
 .Ed
 .Pp
-Create a 512MB-sized
+We now create a 4 GB swap partition at the first available offset,
+which is 40 + 472 = 512 blocks (256 kB).
+.Bd -literal -offset indent
+/sbin/gpart add -s 4G -t freebsd-swap ada0
+.Ed
+.Pp
+Aligning the swap partition and all subsequent partitions on a 256 kB
+boundary ensures optimal performance on a wide range of media, from
+plain old disks with 512-byte blocks, through modern
+.Dq advanced format
+disks with 4096-byte physical blocks, to RAID volumes with stripe
+sizes of up to 256 kB.
+.Pp
+Finally, we create and format an 8 GB
 .Cm freebsd-ufs
-partition to contain a UFS filesystem from which the system can boot.
+partition for the root filesystem, leaving the rest of the slice free
+for additional filesystems:
 .Bd -literal -offset indent
-/sbin/gpart add -s 512M -t freebsd-ufs ada0
+/sbin/gpart add -s 8G -t freebsd-ufs ada0
+/sbin/newfs -Uj /dev/ada0p3
 .Ed
+.Ss MBR
+In this example, we will format
+.Pa ada0
+with the MBR scheme and create a single partition which we subdivide
+using a traditional
+.Bx
+disklabel.
 .Pp
-Create an MBR scheme on
-.Pa ada0 ,
-then create a 30GB-sized
-.Fx
-slice, mark it active and
-install the
-.Nm boot0
-boot manager:
+First, we create the partition table and a single 64 GB partition,
+then we mark that partition active (bootable) and install the
+first-stage boot loader:
 .Bd -literal -offset indent
 /sbin/gpart create -s MBR ada0
-/sbin/gpart add -t freebsd -s 30G ada0
+/sbin/gpart add -t freebsd -s 64G ada0
 /sbin/gpart set -a active -i 1 ada0
 /sbin/gpart bootcode -b /boot/boot0 ada0
 .Ed
 .Pp
-Now create a
-.Bx
-scheme
-.Pf ( Bx
-label) with space for up to 20 partitions:
+Next, we create a disklabel in that partition
+.Po
+.Dq slice
+in disklabel terminology
+.Pc
+with room for up to 20 partitions:
 .Bd -literal -offset indent
 /sbin/gpart create -s BSD -n 20 ada0s1
 .Ed
 .Pp
-Create a 1GB-sized UFS partition and a 4GB-sized swap partition:
+We then create an 8 GB root partition and a 4 GB swap partition:
 .Bd -literal -offset indent
-/sbin/gpart add -t freebsd-ufs -s 1G ada0s1
+/sbin/gpart add -t freebsd-ufs -s 8G ada0s1
 /sbin/gpart add -t freebsd-swap -s 4G ada0s1
 .Ed
 .Pp
-Install bootstrap code for the
+Finally, we install the appropriate boot loader for the
 .Bx
 label:
 .Bd -literal -offset indent
 /sbin/gpart bootcode -b /boot/boot ada0s1
 .Ed
+.Ss VTOC8
 .Pp
 Create a VTOC8 scheme on
 .Pa da0 :
@@ -1298,6 +1324,7 @@ After creating all required partitions, 
 .Bd -literal -offset indent
 /sbin/gpart bootcode -p /boot/boot1 da0
 .Ed
+.Ss Backup and Restore
 .Pp
 Create a backup of the partition table from
 .Pa da0 :

Modified: user/alc/PQ_LAUNDRY/share/man/man3/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/share/man/man3/Makefile	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/man/man3/Makefile	Wed Jul 27 04:00:22 2016	(r303357)
@@ -49,7 +49,9 @@ MLINKS+=	bitstring.3 bit_alloc.3 \
 		bitstring.3 bit_clear.3 \
 		bitstring.3 bit_decl.3 \
 		bitstring.3 bit_ffc.3 \
+		bitstring.3 bit_ffc_at.3 \
 		bitstring.3 bit_ffs.3 \
+		bitstring.3 bit_ffs_at.3 \
 		bitstring.3 bit_nclear.3 \
 		bitstring.3 bit_nset.3 \
 		bitstring.3 bit_set.3 \

Modified: user/alc/PQ_LAUNDRY/share/man/man4/iwm.4
==============================================================================
--- user/alc/PQ_LAUNDRY/share/man/man4/iwm.4	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/man/man4/iwm.4	Wed Jul 27 04:00:22 2016	(r303357)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 1, 2015
+.Dd July 26, 2016
 .Dt IWM 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@ Choose one from:
 .Cd "device iwm3160fw"
 .Cd "device iwm7260fw"
 .Cd "device iwm7265fw"
+.Cd "device iwm8000Cfw"
 .Ed
 .Pp
 Or you can use
@@ -65,6 +66,7 @@ if_iwm_load="YES"
 iwm3160fw_load="YES"
 iwm7260fw_load="YES"
 iwm7265fw_load="YES"
+iwm8000Cfw_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
@@ -73,8 +75,10 @@ driver provides support for:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
 .It Intel Dual Band Wireless AC 3160
+.It Intel Dual Band Wireless AC 3165
 .It Intel Dual Band Wireless AC 7260
 .It Intel Dual Band Wireless AC 7265
+.It Intel Dual Band Wireless AC 8260
 .El
 .Pp
 .Nm

Modified: user/alc/PQ_LAUNDRY/share/man/man4/iwmfw.4
==============================================================================
--- user/alc/PQ_LAUNDRY/share/man/man4/iwmfw.4	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/man/man4/iwmfw.4	Wed Jul 27 04:00:22 2016	(r303357)
@@ -22,7 +22,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 28, 2015
+.Dd July 26, 2016
 .Dt IWMFW 4
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@ of the following:
 .Cd "device iwm3160fw"
 .Cd "device iwm7260fw"
 .Cd "device iwm7265fw"
+.Cd "device iwm8000Cfw"
 .Ed
 .Pp
 Alternatively, to load the driver as a
@@ -54,10 +55,11 @@ module at boot time, place the following
 iwm3160fw_load="YES"
 iwm7260fw_load="YES"
 iwm7265fw_load="YES"
+iwm8000Cfw_load="YES"
 .Ed
 .Sh DESCRIPTION
 This module provides access to firmware sets for the
-Intel Dual Band Wireless WiFi 3160, 7260 and 7265 series of
+Intel Dual Band Wireless WiFi 3160, 3165, 7260, 7265 and 8260 series of
 IEEE 802.11n/11ac adapters.
 It may be
 statically linked into the kernel, or loaded as a module.

Modified: user/alc/PQ_LAUNDRY/share/misc/committers-src.dot
==============================================================================
--- user/alc/PQ_LAUNDRY/share/misc/committers-src.dot	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/misc/committers-src.dot	Wed Jul 27 04:00:22 2016	(r303357)
@@ -259,7 +259,7 @@ peadar [label="Peter Edwards\npeadar at Fre
 peter [label="Peter Wemm\npeter at FreeBSD.org\n1995/07/04"]
 peterj [label="Peter Jeremy\npeterj at FreeBSD.org\n2012/09/14"]
 pfg [label="Pedro Giffuni\npfg at FreeBSD.org\n2011/12/01"]
-phil [label="Phil Shafer\nphil at FreeBSD.ogr\n2016/12/30"]
+phil [label="Phil Shafer\nphil at FreeBSD.ogr\n2015/12/30"]
 philip [label="Philip Paeps\nphilip at FreeBSD.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\nphk at FreeBSD.org\n1994/02/21"]
 pho [label="Peter Holm\npho at FreeBSD.org\n2008/11/16"]

Modified: user/alc/PQ_LAUNDRY/share/misc/organization.dot
==============================================================================
--- user/alc/PQ_LAUNDRY/share/misc/organization.dot	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/misc/organization.dot	Wed Jul 27 04:00:22 2016	(r303357)
@@ -30,11 +30,11 @@ coresecretary [label="Core Team Secretar
 doccommitters [label="Doc/www Committers\ndoc-committers at FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers at FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr at FreeBSD.org\nantoine, bapt, bdrewery,\nmat, swills, miwi"]
+portmgr [label="Port Management Team\nportmgr at FreeBSD.org\nantoine, bapt, bdrewery,\nmat, swills"]
 portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\nrene"]
 re [label="Primary Release Engineering Team\nre at FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsecteam at FreeBSD.org\ndelphij,\ndes, gavin, gjb,\nglebius, remko"]
-portssecteam [label="Ports Security Team\nports-secteam at FreeBSD.org\ndelphij, eadler, feld, jgh, junovitch, miwi, rea, sbz, simon, swills, zi"]
+portssecteam [label="Ports Security Team\nports-secteam at FreeBSD.org\ndelphij, eadler, feld, jgh, junovitch, rea, sbz, simon, swills, zi"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary at FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer at FreeBSD.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committers at FreeBSD.org"]

Modified: user/alc/PQ_LAUNDRY/share/mk/bsd.sys.mk
==============================================================================
--- user/alc/PQ_LAUNDRY/share/mk/bsd.sys.mk	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/mk/bsd.sys.mk	Wed Jul 27 04:00:22 2016	(r303357)
@@ -111,12 +111,30 @@ CWARNFLAGS+=	-Wno-format
 
 # GCC 5.2.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200
-CWARNFLAGS+=	-Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logical-not-parentheses -Wno-error=bool-compare -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=clobbered -Wno-error=cast-align -Wno-error=extra -Wno-error=attributes -Wno-error=inline -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=strict-aliasing -Wno-error=address
+CWARNFLAGS+=	-Wno-error=address			\
+		-Wno-error=array-bounds			\
+		-Wno-error=attributes			\
+		-Wno-error=bool-compare			\
+		-Wno-error=cast-align			\
+		-Wno-error=clobbered			\
+		-Wno-error=enum-compare			\
+		-Wno-error=extra			\
+		-Wno-error=inline			\
+		-Wno-error=logical-not-parentheses	\
+		-Wno-error=strict-aliasing		\
+		-Wno-error=uninitialized		\
+		-Wno-error=unused-but-set-variable	\
+		-Wno-error=unused-function		\
+		-Wno-error=unused-value
 .endif
 
 # GCC 6.1.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100
-CWARNFLAGS+=	-Wno-error=unused-const-variable= -Wno-error=nonnull-compare -Wno-error=shift-negative-value -Wno-error=misleading-indentation -Wno-error=tautological-compare
+CWARNFLAGS+=	-Wno-error=misleading-indentation	\
+		-Wno-error=nonnull-compare		\
+		-Wno-error=shift-negative-value		\
+		-Wno-error=tautological-compare		\
+		-Wno-error=unused-const-variable
 .endif
 
 # How to handle FreeBSD custom printf format specifiers.

Modified: user/alc/PQ_LAUNDRY/share/timedef/zh_TW.UTF-8.src
==============================================================================
--- user/alc/PQ_LAUNDRY/share/timedef/zh_TW.UTF-8.src	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/share/timedef/zh_TW.UTF-8.src	Wed Jul 27 04:00:22 2016	(r303357)
@@ -56,14 +56,14 @@
 %Y/%m/%d
 #
 # c_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%Y年%m月%e日%A %p%I:%M:%S [%Z]
 #
 # AM/PM
 上午
 下午
 #
 # date_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%Y年%m月%e日%A %p%I:%M:%S [%Z]
 #
 # Long month names (without case ending)
 1月

Modified: user/alc/PQ_LAUNDRY/sys/amd64/amd64/machdep.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/amd64/amd64/machdep.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/amd64/amd64/machdep.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -1090,7 +1090,8 @@ add_efi_map_entries(struct efi_map_heade
 		"ACPIMemoryNVS",
 		"MemoryMappedIO",
 		"MemoryMappedIOPortSpace",
-		"PalCode"
+		"PalCode",
+		"PersistentMemory"
 	};
 
 	/*
@@ -1111,7 +1112,7 @@ add_efi_map_entries(struct efi_map_heade
 	for (i = 0, p = map; i < ndesc; i++,
 	    p = efi_next_descriptor(p, efihdr->descriptor_size)) {
 		if (boothowto & RB_VERBOSE) {
-			if (p->md_type <= EFI_MD_TYPE_PALCODE)
+			if (p->md_type < nitems(types))
 				type = types[p->md_type];
 			else
 				type = "<INVALID>";
@@ -1133,6 +1134,12 @@ add_efi_map_entries(struct efi_map_heade
 				printf("RP ");
 			if (p->md_attr & EFI_MD_ATTR_XP)
 				printf("XP ");
+			if (p->md_attr & EFI_MD_ATTR_NV)
+				printf("NV ");
+			if (p->md_attr & EFI_MD_ATTR_MORE_RELIABLE)
+				printf("MORE_RELIABLE ");
+			if (p->md_attr & EFI_MD_ATTR_RO)
+				printf("RO ");
 			if (p->md_attr & EFI_MD_ATTR_RT)
 				printf("RUNTIME");
 			printf("\n");

Modified: user/alc/PQ_LAUNDRY/sys/amd64/include/pc/bios.h
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/amd64/include/pc/bios.h	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/amd64/include/pc/bios.h	Wed Jul 27 04:00:22 2016	(r303357)
@@ -40,6 +40,9 @@
 #define	SMAP_TYPE_ACPI_RECLAIM	3
 #define	SMAP_TYPE_ACPI_NVS	4
 #define	SMAP_TYPE_ACPI_ERROR	5
+#define	SMAP_TYPE_DISABLED	6
+#define	SMAP_TYPE_PMEM		7
+#define	SMAP_TYPE_PRAM		12
 
 #define	SMAP_XATTR_ENABLED	0x00000001
 #define	SMAP_XATTR_NON_VOLATILE	0x00000002

Modified: user/alc/PQ_LAUNDRY/sys/arm/arm/machdep.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/arm/arm/machdep.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/arm/arm/machdep.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -1424,7 +1424,8 @@ add_efi_map_entries(struct efi_map_heade
 		"ACPIMemoryNVS",
 		"MemoryMappedIO",
 		"MemoryMappedIOPortSpace",
-		"PalCode"
+		"PalCode",
+		"PersistentMemory"
 	};
 
 	*mrcnt = 0;
@@ -1448,7 +1449,7 @@ add_efi_map_entries(struct efi_map_heade
 	for (i = 0, j = 0, p = map; i < ndesc; i++,
 	    p = efi_next_descriptor(p, efihdr->descriptor_size)) {
 		if (boothowto & RB_VERBOSE) {
-			if (p->md_type <= EFI_MD_TYPE_PALCODE)
+			if (p->md_type < nitems(types))
 				type = types[p->md_type];
 			else
 				type = "<INVALID>";
@@ -1470,6 +1471,12 @@ add_efi_map_entries(struct efi_map_heade
 				printf("RP ");
 			if (p->md_attr & EFI_MD_ATTR_XP)
 				printf("XP ");
+			if (p->md_attr & EFI_MD_ATTR_NV)
+				printf("NV ");
+			if (p->md_attr & EFI_MD_ATTR_MORE_RELIABLE)
+				printf("MORE_RELIABLE ");
+			if (p->md_attr & EFI_MD_ATTR_RO)
+				printf("RO ");
 			if (p->md_attr & EFI_MD_ATTR_RT)
 				printf("RUNTIME");
 			printf("\n");

Modified: user/alc/PQ_LAUNDRY/sys/arm/ti/files.ti
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/arm/ti/files.ti	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/arm/ti/files.ti	Wed Jul 27 04:00:22 2016	(r303357)
@@ -20,6 +20,7 @@ arm/ti/ti_i2c.c					optional	ti_i2c
 arm/ti/ti_sdhci.c	 			optional	sdhci
 arm/ti/ti_spi.c		 			optional	ti_spi
 
+dev/mii/micphy.c				optional	micphy
 dev/uart/uart_dev_ti8250.c			optional	uart
 dev/uart/uart_dev_ns8250.c			optional	uart
 

Modified: user/alc/PQ_LAUNDRY/sys/arm64/arm64/machdep.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/arm64/arm64/machdep.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/arm64/arm64/machdep.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -707,7 +707,8 @@ add_efi_map_entries(struct efi_map_heade
 		"ACPIMemoryNVS",
 		"MemoryMappedIO",
 		"MemoryMappedIOPortSpace",
-		"PalCode"
+		"PalCode",
+		"PersistentMemory"
 	};
 
 	/*
@@ -728,7 +729,7 @@ add_efi_map_entries(struct efi_map_heade
 	for (i = 0, p = map; i < ndesc; i++,
 	    p = efi_next_descriptor(p, efihdr->descriptor_size)) {
 		if (boothowto & RB_VERBOSE) {
-			if (p->md_type <= EFI_MD_TYPE_PALCODE)
+			if (p->md_type < nitems(types))
 				type = types[p->md_type];
 			else
 				type = "<INVALID>";
@@ -750,6 +751,12 @@ add_efi_map_entries(struct efi_map_heade
 				printf("RP ");
 			if (p->md_attr & EFI_MD_ATTR_XP)
 				printf("XP ");
+			if (p->md_attr & EFI_MD_ATTR_NV)
+				printf("NV ");
+			if (p->md_attr & EFI_MD_ATTR_MORE_RELIABLE)
+				printf("MORE_RELIABLE ");
+			if (p->md_attr & EFI_MD_ATTR_RO)
+				printf("RO ");
 			if (p->md_attr & EFI_MD_ATTR_RT)
 				printf("RUNTIME");
 			printf("\n");

Modified: user/alc/PQ_LAUNDRY/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/arm64/arm64/mp_machdep.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/arm64/arm64/mp_machdep.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -112,9 +112,6 @@ static int ipi_handler(void *arg);
 struct mtx ap_boot_mtx;
 struct pcb stoppcbs[MAXCPU];
 
-#ifdef INVARIANTS
-static uint32_t cpu_reg[MAXCPU][2];
-#endif
 static device_t cpu_list[MAXCPU];
 
 /*
@@ -441,22 +438,22 @@ cpu_init_fdt(u_int id, phandle_t node, u
 	if (id > mp_maxid)
 		return (0);
 
-	KASSERT(id < MAXCPU, ("Too mant CPUs"));
-
-	KASSERT(addr_size == 1 || addr_size == 2, ("Invalid register size"));
-#ifdef INVARIANTS
-	cpu_reg[id][0] = reg[0];
-	if (addr_size == 2)
-		cpu_reg[id][1] = reg[1];
-#endif
+	KASSERT(id < MAXCPU, ("Too many CPUs"));
 
 	/* We are already running on cpu 0 */
 	if (id == cpu0)
 		return (1);
 
+	/*
+	 * Rotate the CPU IDs to put the boot CPU as CPU 0. We keep the other
+	 * CPUs ordered as the are likely grouped into clusters so it can be
+	 * useful to keep that property, e.g. for the GICv3 driver to send
+	 * an IPI to all CPUs in the cluster.
+	 */
 	cpuid = id;
 	if (cpuid < cpu0)
-		cpuid++;
+		cpuid += mp_maxid + 1;
+	cpuid -= cpu0;
 
 	pcpup = &__pcpu[cpuid];
 	pcpu_init(pcpup, cpuid, sizeof(struct pcpu));

Modified: user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC	Wed Jul 27 04:00:22 2016	(r303357)
@@ -130,6 +130,7 @@ device		pl011
 # USB support
 options 	USB_DEBUG		# enable debug msgs
 device		dwcotg			# DWC OTG controller
+device		ohci			# OHCI PCI->USB interface
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		ukbd			# Keyboard

Modified: user/alc/PQ_LAUNDRY/sys/cam/nvme/nvme_xpt.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/cam/nvme/nvme_xpt.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/cam/nvme/nvme_xpt.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -538,13 +538,8 @@ nvme_action(union ccb *start_ccb)
 
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SCAN_BUS:
-		printf("NVME scan BUS started -- ignored\n");
-//		break;
 	case XPT_SCAN_TGT:
-		printf("NVME scan TGT started -- ignored\n");
-//		break;
 	case XPT_SCAN_LUN:
-		printf("NVME scan started\n");
 		nvme_scan_lun(start_ccb->ccb_h.path->periph,
 			      start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			      start_ccb);

Modified: user/alc/PQ_LAUNDRY/sys/compat/freebsd32/freebsd32_ipc.h
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/compat/freebsd32/freebsd32_ipc.h	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/compat/freebsd32/freebsd32_ipc.h	Wed Jul 27 04:00:22 2016	(r303357)
@@ -72,7 +72,7 @@ struct shmid_ds32 {
 	int32_t		shm_segsz;
 	pid_t		shm_lpid;
 	pid_t		shm_cpid;
-	int		shm_nattch;
+	unsigned int	shm_nattch;
 	int32_t		shm_atime;
 	int32_t		shm_dtime;
 	int32_t		shm_ctime;

Modified: user/alc/PQ_LAUNDRY/sys/compat/svr4/svr4_sockio.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/compat/svr4/svr4_sockio.c	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/compat/svr4/svr4_sockio.c	Wed Jul 27 04:00:22 2016	(r303357)
@@ -73,6 +73,8 @@ bsd_to_svr4_flags(bf)
 	return sf;
 }
 
+#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)
+
 int
 svr4_sock_ioctl(fp, td, retval, fd, cmd, data)
 	struct file *fp;
@@ -144,7 +146,6 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd,
 	case SVR4_SIOCGIFCONF:
 		{
 			struct svr4_ifconf sc;
-			struct ifconf *ifc;
 
 			if ((error = copyin(data, &sc, sizeof(sc))) != 0)
 				return error;
@@ -153,19 +154,9 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd,
 				sizeof(struct ifreq), sizeof(struct svr4_ifreq),
 				sc.svr4_ifc_len));
 
-			ifc = (struct ifconf *)≻
-			ifc->ifc_req->ifr_addr.sa_family =
-			    sc.svr4_ifc_req->svr4_ifr_addr.sa_family;
-			ifc->ifc_req->ifr_addr.sa_len =
-			    sizeof(struct osockaddr);
-
-			error = fo_ioctl(fp, SIOCGIFCONF, &sc, td->td_ucred,
-			    td);
-
-			sc.svr4_ifc_req->svr4_ifr_addr.sa_family =
-			    ifc->ifc_req->ifr_addr.sa_family;
-
-			if (error != 0)
+			if ((error = fo_ioctl(fp, OSIOCGIFCONF,
+					    (caddr_t) &sc, td->td_ucred,
+					    td)) != 0)
 				return error;
 
 			DPRINTF(("SIOCGIFCONF\n"));

Modified: user/alc/PQ_LAUNDRY/sys/conf/NOTES
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/NOTES	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/conf/NOTES	Wed Jul 27 04:00:22 2016	(r303357)
@@ -578,6 +578,17 @@ options 	COMPILING_LINT
 #
 options 	STACK
 
+#
+# The NUM_CORE_FILES option specifies the limit for the number of core
+# files generated by a particular process, when the core file format
+# specifier includes the %I pattern. Since we only have 1 character for
+# the core count in the format string, meaning the range will be 0-9, the
+# maximum value allowed for this option is 10.
+# This core file limit can be adjusted at runtime via the debug.ncores
+# sysctl.
+#
+options 	NUM_CORE_FILES=5
+
 

 #####################################################################
 # PERFORMANCE MONITORING OPTIONS

Modified: user/alc/PQ_LAUNDRY/sys/conf/files
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/files	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/conf/files	Wed Jul 27 04:00:22 2016	(r303357)
@@ -1735,7 +1735,7 @@ iwm3160fw.fwo			optional iwm3160fw | iwm
 	no-implicit-rule						\
 	clean		"iwm3160fw.fwo"
 iwm3160.fw			optional iwm3160fw | iwmfw		\
-	dependency	"$S/contrib/dev/iwm/iwm-3160-9.fw.uu" \
+	dependency	"$S/contrib/dev/iwm/iwm-3160-16.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm3160.fw"
@@ -1749,7 +1749,7 @@ iwm7260fw.fwo			optional iwm7260fw | iwm
 	no-implicit-rule						\
 	clean		"iwm7260fw.fwo"
 iwm7260.fw			optional iwm7260fw | iwmfw		\
-	dependency	"$S/contrib/dev/iwm/iwm-7260-9.fw.uu" \
+	dependency	"$S/contrib/dev/iwm/iwm-7260-16.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7260.fw"
@@ -1763,10 +1763,24 @@ iwm7265fw.fwo			optional iwm7265fw | iwm
 	no-implicit-rule						\
 	clean		"iwm7265fw.fwo"
 iwm7265.fw			optional iwm7265fw | iwmfw		\
-	dependency	"$S/contrib/dev/iwm/iwm-7265-9.fw.uu" \
+	dependency	"$S/contrib/dev/iwm/iwm-7265-16.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7265.fw"
+iwm8000Cfw.c			optional iwm8000Cfw | iwmfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwm8000Cfw.c"
+iwm8000Cfw.fwo			optional iwm8000Cfw | iwmfw		\
+	dependency	"iwm8000C.fw"					\
+	compile-with	"${NORMAL_FWO}"					\
+	no-implicit-rule						\
+	clean		"iwm8000Cfw.fwo"
+iwm8000C.fw			optional iwm8000Cfw | iwmfw		\
+	dependency	"$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \
+	compile-with	"${NORMAL_FW}"					\
+	no-obj no-implicit-rule						\
+	clean		"iwm8000C.fw"
 dev/iwn/if_iwn.c		optional iwn
 iwn1000fw.c			optional iwn1000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \

Modified: user/alc/PQ_LAUNDRY/sys/conf/files.mips
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/files.mips	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/conf/files.mips	Wed Jul 27 04:00:22 2016	(r303357)
@@ -86,6 +86,7 @@ crypto/blowfish/bf_enc.c		optional	crypt
 crypto/des/des_enc.c			optional	crypto | ipsec | netsmb
 
 # AP common nvram interface MIPS specific, but maybe should be more generic
+dev/nvram2env/nvram2env_mips.c		optional	nvram2env
 dev/nvram2env/nvram2env.c		optional	nvram2env
 
 # hwpmc support

Modified: user/alc/PQ_LAUNDRY/sys/conf/kern.mk
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/kern.mk	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/conf/kern.mk	Wed Jul 27 04:00:22 2016	(r303357)
@@ -51,7 +51,7 @@ CWARNEXTRA?=	-Wno-error=inline -Wno-erro
 		-Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes \
 		-Wno-error=strict-overflow -Wno-error=overflow
 .if ${COMPILER_VERSION} >= 60100
-CWARNEXTRA+=	-Wno-error=nonnull-compare -Wno-error=shift-overflow=
+CWARNEXTRA+=	-Wno-error=nonnull-compare -Wno-error=shift-overflow
 .endif
 .else
 # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars.

Modified: user/alc/PQ_LAUNDRY/sys/conf/options
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/conf/options	Wed Jul 27 03:49:00 2016	(r303356)
+++ user/alc/PQ_LAUNDRY/sys/conf/options	Wed Jul 27 04:00:22 2016	(r303357)
@@ -65,6 +65,7 @@ SYSCTL_DEBUG	opt_sysctl.h
 EARLY_PRINTF	opt_global.h
 TEXTDUMP_PREFERRED	opt_ddb.h
 TEXTDUMP_VERBOSE	opt_ddb.h
+NUM_CORE_FILES	opt_global.h
 
 # Miscellaneous options.
 ADAPTIVE_LOCKMGRS

Copied: user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-3160-16.fw.uu (from r303356, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/sys/contrib/dev/iwm/iwm-3160-16.fw.uu	Wed Jul 27 04:00:22 2016	(r303357, copy of r303356, head/sys/contrib/dev/iwm/iwm-3160-16.fw.uu)
@@ -0,0 +1,20408 @@
+begin 644 iwm-3160-16.fw
+M`````$E73`IS=')E86TZ0V]R94-Y8VQE,3-?<W1A8D`R-#(T,30`````````
+M````````````````````````````````````$````.ZR`P````````````8`
+M```$``````(```<`````````$@````0```#_R_I8'0````@`````````^[P:
+M!!X````(`````````)"````<````$``````````````````````````;````
+M!`````$````3````!``!````@```````$````.ZR`P```0```````*A[@``0
+M*8``C*6``)28@`#4%(``@)J``````````````````````````````````&P@
+MP!`/&PDBW!W`$`H`&T`@`!MN!```81``&VX!``!A%```80\``&$``!LD(``;
+M)>0=P!'8!,`2`0`;<`@``&$/'!TB!``=)N@=P!`!`!LPZ!W`$8($&R0(`!LE
+M!"C`$>D/`&$``!LE``$;)%P<P!$```!AW!W`$```'20````A#T4`(@!<`#GT
+M)<`0`0$3,@$!$S,!`!-B[_\`,@<``&(&8`!B``!8.&!%P!!P1<`0>$7`$)!%
+MP!!@``!AX`3`$N@=P!$!`%(DM!_`$`(`$W`#``!A"`!8,`@`9#$'``!A#Q-2
+M(H($$R0(`!,E`0!2;@$``&$!``!A````80@`6&[H#P!A```3)0``$R0D$,`1
+M`(`3)#@<P!$/`!,B`0`3,`0HP!$/<Q,B@@$3,`0HP!$/<A,B"`#,$0``$R4!
+M`!,D&`#,$0``$R08`,P1#Q05(@$`%28/1``B"@``0`!``'`-``!A0``3)0<!
+M$R0$*,`1```3)0(`$R3L',`1#W83(BQ(QQ$/>!,B!`#*$0```20```$E"0``
+M84``$R4&`1,D!"C`$0]V$R(L2,<1#W at 3(@``QA$#``$D```!)0]%`"(`7``Y
+M[_\`,A@``&0``!,D`0`3)3@<P!$/=Q,BX!S`$0(``6(/`1,B!`C`$=P'P!($
+M*,`1X`?`$LA)QQ$/<!,B`0`3,`0HP!'H!\`2&"C`$0\3`R(#`!,D```3)00(
+MP!$``!,D.$7`$00``&$``%@X```3)`$`$R4X',`1```5)````"'H'<`0#Q,'
+M(@]D`2(*``%`"``!<!@``&$(`%AN!@``80@`!W`"``!A``)<,0(``&$`(%@P
+M````80%"$R0``!,E!"C`$>@=P!#F_Q,R__\3,^@=P!$```$D"``!)0\!8R(!
+M`%(D"``';@(``&$``!4D````(0X``&'8!,`2Z!W`$0$`4B2T'\`0`@`3<`(`
+M`&$(`&0QY@\`80\34B(/$U(B`0!2;@$``&$!``!A````81PJ@($``,`6`@$3
+M9$(!$R0$*,`18'Z`@0``P!8&`1-B!`C`$`0`$V0/7``B"@``0``&`'`:``!A
+M```3)```$R4``,`7`$!8,,@@P!!P1<`0$`C`$```$R4#`!,D'`C`$1P(P!$`
+M`!,D!`C`$0\4%2($`!4F#S`@(OO_,#(#`!,D&`C`$0\4%2("`!4F#R`P(@``
+M$R001<`1&`C`$0`06#`/`!,B`0`3,`0HP!$/?!,B"`#,$0``$R4``!,D-$C'
+M$4``$R4'`1,D!"C`$0][$R(!`!,P!"C`$0\4%2("`!4F#TT3(@00Q1$"`!,D
+M\!S`$0$`$R3L',`1```3)'``$R40',`1```3)0``$R3@',`14'Z`@0``P!8"
+M`1-B#Q05(AL`%28``!,E`0`3)"00P!$``!,D``#`%P``%20````A```;)0``
+M&R0!`&1N`0`;)`(`9&X"`!LD!`!D;@0`&R0,`!MB#QL+(@\+8R(!`!M``@`;
+M00```&$``!LE"`B`@0`;&B@``,`6```;)0(`&T```!MQ#V1C(@``'20````A
+M```````````(````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````````````````````````````````````````````````````````
+M````````1`"`````````````#!`0``0!$`X0$!`0$!`0$!`0$!`0$!`0$!`0
+M$!`0$!`/$`D0$`4*$`L0$!`0`A`0#1`0$!`0$!`0$!`0!@,0$!`0$!`0$!`0
+M$!`0$`@0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0
+M$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0
+M$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0
+M$!`0$!`0$!`0$!`0$!`'$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0
+M$!`0$`````````0`S`,!``X`[`8%`,0`2`0&`$``#`4'`-@`9`4(`&@`/`8)
+M`$``I`8*`#P`T`,+`#P`#`0/``@`Y`81`!@`3`42`*0!```3``P`_`84``,`
+M"`<5``0`#`<`````````````````````````````````````````````````
+M```````>````'H@>B%H```!6````5HA6B`(!``"J````JHBJB/X!``","@``
+M5(Q4C*0?````````````````_@```0#_``(!_P$`_P$!`/X"`0,"_P$!`/\!
+M`0'_`@#_`P(`_ at 0"`P+_`@(`_P("`?\#`/\%`P#^!@,``_\#`P#_`P,!_P``
+M`````````````)1)```*````!````'A]@`````````````````#T20``!0``
+M``0```!X?8````````$```"8^```&/D``+#X``#T^```U/4``-#U``!D-P``
+M%#8``&0V```````````````!"_\```4#```$`@``!O\```#_```,_P``!_\`

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

More information about the svn-src-user mailing list