Module Name: src
Committed By: uebayasi
Date: Sun Sep 6 02:17:31 UTC 2015
Modified Files:
src/sys/arch/amiga/conf: Makefile.amiga
src/sys/arch/atari/conf: Makefile.atari
src/sys/arch/cesfic/conf: Makefile.cesfic
src/sys/arch/hp300/conf: Makefile.hp300
src/sys/arch/luna68k/conf: Makefile.luna68k
src/sys/arch/m68k/fpsp: Makefile.inc
src/sys/arch/mac68k/conf: Makefile.mac68k
src/sys/arch/mvme68k/conf: Makefile.mvme68k
src/sys/arch/news68k/conf: Makefile.news68k
src/sys/arch/next68k/conf: Makefile.next68k
src/sys/arch/x68k/conf: Makefile.x68k
Log Message:
Declare dependency on fpsp.o via newly introduced ${MD_LIBS} instead of
${MD_OBJS}.
${MD_OBJS} should be used only for objects that must be linked first (i.e.,
start code). Objects have to be compiled following common compile rules,
and have to be generated into common places (i.e., top of kernel build
directory).
${MD_LIBS} defines libraries that are built by separate makefiles, under
separate directories. `Makefile.kern.inc' doesn't know intermediate library
objects.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/amiga/conf/Makefile.amiga
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/atari/conf/Makefile.atari
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/cesfic/conf/Makefile.cesfic
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/hp300/conf/Makefile.hp300
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/m68k/fpsp/Makefile.inc
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/mac68k/conf/Makefile.mac68k
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/mvme68k/conf/Makefile.mvme68k
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/news68k/conf/Makefile.news68k
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/next68k/conf/Makefile.next68k
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/x68k/conf/Makefile.x68k
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/Makefile.amiga
diff -u src/sys/arch/amiga/conf/Makefile.amiga:1.108 src/sys/arch/amiga/conf/Makefile.amiga:1.109
--- src/sys/arch/amiga/conf/Makefile.amiga:1.108 Mon May 25 05:48:18 2015
+++ src/sys/arch/amiga/conf/Makefile.amiga Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amiga,v 1.108 2015/05/25 05:48:18 mlelstv Exp $
+# $NetBSD: Makefile.amiga,v 1.109 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -53,7 +53,8 @@ KERN_AS= obj
# for the Motorola 68060 Software Support Package
.include "$S/arch/m68k/060sp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${AMIGA}/amiga/locore.s
Index: src/sys/arch/atari/conf/Makefile.atari
diff -u src/sys/arch/atari/conf/Makefile.atari:1.75 src/sys/arch/atari/conf/Makefile.atari:1.76
--- src/sys/arch/atari/conf/Makefile.atari:1.75 Fri Jan 21 15:59:05 2011
+++ src/sys/arch/atari/conf/Makefile.atari Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.atari,v 1.75 2011/01/21 15:59:05 joerg Exp $
+# $NetBSD: Makefile.atari,v 1.76 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -48,7 +48,8 @@ KERN_AS= obj
# for the Motorola 68060 Software Support Package
.include "$S/arch/m68k/060sp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${ATARI}/atari/locore.s
Index: src/sys/arch/cesfic/conf/Makefile.cesfic
diff -u src/sys/arch/cesfic/conf/Makefile.cesfic:1.18 src/sys/arch/cesfic/conf/Makefile.cesfic:1.19
--- src/sys/arch/cesfic/conf/Makefile.cesfic:1.18 Mon Aug 31 05:46:41 2015
+++ src/sys/arch/cesfic/conf/Makefile.cesfic Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cesfic,v 1.18 2015/08/31 05:46:41 uebayasi Exp $
+# $NetBSD: Makefile.cesfic,v 1.19 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -48,7 +48,8 @@ KERN_AS= obj
# for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${CESFIC}/cesfic/locore.s
Index: src/sys/arch/hp300/conf/Makefile.hp300
diff -u src/sys/arch/hp300/conf/Makefile.hp300:1.91 src/sys/arch/hp300/conf/Makefile.hp300:1.92
--- src/sys/arch/hp300/conf/Makefile.hp300:1.91 Mon Aug 31 05:46:41 2015
+++ src/sys/arch/hp300/conf/Makefile.hp300 Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp300,v 1.91 2015/08/31 05:46:41 uebayasi Exp $
+# $NetBSD: Makefile.hp300,v 1.92 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -46,7 +46,8 @@ KERN_AS= obj
# for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${HP300}/hp300/locore.s
Index: src/sys/arch/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.26 src/sys/arch/luna68k/conf/Makefile.luna68k:1.27
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.26 Thu Nov 13 16:18:38 2014
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.26 2014/11/13 16:18:38 tsutsui Exp $
+# $NetBSD: Makefile.luna68k,v 1.27 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -50,7 +50,8 @@ KERN_AS= library
# for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES=
Index: src/sys/arch/m68k/fpsp/Makefile.inc
diff -u src/sys/arch/m68k/fpsp/Makefile.inc:1.17 src/sys/arch/m68k/fpsp/Makefile.inc:1.18
--- src/sys/arch/m68k/fpsp/Makefile.inc:1.17 Fri Sep 4 09:18:11 2015
+++ src/sys/arch/m68k/fpsp/Makefile.inc Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2015/09/04 09:18:11 uebayasi Exp $
+# $NetBSD: Makefile.inc,v 1.18 2015/09/06 02:17:30 uebayasi Exp $
#
# Configuration variables (default values are below):
#
@@ -41,9 +41,6 @@ FPSPMAKE= \
FPSPDIR=${FPSPDIR:Q} \
${FPSPMISCMAKEFLAGS}
-fpsp.o: ${FPSP}
- ln -sf ${FPSP} $@
-
${FPSP}: .NOTMAIN __always_make_fpsp
@echo making sure the 68040 FPSP is up to date...
@${FPSPMAKE} fpsp.o
Index: src/sys/arch/mac68k/conf/Makefile.mac68k
diff -u src/sys/arch/mac68k/conf/Makefile.mac68k:1.90 src/sys/arch/mac68k/conf/Makefile.mac68k:1.91
--- src/sys/arch/mac68k/conf/Makefile.mac68k:1.90 Fri Jan 21 15:59:07 2011
+++ src/sys/arch/mac68k/conf/Makefile.mac68k Sun Sep 6 02:17:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mac68k,v 1.90 2011/01/21 15:59:07 joerg Exp $
+# $NetBSD: Makefile.mac68k,v 1.91 2015/09/06 02:17:30 uebayasi Exp $
# Makefile for NetBSD
#
@@ -46,7 +46,8 @@ KERN_AS= obj
# for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${MAC68K}/mac68k/locore.s
Index: src/sys/arch/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.65 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.66
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.65 Sat Apr 5 11:07:30 2014
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k Sun Sep 6 02:17:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mvme68k,v 1.65 2014/04/05 11:07:30 tsutsui Exp $
+# $NetBSD: Makefile.mvme68k,v 1.66 2015/09/06 02:17:31 uebayasi Exp $
# Makefile for NetBSD
#
@@ -62,7 +62,8 @@ KERN_AS= obj
# for the Motorola 68060 Software Support Package
.include "$S/arch/m68k/060sp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${MVME68K}/mvme68k/locore.s
Index: src/sys/arch/news68k/conf/Makefile.news68k
diff -u src/sys/arch/news68k/conf/Makefile.news68k:1.20 src/sys/arch/news68k/conf/Makefile.news68k:1.21
--- src/sys/arch/news68k/conf/Makefile.news68k:1.20 Fri Jan 21 15:59:08 2011
+++ src/sys/arch/news68k/conf/Makefile.news68k Sun Sep 6 02:17:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.news68k,v 1.20 2011/01/21 15:59:08 joerg Exp $
+# $NetBSD: Makefile.news68k,v 1.21 2015/09/06 02:17:31 uebayasi Exp $
#
# Makefile for NetBSD
#
@@ -46,7 +46,8 @@ KERN_AS= obj
##
## (4) local objects, compile rules, and dependencies
##
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${NEWS68K}/news68k/locore.s
Index: src/sys/arch/next68k/conf/Makefile.next68k
diff -u src/sys/arch/next68k/conf/Makefile.next68k:1.30 src/sys/arch/next68k/conf/Makefile.next68k:1.31
--- src/sys/arch/next68k/conf/Makefile.next68k:1.30 Fri Jan 21 15:59:08 2011
+++ src/sys/arch/next68k/conf/Makefile.next68k Sun Sep 6 02:17:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.next68k,v 1.30 2011/01/21 15:59:08 joerg Exp $
+# $NetBSD: Makefile.next68k,v 1.31 2015/09/06 02:17:31 uebayasi Exp $
# Makefile for NetBSD
#
@@ -46,7 +46,8 @@ KERN_AS= obj
# for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${NEXT68K}/next68k/locore.s
Index: src/sys/arch/x68k/conf/Makefile.x68k
diff -u src/sys/arch/x68k/conf/Makefile.x68k:1.63 src/sys/arch/x68k/conf/Makefile.x68k:1.64
--- src/sys/arch/x68k/conf/Makefile.x68k:1.63 Tue Oct 4 04:05:17 2011
+++ src/sys/arch/x68k/conf/Makefile.x68k Sun Sep 6 02:17:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.x68k,v 1.63 2011/10/04 04:05:17 chs Exp $
+# $NetBSD: Makefile.x68k,v 1.64 2015/09/06 02:17:31 uebayasi Exp $
#
# Makefile for NetBSD
#
@@ -50,7 +50,8 @@ KERN_AS= obj
# for the Motorola 68060 Software Support Package
.include "$S/arch/m68k/060sp/Makefile.inc"
-MD_OBJS= locore.o ${FPSP}
+MD_OBJS= locore.o
+MD_LIBS= ${FPSP}
MD_CFILES=
MD_SFILES= ${X68K}/x68k/locore.s
