Module Name: src
Committed By: matt
Date: Wed Aug 21 07:08:30 UTC 2013
Modified Files:
src/sys/arch/landisk/stand: Makefile.bootprogs
src/sys/arch/landisk/stand/boot: Makefile.boot
src/sys/arch/landisk/stand/bootxx: Makefile.bootxx
Log Message:
Use <bsd.klinks.mk>
Add missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/stand/Makefile.bootprogs
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/stand/boot/Makefile.boot
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/landisk/stand/bootxx/Makefile.bootxx
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/landisk/stand/Makefile.bootprogs
diff -u src/sys/arch/landisk/stand/Makefile.bootprogs:1.4 src/sys/arch/landisk/stand/Makefile.bootprogs:1.5
--- src/sys/arch/landisk/stand/Makefile.bootprogs:1.4 Thu May 27 06:58:14 2010
+++ src/sys/arch/landisk/stand/Makefile.bootprogs Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.4 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.bootprogs,v 1.5 2013/08/21 07:08:30 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -11,6 +11,7 @@ PRIMARY_LOAD_ADDRESS?=0x8c201000
SECONDARY_LOAD_ADDRESS?=0x8ff00000
.include <bsd.own.mk>
+.include <bsd.klinks.mk>
STRIPFLAG= # override
@@ -29,18 +30,6 @@ CPPFLAGS+= -nostdinc -D_STANDALONE
CPPFLAGS+= -DSH4
CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../boot -I${S}
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine && \
- ln -s ${S}/arch/${MACHINE}/include machine
- -rm -f ${MACHINE_CPU} && \
- ln -s ${S}/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
-.ifdef LIBOBJ
- -rm -f lib && ln -s ${LIBOBJ}/lib lib
- mkdir -p ${LIBOBJ}/lib
-.endif
-.endif
-
### find out what to use for libsa
SA_AS= library
.include "${S}/lib/libsa/Makefile.inc"
Index: src/sys/arch/landisk/stand/boot/Makefile.boot
diff -u src/sys/arch/landisk/stand/boot/Makefile.boot:1.5 src/sys/arch/landisk/stand/boot/Makefile.boot:1.6
--- src/sys/arch/landisk/stand/boot/Makefile.boot:1.5 Sun Dec 25 06:09:09 2011
+++ src/sys/arch/landisk/stand/boot/Makefile.boot Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.5 2011/12/25 06:09:09 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.6 2013/08/21 07:08:30 matt Exp $
PROG?= boot
@@ -40,6 +40,7 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${.CUR
${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
${PROG}: ${OBJS} ${LIBLIST}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \
-Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
${OBJCOPY} -O binary ${PROG}.sym ${PROG}
Index: src/sys/arch/landisk/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.3 src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.4
--- src/sys/arch/landisk/stand/bootxx/Makefile.bootxx:1.3 Wed Apr 22 17:13:36 2009
+++ src/sys/arch/landisk/stand/bootxx/Makefile.bootxx Wed Aug 21 07:08:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.3 2009/04/22 17:13:36 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.4 2013/08/21 07:08:30 matt Exp $
PROG?= bootxx_${FS}
@@ -46,6 +46,7 @@ LIBLIST= ${LIBSA} ${LIBKERN}
CLEANFILES+= ${PROG}.sym ${PROG}.map
${PROG}: ${OBJS} ${LIBLIST}
+ ${_MKTARGET_LINK}
${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${PRIMARY_LOAD_ADDRESS} \
-Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
${OBJCOPY} -O binary ${PROG}.sym ${PROG}
