Module Name: src
Committed By: uebayasi
Date: Tue Aug 18 08:39:12 UTC 2015
Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Use ${KERNLDSCRIPT} instead of ${KERN_LDSCRIPT}. The former is added
to ${SYSTEM_DEP} if defined.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sparc64/conf/Makefile.sparc64
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/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.90 src/sys/arch/sparc/conf/Makefile.sparc:1.91
--- src/sys/arch/sparc/conf/Makefile.sparc:1.90 Sat Nov 15 12:37:37 2014
+++ src/sys/arch/sparc/conf/Makefile.sparc Tue Aug 18 08:39:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.90 2014/11/15 12:37:37 uebayasi Exp $
+# $NetBSD: Makefile.sparc,v 1.91 2015/08/18 08:39:12 uebayasi Exp $
# Makefile for NetBSD
#
@@ -60,9 +60,9 @@ amd7930intr.o bsd_fdintr.o lock_stubs.o:
##
TEXTADDR?= F0004000
EXTRA_LINKFLAGS= -X
-KERN_LDSCRIPT?= kern.ldscript
+KERNLDSCRIPT?= kern.ldscript
LINKFORMAT= -n
-LINKSCRIPT= -T ${SPARC}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT= -T ${SPARC}/conf/${KERNLDSCRIPT}
##
## (6) port specific target dependencies
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.75 src/sys/arch/sparc64/conf/Makefile.sparc64:1.76
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.75 Sat Nov 15 12:41:36 2014
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Tue Aug 18 08:39:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.75 2014/11/15 12:41:36 uebayasi Exp $
+# $NetBSD: Makefile.sparc64,v 1.76 2015/08/18 08:39:12 uebayasi Exp $
#=========================================================================
#
@@ -108,11 +108,11 @@ dependkernlib: assym.h
## (5) link settings
##
TEXTADDR?= 01000000
-LINKSCRIPT= -T ${SPARC64}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT= -T ${SPARC64}/conf/${KERNLDSCRIPT}
.if ${LP64} == "yes"
-KERN_LDSCRIPT?= kern.ldscript
+KERNLDSCRIPT?= kern.ldscript
.else
-KERN_LDSCRIPT?= kern32.ldscript
+KERNLDSCRIPT?= kern32.ldscript
.endif
##
