Module Name: src Committed By: uebayasi Date: Sat Nov 15 08:20:01 UTC 2014
Modified Files: src/sys/conf: Makefile.kern.inc Log Message: Separate linker script argument (${LINKSCRIPT}) from ${LINKFORMAT} ${LINKFORMAT} specifies ABI options, and used for ld -r. ${LINKSCRIPT} (-T ldscript) is used only for final link. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 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.180 src/sys/conf/Makefile.kern.inc:1.181 --- src/sys/conf/Makefile.kern.inc:1.180 Thu Nov 13 13:44:31 2014 +++ src/sys/conf/Makefile.kern.inc Sat Nov 15 08:20:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kern.inc,v 1.180 2014/11/13 13:44:31 uebayasi Exp $ +# $NetBSD: Makefile.kern.inc,v 1.181 2014/11/15 08:20:01 uebayasi Exp $ # # This file contains common `MI' targets and definitions and it is included # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. @@ -215,8 +215,8 @@ ${_cfile:T:R}.o: ${_cfile} ## ## (5) link settings ## -## TEXTADDR (or LOADADDRESS), LINKFORMAT, and any EXTRA_LINKFLAGS must -## be set in the port's Makefile. The port specific definitions for +## TEXTADDR (or LOADADDRESS), LINKFORMAT, LINKSCRIPT, and any EXTRA_LINKFLAGS +## must be set in the port's Makefile. The port specific definitions for ## LINKFLAGS_NORMAL and LINKFLAGS_DEBUG will added to the LINKFLAGS ## depending on the value of DEBUG. ## @@ -244,7 +244,7 @@ LINKTEXT?= ${TEXTADDR:C/.+/-Ttext &/} LINKDATA?= ${DATAADDR:C/.+/-Tdata &/} ENTRYPOINT?= start LINKENTRY?= ${ENTRYPOINT:C/.+/-e &/} -LINKFLAGS?= ${LINKFORMAT} ${LINKTEXT} ${LINKDATA} ${LINKENTRY} \ +LINKFLAGS?= ${LINKFORMAT} ${LINKSCRIPT} ${LINKTEXT} ${LINKDATA} ${LINKENTRY} \ ${EXTRA_LINKFLAGS} LINKFLAGS_DEBUG?= -X