[src/trunk]: src/sys/arch add a special rule to build m68k/fpu.c to avoid pas...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ce56a78afe4
branches:  trunk
changeset: 830062:5ce56a78afe4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 25 00:27:16 2018 +0000

description:
add a special rule to build m68k/fpu.c to avoid passing -msoft-float.
fixes GCC 6 kernel builds that use this file.

diffstat:

 sys/arch/atari/conf/Makefile.atari        |  4 +++-
 sys/arch/atari/conf/files.atari           |  4 ++--
 sys/arch/hp300/conf/Makefile.hp300        |  4 +++-
 sys/arch/hp300/conf/files.hp300           |  4 ++--
 sys/arch/luna68k/conf/Makefile.luna68k    |  4 +++-
 sys/arch/luna68k/conf/files.luna68k       |  4 ++--
 sys/arch/m68k/conf/Makefile.kern.m68k.inc |  8 ++++++++
 sys/arch/mac68k/conf/Makefile.mac68k      |  4 +++-
 sys/arch/mac68k/conf/files.mac68k         |  4 ++--
 sys/arch/sun3/conf/Makefile.sun3          |  4 +++-
 sys/arch/sun3/conf/files.sun3             |  4 ++--
 sys/arch/x68k/conf/Makefile.x68k          |  4 +++-
 sys/arch/x68k/conf/files.x68k             |  4 ++--
 13 files changed, 38 insertions(+), 18 deletions(-)

diffs (230 lines):

diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/atari/conf/Makefile.atari
--- a/sys/arch/atari/conf/Makefile.atari        Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/atari/conf/Makefile.atari        Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.atari,v 1.76 2015/09/06 02:17:30 uebayasi Exp $
+#      $NetBSD: Makefile.atari,v 1.77 2018/02/25 00:27:16 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -58,6 +58,8 @@
 locore.o: ${ATARI}/atari/locore.s assym.h
        ${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/atari/conf/files.atari
--- a/sys/arch/atari/conf/files.atari   Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/atari/conf/files.atari   Sun Feb 25 00:27:16 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: files.atari,v 1.120 2011/11/15 12:23:21 tsutsui Exp $
+#      $NetBSD: files.atari,v 1.121 2018/02/25 00:27:16 mrg Exp $
 
 maxpartitions 16
 
@@ -217,7 +217,7 @@
 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
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300        Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300        Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.hp300,v 1.92 2015/09/06 02:17:30 uebayasi Exp $
+#      $NetBSD: Makefile.hp300,v 1.93 2018/02/25 00:27:16 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -54,6 +54,8 @@
 locore.o: ${HP300}/hp300/locore.s assym.h
        ${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300   Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/hp300/conf/files.hp300   Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.hp300,v 1.89 2014/08/24 08:17:44 tsutsui Exp $
+#      $NetBSD: files.hp300,v 1.90 2018/02/25 00:27:16 mrg Exp $
 #
 # hp300-specific configuration info
 
@@ -217,7 +217,7 @@
 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
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k    Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k    Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.luna68k,v 1.27 2015/09/06 02:17:30 uebayasi Exp $
+#      $NetBSD: Makefile.luna68k,v 1.28 2018/02/25 00:27:16 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -58,6 +58,8 @@
 locore.o: ${LUNA68K}/luna68k/locore.s assym.h
        ${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/luna68k/conf/files.luna68k
--- a/sys/arch/luna68k/conf/files.luna68k       Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/luna68k/conf/files.luna68k       Sun Feb 25 00:27:16 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: files.luna68k,v 1.26 2017/03/09 14:05:58 tsutsui Exp $
+#      $NetBSD: files.luna68k,v 1.27 2018/02/25 00:27:16 mrg Exp $
 #
 maxpartitions 8
 maxusers 2 8 64
@@ -16,7 +16,7 @@
 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
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/m68k/conf/Makefile.kern.m68k.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/m68k/conf/Makefile.kern.m68k.inc Sun Feb 25 00:27:16 2018 +0000
@@ -0,0 +1,8 @@
+#      $NetBSD: Makefile.kern.m68k.inc,v 1.1 2018/02/25 00:27:16 mrg Exp $
+
+# 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 $@
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/mac68k/conf/Makefile.mac68k
--- a/sys/arch/mac68k/conf/Makefile.mac68k      Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/mac68k/conf/Makefile.mac68k      Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mac68k,v 1.91 2015/09/06 02:17:30 uebayasi Exp $
+#      $NetBSD: Makefile.mac68k,v 1.92 2018/02/25 00:27:16 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -54,6 +54,8 @@
 locore.o: ${MAC68K}/mac68k/locore.s assym.h
        ${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/mac68k/conf/files.mac68k
--- a/sys/arch/mac68k/conf/files.mac68k Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/mac68k/conf/files.mac68k Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.mac68k,v 1.125 2011/11/15 12:23:22 tsutsui Exp $
+#      $NetBSD: files.mac68k,v 1.126 2018/02/25 00:27:16 mrg Exp $
 
 # mac68k-specific configuration info
 
@@ -174,7 +174,7 @@
 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
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/sun3/conf/Makefile.sun3
--- a/sys/arch/sun3/conf/Makefile.sun3  Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/sun3/conf/Makefile.sun3  Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.104 2015/04/15 19:13:47 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.105 2018/02/25 00:27:16 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -51,6 +51,8 @@
 locore.o: ${SUN3}/${MACHTYPE}/locore.s
        ${NORMAL_S}
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (5) link settings
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/sun3/conf/files.sun3
--- a/sys/arch/sun3/conf/files.sun3     Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/sun3/conf/files.sun3     Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sun3,v 1.81 2012/05/05 13:47:07 macallan Exp $
+#      $NetBSD: files.sun3,v 1.82 2018/02/25 00:27:16 mrg Exp $
 
 #
 # sun3-specific configuration info
@@ -39,7 +39,7 @@
 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"
 
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/x68k/conf/Makefile.x68k
--- a/sys/arch/x68k/conf/Makefile.x68k  Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/x68k/conf/Makefile.x68k  Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.x68k,v 1.64 2015/09/06 02:17:31 uebayasi Exp $
+#      $NetBSD: Makefile.x68k,v 1.65 2018/02/25 00:27:16 mrg Exp $
 #
 # Makefile for NetBSD
 #
@@ -66,6 +66,8 @@
 TEXTADDR?=     0
 LINKFORMAT=    -n
 
+.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
+
 ##
 ## (6) port specific target dependencies
 ##
diff -r 45f8d4002899 -r 5ce56a78afe4 sys/arch/x68k/conf/files.x68k
--- a/sys/arch/x68k/conf/files.x68k     Sun Feb 25 00:16:48 2018 +0000
+++ b/sys/arch/x68k/conf/files.x68k     Sun Feb 25 00:27:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.x68k,v 1.79 2012/10/02 23:54:54 christos Exp $
+#      $NetBSD: files.x68k,v 1.80 2018/02/25 00:27:16 mrg Exp $
 #
 # new style config file for x68k architecture
 #
@@ -33,7 +33,7 @@
 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