Module Name: src
Committed By: uebayasi
Date: Tue Aug 18 10:18:21 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/ia64/conf: Makefile.ia64
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/xen/conf: Makefile.xen
Log Message:
${KERN_LDSCRIPT} -> ${KERNLDSCRIPT}
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/conf/Makefile.ia64
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/conf/Makefile.xen
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.49 src/sys/arch/amd64/conf/Makefile.amd64:1.50
--- src/sys/arch/amd64/conf/Makefile.amd64:1.49 Fri May 1 02:00:41 2015
+++ src/sys/arch/amd64/conf/Makefile.amd64 Tue Aug 18 10:18:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.49 2015/05/01 02:00:41 nat Exp $
+# $NetBSD: Makefile.amd64,v 1.50 2015/08/18 10:18:20 uebayasi Exp $
# Makefile for NetBSD
#
@@ -79,8 +79,8 @@ spl.o: ${AMD64}/amd64/spl.S assym.h
TEXTADDR?= 0xffffffff80100000
EXTRA_LINKFLAGS= -z max-page-size=0x100000
LINKFLAGS_NORMAL= -X
-KERN_LDSCRIPT?= kern.ldscript
-LINKSCRIPT= -T ${AMD64}/conf/${KERN_LDSCRIPT}
+KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
##
## (6) port specific target dependencies
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.183 src/sys/arch/i386/conf/Makefile.i386:1.184
--- src/sys/arch/i386/conf/Makefile.i386:1.183 Sat Nov 15 12:26:44 2014
+++ src/sys/arch/i386/conf/Makefile.i386 Tue Aug 18 10:18:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.183 2014/11/15 12:26:44 uebayasi Exp $
+# $NetBSD: Makefile.i386,v 1.184 2015/08/18 10:18:20 uebayasi Exp $
# Makefile for NetBSD
#
@@ -77,8 +77,8 @@ lock_stubs.o: ${I386}/i386/lock_stubs.S
##
TEXTADDR?= c0100000
LINKFLAGS_NORMAL= -X
-KERN_LDSCRIPT?= kern.ldscript
-LINKSCRIPT= -T ${I386}/conf/${KERN_LDSCRIPT}
+KERNLDSCRIPT?= ${I386}/conf/kern.ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
##
## (6) port specific target dependencies
Index: src/sys/arch/ia64/conf/Makefile.ia64
diff -u src/sys/arch/ia64/conf/Makefile.ia64:1.3 src/sys/arch/ia64/conf/Makefile.ia64:1.4
--- src/sys/arch/ia64/conf/Makefile.ia64:1.3 Sat Nov 15 12:28:06 2014
+++ src/sys/arch/ia64/conf/Makefile.ia64 Tue Aug 18 10:18:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ia64,v 1.3 2014/11/15 12:28:06 uebayasi Exp $
+# $NetBSD: Makefile.ia64,v 1.4 2015/08/18 10:18:20 uebayasi Exp $
# Makefile for NetBSD
#
@@ -53,8 +53,8 @@ locore.o: ${IA64}/ia64/locore.S assym.h
##
##TEXTADDR?= 0xdeadbeeffeeddead
LINKFLAGS_NORMAL= -X
-KERN_LDSCRIPT?= kern.ldscript
-LINKSCRIPT= -T ${IA64}/conf/${KERN_LDSCRIPT}
+KERNLDSCRIPT?= ${IA64}/conf/kern.ldscript
+LINKSCRIPT= -T ${KERNLDSCRIPT}
##
## (6) port specific target dependencies
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.35 src/sys/arch/usermode/conf/Makefile.usermode:1.36
--- src/sys/arch/usermode/conf/Makefile.usermode:1.35 Sat Nov 15 12:28:06 2014
+++ src/sys/arch/usermode/conf/Makefile.usermode Tue Aug 18 10:18:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.35 2014/11/15 12:28:06 uebayasi Exp $
+# $NetBSD: Makefile.usermode,v 1.36 2015/08/18 10:18:20 uebayasi Exp $
USETOOLS?= no
NEED_OWN_INSTALL_TARGET?= no
@@ -68,8 +68,8 @@ MD_CFILES+= ${USERMODE}/target/${MACHINE
TEXTADDR?= %TEXTADDR%
LINKFLAGS_NORMAL= -X
-KERN_LDSCRIPT?= kern.ldscript
-#LINKSCRIPT= -T ${USERMODE}/conf/${KERN_LDSCRIPT}
+KERNLDSCRIPT?= ${USERMODE}/conf/kern.ldscript
+#LINKSCRIPT= -T ${KERNLDSCRIPT}
SYSTEM_LD= @${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.38 src/sys/arch/xen/conf/Makefile.xen:1.39
--- src/sys/arch/xen/conf/Makefile.xen:1.38 Sat Nov 15 12:42:56 2014
+++ src/sys/arch/xen/conf/Makefile.xen Tue Aug 18 10:18:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.38 2014/11/15 12:42:56 uebayasi Exp $
+# $NetBSD: Makefile.xen,v 1.39 2015/08/18 10:18:21 uebayasi Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -108,8 +108,8 @@ TEXTADDR?= 0xc0100000
TEXTADDR?= 0xffffffff80100000
.endif
LINKFLAGS_NORMAL= -X
-KERN_LDSCRIPT?= kern.ldscript.Xen
-LINKSCRIPT= -T $S/arch/${XEN_BUILD}/conf/${KERN_LDSCRIPT}
+KERNLDSCRIPT?= $S/arch/${XEN_BUILD}/conf/kern.ldscript.Xen
+LINKSCRIPT= -T ${KERNLDSCRIPT}
##
## (6) port specific target dependencies
