Module Name: src Committed By: uebayasi Date: Wed Aug 19 05:46:11 UTC 2015
Modified Files: src/sys/conf: Makefile.kern.inc Log Message: If MD ldscript is generated, give it dependency on ${SYSTEM_OBJ}. To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/sys/conf/Makefile.kern.inc 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.184 src/sys/conf/Makefile.kern.inc:1.185 --- src/sys/conf/Makefile.kern.inc:1.184 Fri May 1 02:00:41 2015 +++ src/sys/conf/Makefile.kern.inc Wed Aug 19 05:46:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kern.inc,v 1.184 2015/05/01 02:00:41 nat Exp $ +# $NetBSD: Makefile.kern.inc,v 1.185 2015/08/19 05:46:11 uebayasi Exp $ # # This file contains common `MI' targets and definitions and it is included # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. @@ -243,6 +243,13 @@ SYSTEM_LD?= @${_MKSHMSG} " link ${.CU ${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \ ${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o +# Give MD generated ldscript dependency on ${SYSTEM_OBJ} +.if defined(KERNLDSCRIPT) +.if target(${KERNLDSCRIPT}) +${KERNLDSCRIPT}: ${SYSTEM_OBJ} +.endif +.endif + TEXTADDR?= ${LOADADDRESS} # backwards compatibility LINKTEXT?= ${TEXTADDR:C/.+/-Ttext &/} LINKDATA?= ${DATAADDR:C/.+/-Tdata &/}