[src/trunk]: src/sys/arch Use LINKSCRIPT.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a87f0580d78
branches:  trunk
changeset: 803874:6a87f0580d78
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Nov 15 12:36:42 2014 +0000

description:
Use LINKSCRIPT.

diffstat:

 sys/arch/amd64/conf/Makefile.amd64     |  4 ++--
 sys/arch/powerpc/conf/Makefile.powerpc |  5 +++--
 sys/arch/sparc/conf/Makefile.sparc     |  5 +++--
 sys/arch/sparc64/conf/Makefile.sparc64 |  4 ++--
 sys/arch/xen/conf/Makefile.xen         |  4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r 568b9054ee7e -r 6a87f0580d78 sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Sat Nov 15 12:33:04 2014 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Sat Nov 15 12:36:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amd64,v 1.45 2014/05/24 18:41:46 jakllsch Exp $
+#      $NetBSD: Makefile.amd64,v 1.46 2014/11/15 12:42:56 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -80,7 +80,7 @@
 EXTRA_LINKFLAGS=       -z max-page-size=0x100000
 LINKFLAGS_NORMAL=      -X
 KERN_LDSCRIPT?= kern.ldscript
-LINKFORMAT=    -T ${AMD64}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT=    -T ${AMD64}/conf/${KERN_LDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 568b9054ee7e -r 6a87f0580d78 sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Sat Nov 15 12:33:04 2014 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Sat Nov 15 12:36:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.powerpc,v 1.57 2014/08/10 17:44:26 joerg Exp $
+#      $NetBSD: Makefile.powerpc,v 1.58 2014/11/15 12:36:42 uebayasi Exp $
 #
 # Makefile for NetBSD
 #
@@ -84,7 +84,8 @@
 ##
 KERNLDSCRIPT?= ${POWERPC}/conf/kern.ldscript
 TEXTADDR?=     0x100000
-LINKFORMAT=    -N -T ${KERNLDSCRIPT}
+LINKFORMAT=    -N
+LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ENTRYPOINT=    __start
 
diff -r 568b9054ee7e -r 6a87f0580d78 sys/arch/sparc/conf/Makefile.sparc
--- a/sys/arch/sparc/conf/Makefile.sparc        Sat Nov 15 12:33:04 2014 +0000
+++ b/sys/arch/sparc/conf/Makefile.sparc        Sat Nov 15 12:36:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc,v 1.89 2013/10/03 22:01:04 mrg Exp $
+#      $NetBSD: Makefile.sparc,v 1.90 2014/11/15 12:37:37 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -61,7 +61,8 @@
 TEXTADDR?=     F0004000
 EXTRA_LINKFLAGS=       -X
 KERN_LDSCRIPT?= kern.ldscript
-LINKFORMAT=    -n -T ${SPARC}/conf/${KERN_LDSCRIPT}
+LINKFORMAT=    -n
+LINKSCRIPT=    -T ${SPARC}/conf/${KERN_LDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 568b9054ee7e -r 6a87f0580d78 sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Sat Nov 15 12:33:04 2014 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Sat Nov 15 12:36:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.74 2014/02/21 20:45:12 joerg Exp $
+#      $NetBSD: Makefile.sparc64,v 1.75 2014/11/15 12:41:36 uebayasi Exp $
 
 #=========================================================================
 #
@@ -108,7 +108,7 @@
 ## (5) link settings
 ##
 TEXTADDR?=     01000000
-LINKFORMAT=    -T ${SPARC64}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT=    -T ${SPARC64}/conf/${KERN_LDSCRIPT}
 .if ${LP64} == "yes"
 KERN_LDSCRIPT?= kern.ldscript
 .else
diff -r 568b9054ee7e -r 6a87f0580d78 sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen    Sat Nov 15 12:33:04 2014 +0000
+++ b/sys/arch/xen/conf/Makefile.xen    Sat Nov 15 12:36:42 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xen,v 1.37 2014/07/20 16:51:29 joerg Exp $
+#      $NetBSD: Makefile.xen,v 1.38 2014/11/15 12:42:56 uebayasi Exp $
 #      NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -109,7 +109,7 @@
 .endif
 LINKFLAGS_NORMAL=      -X
 KERN_LDSCRIPT?=        kern.ldscript.Xen
-LINKFORMAT=    -T $S/arch/${XEN_BUILD}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT=    -T $S/arch/${XEN_BUILD}/conf/${KERN_LDSCRIPT}
 
 ##
 ## (6) port specific target dependencies