add a special rule to build m68k/fpu.c to avoid passing -msoft-float.

fixes GCC 6 kernel builds that use this file.
This commit is contained in:
mrg 2018-02-25 00:27:16 +00:00
parent 2e19323388
commit b63cf4b769
13 changed files with 38 additions and 18 deletions

View File

@ -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 @@ 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
##

View File

@ -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/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

View File

@ -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 @@ 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
##

View File

@ -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/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

View File

@ -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 @@ MD_SFILES=
locore.o: ${LUNA68K}/luna68k/locore.s assym.h
${NORMAL_S}
.include "$S/arch/m68k/conf/Makefile.kern.m68k.inc"
##
## (5) link settings
##

View File

@ -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/pmap_bootstrap.c
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

View File

@ -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 $@

View File

@ -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 @@ 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
##

View File

@ -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/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

View File

@ -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 @@ 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
##

View File

@ -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/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"

View File

@ -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 @@ 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
##

View File

@ -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/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