Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/conf Separate linker script argument (${LINKSCRIPT}) fro...
details: https://anonhg.NetBSD.org/src/rev/896fc846d2e7
branches: trunk
changeset: 333726:896fc846d2e7
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Sat Nov 15 08:20:01 2014 +0000
description:
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.
diffstat:
sys/conf/Makefile.kern.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (29 lines):
diff -r 428cd865c0c0 -r 896fc846d2e7 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc Sat Nov 15 06:30:10 2014 +0000
+++ b/sys/conf/Makefile.kern.inc Sat Nov 15 08:20:01 2014 +0000
@@ -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 @@
##
## (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 @@
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
Home |
Main Index |
Thread Index |
Old Index