Index: head/sys/conf/Makefile.amd64
===================================================================
--- head/sys/conf/Makefile.amd64	(revision 336358)
+++ head/sys/conf/Makefile.amd64	(revision 336359)
@@ -1,57 +1,57 @@
 # Makefile.amd64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/amd64/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.amd64
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 .if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED)
 CFLAGS+=	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 .endif
 
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS34}
 ASM_CFLAGS.mpboot.S=		${CLANG_NO_IAS34}
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.arm
===================================================================
--- head/sys/conf/Makefile.arm	(revision 336358)
+++ head/sys/conf/Makefile.arm	(revision 336359)
@@ -1,175 +1,175 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arm/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.arm
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600013
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt -I$S/gnu/dts/include 
 
 SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M}
 SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}
 
 .if !defined(DEBUG) && !defined(PROFLEVEL)
 STRIP_FLAGS = -S
 .endif
 
 # We don't support gcc's thump interwork stuff, so disable it
 CFLAGS.gcc += -mno-thumb-interwork
 
 # We generally don't want fpu instructions in the kernel.
 CFLAGS.clang += -mfpu=none
 
 .if !empty(DDB_ENABLED)
 CFLAGS += -funwind-tables
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500
 # clang < 3.5.0 requires us to tell it to emit assembly with unwind information
 CFLAGS += -mllvm -arm-enable-ehabi
 .endif
 .endif
 
 # "makeoptions KERNVIRTADDR=" is now optional, supply the default value.
 .if empty(KERNVIRTADDR)
 KERNVIRTADDR= 0xc0000000
 .endif
 
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
 SYSTEM_LD_ = ${LD} -m ${LD_EMULATION} -Bdynamic -T ldscript.$M.noheader \
 	${_LDFLAGS} --no-warn-mismatch --warn-common --export-dynamic \
 	--dynamic-linker /red/herring \
 	-o ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\
 		>ldscript.$M.noheader; \
 		${SYSTEM_LD_}; \
 		${OBJCOPY} -S -O binary ${FULLKERNEL}.noheader \
 		${KERNEL_KO}.bin; \
 		rm ${FULLKERNEL}.noheader
 
 FILES_CPU_FUNC = \
 	$S/$M/$M/cpufunc_asm_arm9.S \
 	$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
 	$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
 	$S/$M/$M/cpufunc_asm_fa526.S $S/$M/$M/cpufunc_asm_sheeva.S \
 	$S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv6.S \
 	$S/$M/$M/cpufunc_asm_armv7.S
 
 .if ${MACHINE_ARCH:Marmv[67]*} == "" && defined(KERNPHYSADDR)
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=kernel.gz.tramp
 trampoline: ${KERNEL_KO}.tramp
 ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h 
 	sed s/${KERNVIRTADDR}/${KERNPHYSADDR}/ ldscript.$M > ldscript.$M.tramp
 	sed s/" + SIZEOF_HEADERS"// ldscript.$M.tramp > \
 	    ldscript.$M.tramp.noheader
 	echo "#include <machine/asm.h>" >tmphack.S
 	echo "ENTRY(_start)" >>tmphack.S
 	echo "bl _startC" >>tmphack.S
 	${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \
 	    -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
 	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp \
 	    -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \
 	    -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp.noheader 
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.tramp.bin 
 	${OBJCOPY} ${STRIP_FLAGS} ${KERNEL_KO}.tmp 
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp.gz\"" >opt_kernname.h 
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
 	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	gzip -f9 ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \
 	    echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
 	${CC} -O2 -ffreestanding -I. -I$S -c \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    $S/kern/subr_inflate.c \
 	    -o inflate-tramp.o
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    inflate-tramp.o \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.gz.tramp
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \
 	    -DKZIP -DELF_TRAMPOLINE \
 	    tmphack.S \
 	    $S/$M/$M/elf_trampoline.c \
 	    inflate-tramp.o \
 	    $S/$M/$M/inckern.S \
 	    ${FILES_CPU_FUNC} \
 	    -o ${KERNEL_KO}.tramp.noheader
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.gz.tramp.bin
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
 	    inflate-tramp.o tmphack.S
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 CLEAN+=	ldscript.$M ${KERNEL_KO}.bin ldscript.$M.noheader
 
 CLEAN+= ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin ldscript.$M.tramp \
 	ldscript.$M.tramp.noheader ${KERNEL_KO}.gz.tramp \
 	${KERNEL_KO}.gz.tramp.bin
 
 ldscript.$M: $S/conf/ldscript.$M
 	cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \
 	  sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
 %RULES
 	
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.arm64
===================================================================
--- head/sys/conf/Makefile.arm64	(revision 336358)
+++ head/sys/conf/Makefile.arm64	(revision 336359)
@@ -1,48 +1,48 @@
 # Makefile.arm64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arm64/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.arm64
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 .if !defined(S)
 S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 .if !empty(DDB_ENABLED)
 CFLAGS += -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.i386
===================================================================
--- head/sys/conf/Makefile.i386	(revision 336358)
+++ head/sys/conf/Makefile.i386	(revision 336359)
@@ -1,52 +1,52 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS34}
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS34}
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.mips
===================================================================
--- head/sys/conf/Makefile.mips	(revision 336358)
+++ head/sys/conf/Makefile.mips	(revision 336359)
@@ -1,104 +1,104 @@
 # Makefile.mips
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/mips/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.mips
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 LDSCRIPT_NAME?=ldscript.$M
 SYSTEM_LD:= ${SYSTEM_LD:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}}
 SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}}
 
 KERNLOADADDR?=0x80001000
 # This obscure value is defined by CFE for WR160N
 # To be changed later
 TRAMPLOADADDR?=0x807963c0
 
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
 ARCH_FLAGS?=-march=mips32
 EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
 
 HACK_EXTRA_FLAGS=-shared
 
 # We add the -fno-pic flag to kernels because otherwise performance
 # is extremely poor, as well as -mno-abicalls to force no ABI usage.
 CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
 HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
 TRAMP_ARCH_FLAGS?=$(ARCH_FLAGS)
 TRAMP_EXTRA_FLAGS=${EXTRA_FLAGS} ${TRAMP_ARCH_FLAGS}
 # Kernel code is always compiled with soft-float on MIPS
 TRAMP_EXTRA_FLAGS+=-msoft-float
 .if ${MACHINE_ARCH:Mmips64*} != ""
 TRAMP_ELFSIZE=64
 .else
 TRAMP_ELFSIZE=32
 .endif
 
 ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
 
 .if !defined(WITHOUT_KERNEL_TRAMPOLINE)
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=${KERNEL_KO}.tramp.bin
 trampoline: ${KERNEL_KO}.tramp.bin
 ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
 	$S/$M/$M/inckern.S 
 	${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \
 		-g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
 	sed -e s/${KERNLOADADDR}/${TRAMPLOADADDR}/ -e s/" + SIZEOF_HEADERS"// \
 		 ${LDSCRIPT_NAME} > ${LDSCRIPT_NAME}.tramp.noheader
 	${CC} -O -nostdlib -I. -I$S ${TRAMP_EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \
 		-T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader \
 		-DKERNNAME="\"${KERNEL_KO}.tmp\"" -DELFSIZE=${TRAMP_ELFSIZE} \
 		$S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c \
 		-o ${KERNEL_KO}.tramp.elf
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.elf \
 		${KERNEL_KO}.tramp.bin
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 CLEAN+=	${LDSCRIPT_NAME} ${LDSCRIPT_NAME}.tramp.noheader \
 	${KERNEL_KO}.tramp.elf ${KERNEL_KO}.tramp.bin
 
 ${LDSCRIPT_NAME}: $S/conf/${LDSCRIPT_NAME}
 	sed s/KERNLOADADDR/${KERNLOADADDR}/g $S/conf/${LDSCRIPT_NAME} \
 		> ${LDSCRIPT_NAME}
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.powerpc
===================================================================
--- head/sys/conf/Makefile.powerpc	(revision 336358)
+++ head/sys/conf/Makefile.powerpc	(revision 336359)
@@ -1,67 +1,67 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/powerpc/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.powerpc
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 
 LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
 
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 .if "${MACHINE_ARCH}" == "powerpcspe"
 # Force __SPE__, since the builtin will be removed later with -mno-spe
 CFLAGS+= -mabi=spe -D__SPE__
 .endif
 CFLAGS+= -msoft-float
 CFLAGS.gcc+= -Wa,-many
 
 # Build position-independent kernel
 CFLAGS+= -fPIC
 LDFLAGS+= -pie
 
 .if !empty(DDB_ENABLED)
 CFLAGS+=	-fno-omit-frame-pointer
 .endif
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.riscv
===================================================================
--- head/sys/conf/Makefile.riscv	(revision 336358)
+++ head/sys/conf/Makefile.riscv	(revision 336359)
@@ -1,57 +1,57 @@
 # Makefile.riscv -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # RISCVTODO: copy pasted from aarch64, needs to be
 # constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/riscv/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.riscv
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 .if !defined(S)
 S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
 INCLUDES+= -I$S/contrib/libfdt
 
 SYSTEM_LD= @${LD} -N -m ${LD_EMULATION} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} \
 	--no-warn-mismatch --warn-common --export-dynamic \
 	--dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 
 .if !empty(DDB_ENABLED)
 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
 .endif
 
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"
Index: head/sys/conf/Makefile.sparc64
===================================================================
--- head/sys/conf/Makefile.sparc64	(revision 336358)
+++ head/sys/conf/Makefile.sparc64	(revision 336359)
@@ -1,49 +1,49 @@
 # Makefile.sparc64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 # $FreeBSD$
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/sparc64/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/conf/Makefile.sparc64
 # after which config should be rerun for all machines.
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	700000
 
 STD8X16FONT?=	iso
 
 .if !defined(S)
 .if exists(./@/.)
 S=	./@
 .else
 S=	../../..
 .endif
 .endif
 .include "$S/conf/kern.pre.mk"
 
 MDOBJS=	exception.o interrupt.o
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %FILES.c
 
 %FILES.s
 
 %FILES.m
 
 %CLEAN
 
 %RULES
 
 .include "$S/conf/kern.post.mk"