Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Declare dependency on fpsp.o via newly introduced $...



details:   https://anonhg.NetBSD.org/src/rev/0d7d1d61d8df
branches:  trunk
changeset: 810591:0d7d1d61d8df
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Sep 06 02:17:30 2015 +0000

description:
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.

diffstat:

 sys/arch/amiga/conf/Makefile.amiga     |  5 +++--
 sys/arch/atari/conf/Makefile.atari     |  5 +++--
 sys/arch/cesfic/conf/Makefile.cesfic   |  5 +++--
 sys/arch/hp300/conf/Makefile.hp300     |  5 +++--
 sys/arch/luna68k/conf/Makefile.luna68k |  5 +++--
 sys/arch/m68k/fpsp/Makefile.inc        |  5 +----
 sys/arch/mac68k/conf/Makefile.mac68k   |  5 +++--
 sys/arch/mvme68k/conf/Makefile.mvme68k |  5 +++--
 sys/arch/news68k/conf/Makefile.news68k |  5 +++--
 sys/arch/next68k/conf/Makefile.next68k |  5 +++--
 sys/arch/x68k/conf/Makefile.x68k       |  5 +++--
 11 files changed, 31 insertions(+), 24 deletions(-)

diffs (209 lines):

diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/amiga/conf/Makefile.amiga
--- a/sys/arch/amiga/conf/Makefile.amiga        Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/amiga/conf/Makefile.amiga        Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/atari/conf/Makefile.atari
--- a/sys/arch/atari/conf/Makefile.atari        Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/atari/conf/Makefile.atari        Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/cesfic/conf/Makefile.cesfic
--- a/sys/arch/cesfic/conf/Makefile.cesfic      Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/cesfic/conf/Makefile.cesfic      Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300        Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300        Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k    Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k    Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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=     
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/m68k/fpsp/Makefile.inc
--- a/sys/arch/m68k/fpsp/Makefile.inc   Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/m68k/fpsp/Makefile.inc   Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
            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
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/mac68k/conf/Makefile.mac68k
--- a/sys/arch/mac68k/conf/Makefile.mac68k      Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/mac68k/conf/Makefile.mac68k      Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/mvme68k/conf/Makefile.mvme68k
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k    Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k    Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/news68k/conf/Makefile.news68k
--- a/sys/arch/news68k/conf/Makefile.news68k    Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/news68k/conf/Makefile.news68k    Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 ##
 ## (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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/next68k/conf/Makefile.next68k
--- a/sys/arch/next68k/conf/Makefile.next68k    Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/next68k/conf/Makefile.next68k    Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 
diff -r 97fa725e4df7 -r 0d7d1d61d8df sys/arch/x68k/conf/Makefile.x68k
--- a/sys/arch/x68k/conf/Makefile.x68k  Sun Sep 06 02:05:11 2015 +0000
+++ b/sys/arch/x68k/conf/Makefile.x68k  Sun Sep 06 02:17:30 2015 +0000
@@ -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 @@
 # 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
 



Home | Main Index | Thread Index | Old Index