Module Name: src
Committed By: uebayasi
Date: Sun Sep 6 06:41:14 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Added Files:
src/sys/conf: ldscript.mk
Log Message:
Move ldscript related code out of Makefile.kern.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r0 -r1.1 src/sys/conf/ldscript.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.240 src/sys/conf/Makefile.kern.inc:1.241
--- src/sys/conf/Makefile.kern.inc:1.240 Sun Sep 6 06:13:16 2015
+++ src/sys/conf/Makefile.kern.inc Sun Sep 6 06:41:14 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.240 2015/09/06 06:13:16 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.241 2015/09/06 06:41:14 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -219,24 +219,6 @@ SYSTEM_LD?= ${_MKSHMSG} " link ${.CUR
${SYSTEM_OBJ:N*swap*netbsd*} ${EXTRA_OBJ} vers.o \
${OBJS:M*swap${.TARGET}.o}
-# Give MD generated ldscript dependency on ${SYSTEM_OBJ}
-.if defined(KERNLDSCRIPT)
-.if target(${KERNLDSCRIPT})
-${KERNLDSCRIPT}: ${SYSTEM_OBJ}
-.endif
-.endif
-
-.if defined(KERNLDSCRIPT)
-.for k in ${KERNELS}
-EXTRA_CLEAN+= ${k}.ldscript
-${k}: ${k}.ldscript
-${k}.ldscript: ${KERNLDSCRIPT} assym.h
- ${_MKTARGET_CREATE}
- ${CPP} -I. ${KERNLDSCRIPT} | grep -v '^#' | grep -v '^$$' >$@
-.endfor
-LINKSCRIPT= -T ${.TARGET}.ldscript
-.endif
-
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext &/}
LINKDATA?= ${DATAADDR:C/.+/-Tdata &/}
@@ -429,6 +411,7 @@ install-kernel-${MACHINE_NAME}:
.endif
.endif
+.include "${S}/conf/ldscript.mk"
.include "${S}/conf/assym.mk"
.include "${S}/conf/newvers.mk"
.include "${S}/conf/splash.mk"
Added files:
Index: src/sys/conf/ldscript.mk
diff -u /dev/null src/sys/conf/ldscript.mk:1.1
--- /dev/null Sun Sep 6 06:41:14 2015
+++ src/sys/conf/ldscript.mk Sun Sep 6 06:41:14 2015
@@ -0,0 +1,19 @@
+# $NetBSD: ldscript.mk,v 1.1 2015/09/06 06:41:14 uebayasi Exp $
+
+# Give MD generated ldscript dependency on ${SYSTEM_OBJ}
+.if defined(KERNLDSCRIPT)
+.if target(${KERNLDSCRIPT})
+${KERNLDSCRIPT}: ${SYSTEM_OBJ}
+.endif
+.endif
+
+.if defined(KERNLDSCRIPT)
+.for k in ${KERNELS}
+EXTRA_CLEAN+= ${k}.ldscript
+${k}: ${k}.ldscript
+${k}.ldscript: ${KERNLDSCRIPT} assym.h
+ ${_MKTARGET_CREATE}
+ ${CPP} -I. ${KERNLDSCRIPT} | grep -v '^#' | grep -v '^$$' >$@
+.endfor
+LINKSCRIPT= -T ${.TARGET}.ldscript
+.endif
