From 774506b6077873d38edc8b00a56fec197f4ba22c Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@NetBSD.org>
Date: Tue, 18 Aug 2015 10:18:20 +0000
Subject: [PATCH] ${KERN_LDSCRIPT} -> ${KERNLDSCRIPT}

---
 sys/arch/amd64/conf/Makefile.amd64       | 6 +++---
 sys/arch/i386/conf/Makefile.i386         | 6 +++---
 sys/arch/ia64/conf/Makefile.ia64         | 6 +++---
 sys/arch/usermode/conf/Makefile.usermode | 6 +++---
 sys/arch/xen/conf/Makefile.xen           | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index c8ce0ecad336..41015a1b42ab 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -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
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index b3769f6639b4..a25699555393 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -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 assym.h
 ##
 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
diff --git a/sys/arch/ia64/conf/Makefile.ia64 b/sys/arch/ia64/conf/Makefile.ia64
index c33097c7afaa..6c96d2d1642a 100644
--- a/sys/arch/ia64/conf/Makefile.ia64
+++ b/sys/arch/ia64/conf/Makefile.ia64
@@ -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
diff --git a/sys/arch/usermode/conf/Makefile.usermode b/sys/arch/usermode/conf/Makefile.usermode
index b016d894d840..5cd79d390b16 100644
--- a/sys/arch/usermode/conf/Makefile.usermode
+++ b/sys/arch/usermode/conf/Makefile.usermode
@@ -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_CPU}/cpu_${MACHINE_CPU}.c
 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}\
diff --git a/sys/arch/xen/conf/Makefile.xen b/sys/arch/xen/conf/Makefile.xen
index 56264111bd08..5ccb2a4878a1 100644
--- a/sys/arch/xen/conf/Makefile.xen
+++ b/sys/arch/xen/conf/Makefile.xen
@@ -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