Index: sys/arch/atari/conf/Makefile.atari
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/conf/Makefile.atari,v
retrieving revision 1.76
diff -p -u -u -r1.76 Makefile.atari
--- sys/arch/atari/conf/Makefile.atari	6 Sep 2015 02:17:30 -0000	1.76
+++ sys/arch/atari/conf/Makefile.atari	24 Feb 2018 23:12:18 -0000
@@ -58,6 +58,8 @@ copy.o copypage.o lock_stubs.o: assym.h
 locore.o: ${ATARI}/atari/locore.s assym.h
 	${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
Index: sys/arch/atari/conf/files.atari
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/conf/files.atari,v
retrieving revision 1.120
diff -p -u -u -r1.120 files.atari
--- sys/arch/atari/conf/files.atari	15 Nov 2011 12:23:21 -0000	1.120
+++ sys/arch/atari/conf/files.atari	24 Feb 2018 23:12:18 -0000
@@ -217,7 +217,7 @@ file	arch/atari/dev/ym2149.c			_atarihw_
 file	arch/atari/atari/intr.c
 file	arch/m68k/m68k/cacheops.c
 file	arch/m68k/m68k/db_memrw.c		ddb
-file	arch/m68k/m68k/fpu.c
+file	arch/m68k/m68k/fpu.c			compile-with "${M68K_KERN_FPU}"
 file	arch/m68k/m68k/pmap_motorola.c
 file	arch/m68k/m68k/procfs_machdep.c		procfs
 file	arch/m68k/m68k/sys_machdep.c
Index: sys/arch/hp300/conf/Makefile.hp300
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/conf/Makefile.hp300,v
retrieving revision 1.92
diff -p -u -u -r1.92 Makefile.hp300
--- sys/arch/hp300/conf/Makefile.hp300	6 Sep 2015 02:17:30 -0000	1.92
+++ sys/arch/hp300/conf/Makefile.hp300	24 Feb 2018 23:12:18 -0000
@@ -54,6 +54,8 @@ MD_SFILES=	${HP300}/hp300/locore.s
 locore.o: ${HP300}/hp300/locore.s assym.h
 	${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
Index: sys/arch/hp300/conf/files.hp300
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/conf/files.hp300,v
retrieving revision 1.89
diff -p -u -u -r1.89 files.hp300
--- sys/arch/hp300/conf/files.hp300	24 Aug 2014 08:17:44 -0000	1.89
+++ sys/arch/hp300/conf/files.hp300	24 Feb 2018 23:12:18 -0000
@@ -217,7 +217,7 @@ file	arch/hp300/hp300/trap.c
 file	arch/hp300/hp300/disksubr.c
 file	arch/m68k/m68k/cacheops.c
 file	arch/m68k/m68k/db_memrw.c		ddb | kgdb
-file	arch/m68k/m68k/fpu.c
+file	arch/m68k/m68k/fpu.c			compile-with "${M68K_KERN_FPU}"
 file	arch/m68k/m68k/kgdb_machdep.c		kgdb
 file	arch/m68k/m68k/pmap_motorola.c
 file	arch/m68k/m68k/procfs_machdep.c		procfs
Index: sys/arch/luna68k/conf/Makefile.luna68k
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/conf/Makefile.luna68k,v
retrieving revision 1.27
diff -p -u -u -r1.27 Makefile.luna68k
--- sys/arch/luna68k/conf/Makefile.luna68k	6 Sep 2015 02:17:30 -0000	1.27
+++ sys/arch/luna68k/conf/Makefile.luna68k	24 Feb 2018 23:12:18 -0000
@@ -58,6 +58,8 @@ MD_SFILES=	
 locore.o: ${LUNA68K}/luna68k/locore.s assym.h
 	${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
Index: sys/arch/luna68k/conf/files.luna68k
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/conf/files.luna68k,v
retrieving revision 1.26
diff -p -u -u -r1.26 files.luna68k
--- sys/arch/luna68k/conf/files.luna68k	9 Mar 2017 14:05:58 -0000	1.26
+++ sys/arch/luna68k/conf/files.luna68k	24 Feb 2018 23:12:18 -0000
@@ -16,7 +16,7 @@ file arch/luna68k/luna68k/pmap_bootstrap
 file arch/luna68k/luna68k/trap.c
 file arch/m68k/m68k/cacheops.c
 file arch/m68k/m68k/db_memrw.c		ddb | kgdb
-file arch/m68k/m68k/fpu.c
+file arch/m68k/m68k/fpu.c		compile-with "${M68K_KERN_FPU}"
 file arch/m68k/m68k/pmap_motorola.c
 file arch/m68k/m68k/procfs_machdep.c	procfs
 file arch/m68k/m68k/sys_machdep.c
Index: sys/arch/m68k/conf/Makefile.kern.m68k.inc
===================================================================
RCS file: sys/arch/m68k/conf/Makefile.kern.m68k.inc
diff -N sys/arch/m68k/conf/Makefile.kern.m68k.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/arch/m68k/conf/Makefile.kern.m68k.inc	24 Feb 2018 23:12:18 -0000
@@ -0,0 +1,8 @@
+#	$NetBSD$
+
+# Special make rule to build fpu files in the kernel and avoid passing
+# -msoft-float.  Use this with config(1) file, eg:
+#   file arch/m68k/m68k/fpu.c compile-with "${M68K_KERN_FPU}"
+
+M68K_KERN_FPU= \
+	${CC} ${COPTS.${<:T}} ${CFLAGS:N-msoft-float} ${CPPFLAGS} -c $< -o $@
Index: sys/arch/mac68k/conf/Makefile.mac68k
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/conf/Makefile.mac68k,v
retrieving revision 1.91
diff -p -u -u -r1.91 Makefile.mac68k
--- sys/arch/mac68k/conf/Makefile.mac68k	6 Sep 2015 02:17:30 -0000	1.91
+++ sys/arch/mac68k/conf/Makefile.mac68k	24 Feb 2018 23:12:18 -0000
@@ -54,6 +54,8 @@ MD_SFILES=	${MAC68K}/mac68k/locore.s
 locore.o: ${MAC68K}/mac68k/locore.s assym.h
 	${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
Index: sys/arch/mac68k/conf/files.mac68k
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/conf/files.mac68k,v
retrieving revision 1.125
diff -p -u -u -r1.125 files.mac68k
--- sys/arch/mac68k/conf/files.mac68k	15 Nov 2011 12:23:22 -0000	1.125
+++ sys/arch/mac68k/conf/files.mac68k	24 Feb 2018 23:12:18 -0000
@@ -174,7 +174,7 @@ file	arch/mac68k/mac68k/via.c
 file	arch/m68k/m68k/bus_dma.c
 file	arch/m68k/m68k/cacheops.c
 file	arch/m68k/m68k/db_memrw.c		ddb | kgdb
-file	arch/m68k/m68k/fpu.c
+file	arch/m68k/m68k/fpu.c			compile-with "${M68K_KERN_FPU}"
 file	arch/m68k/m68k/kgdb_machdep.c		kgdb
 file	arch/m68k/m68k/pmap_motorola.c
 file	arch/m68k/m68k/procfs_machdep.c		procfs
Index: sys/arch/sun3/conf/Makefile.sun3
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/conf/Makefile.sun3,v
retrieving revision 1.104
diff -p -u -u -r1.104 Makefile.sun3
--- sys/arch/sun3/conf/Makefile.sun3	15 Apr 2015 19:13:47 -0000	1.104
+++ sys/arch/sun3/conf/Makefile.sun3	24 Feb 2018 23:12:18 -0000
@@ -51,6 +51,8 @@ MD_SFILES=	${SUN3}/${MACHTYPE}/locore.s
 locore.o: ${SUN3}/${MACHTYPE}/locore.s
 	${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
Index: sys/arch/sun3/conf/files.sun3
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/conf/files.sun3,v
retrieving revision 1.81
diff -p -u -u -r1.81 files.sun3
--- sys/arch/sun3/conf/files.sun3	5 May 2012 13:47:07 -0000	1.81
+++ sys/arch/sun3/conf/files.sun3	24 Feb 2018 23:12:18 -0000
@@ -39,7 +39,7 @@ file arch/sun3/sun3/sunmon.c
 file arch/sun3/sun3/sys_machdep.c
 file arch/sun3/sun3/trap.c
 file arch/m68k/m68k/cacheops.c			_sun3x_
-file arch/m68k/m68k/fpu.c
+file arch/m68k/m68k/fpu.c			compile-with "${M68K_KERN_FPU}"
 
 include "arch/m68k/fpe/files.fpe"
 
Index: sys/arch/x68k/conf/Makefile.x68k
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/conf/Makefile.x68k,v
retrieving revision 1.64
diff -p -u -u -r1.64 Makefile.x68k
--- sys/arch/x68k/conf/Makefile.x68k	6 Sep 2015 02:17:31 -0000	1.64
+++ sys/arch/x68k/conf/Makefile.x68k	24 Feb 2018 23:12:18 -0000
@@ -66,6 +66,8 @@ copy.o copypage.o lock_stubs.o: assym.h
 TEXTADDR?=	0
 LINKFORMAT=	-n
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (6) port specific target dependencies
 ##
Index: sys/arch/x68k/conf/files.x68k
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/conf/files.x68k,v
retrieving revision 1.79
diff -p -u -u -r1.79 files.x68k
--- sys/arch/x68k/conf/files.x68k	2 Oct 2012 23:54:54 -0000	1.79
+++ sys/arch/x68k/conf/files.x68k	24 Feb 2018 23:12:18 -0000
@@ -33,7 +33,7 @@ file	arch/x68k/x68k/trap.c
 file	arch/x68k/x68k/bus.c
 file	arch/m68k/m68k/cacheops.c
 file	arch/m68k/m68k/db_memrw.c	ddb
-file	arch/m68k/m68k/fpu.c
+file	arch/m68k/m68k/fpu.c		compile-with "${M68K_KERN_FPU}"
 file	arch/m68k/m68k/pmap_motorola.c
 file	arch/m68k/m68k/procfs_machdep.c	procfs
 file	arch/m68k/m68k/sys_machdep.c