[src/trunk]: src/sys Define ${LINKSCRIPT} in one place.

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

details:   https://anonhg.NetBSD.org/src/rev/8553a953056c
branches:  trunk
changeset: 340136:8553a953056c
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Mon Aug 24 14:04:24 2015 +0000

description:
Define ${LINKSCRIPT} in one place.

diffstat:

 sys/arch/aarch64/conf/Makefile.aarch64         |  5 +----
 sys/arch/amd64/conf/Makefile.amd64             |  3 +--
 sys/arch/cats/conf/Makefile.cats.inc           |  3 +--
 sys/arch/epoc32/conf/Makefile.epoc32.inc       |  3 +--
 sys/arch/evbarm/conf/Makefile.evbarm.inc       |  3 +--
 sys/arch/hppa/conf/Makefile.hppa               |  3 +--
 sys/arch/i386/conf/Makefile.i386               |  3 +--
 sys/arch/ia64/conf/Makefile.ia64               |  3 +--
 sys/arch/mips/conf/Makefile.mips               |  3 +--
 sys/arch/netwinder/conf/Makefile.netwinder.inc |  3 +--
 sys/arch/powerpc/conf/Makefile.powerpc         |  3 +--
 sys/arch/shark/conf/Makefile.shark.inc         |  3 +--
 sys/arch/sparc/conf/Makefile.sparc             |  3 +--
 sys/arch/sparc64/conf/Makefile.sparc64         |  3 +--
 sys/arch/usermode/conf/Makefile.usermode       |  3 +--
 sys/arch/xen/conf/Makefile.xen                 |  3 +--
 sys/arch/zaurus/conf/Makefile.zaurus.inc       |  3 +--
 sys/conf/Makefile.kern.inc                     |  3 ++-
 18 files changed, 19 insertions(+), 37 deletions(-)

diffs (truncated from 302 to 300 lines):

diff -r 75be7ba863d4 -r 8553a953056c sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.aarch64,v 1.5 2015/08/20 06:19:36 uebayasi Exp $
+#      $NetBSD: Makefile.aarch64,v 1.6 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -61,9 +61,6 @@
 KERNLDSCRIPT?= ${A64}/conf/kern.ldscript
 LOADADDRESS?=  0xFFFFFFFF00000000
 LINKFLAGS_NORMAL=      -X
-.if "${KERNLDSCRIPT}" != ""
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
-.endif
 
 # Strip AArch64 mapping symbols from the kernel image, as they interfere
 # with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amd64,v 1.50 2015/08/18 10:18:20 uebayasi Exp $
+#      $NetBSD: Makefile.amd64,v 1.51 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -80,7 +80,6 @@
 EXTRA_LINKFLAGS=       -z max-page-size=0x100000
 LINKFLAGS_NORMAL=      -X
 KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/cats/conf/Makefile.cats.inc
--- a/sys/arch/cats/conf/Makefile.cats.inc      Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/cats/conf/Makefile.cats.inc      Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cats.inc,v 1.34 2015/08/20 06:20:19 uebayasi Exp $
+#      $NetBSD: Makefile.cats.inc,v 1.35 2015/08/24 14:04:24 uebayasi Exp $
 
 MACHINE_ARCH?= arm
 CPPFLAGS+=     -D${MACHINE}
@@ -33,4 +33,3 @@
        ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
 .endif
 
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/epoc32/conf/Makefile.epoc32.inc
--- a/sys/arch/epoc32/conf/Makefile.epoc32.inc  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/epoc32/conf/Makefile.epoc32.inc  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.epoc32.inc,v 1.3 2015/08/20 06:21:02 uebayasi Exp $
+#      $NetBSD: Makefile.epoc32.inc,v 1.4 2015/08/24 14:04:24 uebayasi Exp $
 
 MACHINE_ARCH=          arm
 CPPFLAGS+=             -D${MACHINE}
@@ -9,7 +9,6 @@
 KERNEL_BASE_VIRT=      $(LOADADDRESS)
 
 KERNLDSCRIPT=          ldscript
-LINKSCRIPT=            -T ${KERNLDSCRIPT}
 
 EXTRA_CLEAN+=          netbsd.map assym.d ${KERNLDSCRIPT} tmp
 
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/evbarm/conf/Makefile.evbarm.inc
--- a/sys/arch/evbarm/conf/Makefile.evbarm.inc  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.evbarm.inc,v 1.32 2015/08/20 06:21:26 uebayasi Exp $
+#      $NetBSD: Makefile.evbarm.inc,v 1.33 2015/08/24 14:04:24 uebayasi Exp $
 
 #
 # If this is a install kernel and the ramdisk image exists in the object
@@ -33,7 +33,6 @@
 .if defined(KERNEL_BASE_PHYS)
 LINKTEXT=
 KERNLDSCRIPT=  ldscript
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 EXTRA_CLEAN+=  ${KERNLDSCRIPT} tmp
 
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/hppa/conf/Makefile.hppa
--- a/sys/arch/hppa/conf/Makefile.hppa  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/hppa/conf/Makefile.hppa  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hppa,v 1.3 2015/08/20 06:21:54 uebayasi Exp $
+# $NetBSD: Makefile.hppa,v 1.4 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -68,7 +68,6 @@
 ## (5) link settings
 ##
 KERNLDSCRIPT=  ${HPPA}/conf/ld.script
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 TEXTADDR?=     00200000
 LINKFLAGS_NORMAL=       -X
 EXTRA_LINKFLAGS= -Map $@.map
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/i386/conf/Makefile.i386  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.i386,v 1.184 2015/08/18 10:18:20 uebayasi Exp $
+#      $NetBSD: Makefile.i386,v 1.185 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -78,7 +78,6 @@
 TEXTADDR?=     c0100000
 LINKFLAGS_NORMAL=      -X
 KERNLDSCRIPT?= ${I386}/conf/kern.ldscript
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/ia64/conf/Makefile.ia64
--- a/sys/arch/ia64/conf/Makefile.ia64  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/ia64/conf/Makefile.ia64  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ia64,v 1.4 2015/08/18 10:18:20 uebayasi Exp $
+#      $NetBSD: Makefile.ia64,v 1.5 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -54,7 +54,6 @@
 ##TEXTADDR?=   0xdeadbeeffeeddead
 LINKFLAGS_NORMAL=      -X
 KERNLDSCRIPT?= ${IA64}/conf/kern.ldscript
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/mips/conf/Makefile.mips  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mips,v 1.61 2014/11/15 15:01:41 uebayasi Exp $
+#      $NetBSD: Makefile.mips,v 1.62 2015/08/24 14:04:24 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -102,7 +102,6 @@
 .endif
 KERNLDSCRIPT?=         ${MIPS}/conf/kern.ldscript
 # some mips ports specify a "magic" format
-LINKSCRIPT=            -T ${KERNLDSCRIPT}
 EXTRA_LINKFLAGS=       ${GP} ${LDOPTS}
 LINKFLAGS_NORMAL=      -X
 STRIPFLAGS=            -g -X
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/netwinder/conf/Makefile.netwinder.inc
--- a/sys/arch/netwinder/conf/Makefile.netwinder.inc    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/netwinder/conf/Makefile.netwinder.inc    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.netwinder.inc,v 1.10 2015/08/20 06:22:18 uebayasi Exp $
+#      $NetBSD: Makefile.netwinder.inc,v 1.11 2015/08/24 14:04:24 uebayasi Exp $
 
 CPPFLAGS+=     -D${MACHINE}
 
@@ -6,4 +6,3 @@
 SYSTEM_FIRST_SFILE=    ${THISARM}/${MACHINE}/nwmmu.S
 
 KERNLDSCRIPT=          ${THISARM}/conf/kern.ldscript
-LINKSCRIPT=            -T ${KERNLDSCRIPT}
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.powerpc,v 1.58 2014/11/15 12:36:42 uebayasi Exp $
+#      $NetBSD: Makefile.powerpc,v 1.59 2015/08/24 14:04:25 uebayasi Exp $
 #
 # Makefile for NetBSD
 #
@@ -85,7 +85,6 @@
 KERNLDSCRIPT?= ${POWERPC}/conf/kern.ldscript
 TEXTADDR?=     0x100000
 LINKFORMAT=    -N
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ENTRYPOINT=    __start
 
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/shark/conf/Makefile.shark.inc
--- a/sys/arch/shark/conf/Makefile.shark.inc    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/shark/conf/Makefile.shark.inc    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.shark.inc,v 1.25 2015/08/19 05:47:38 uebayasi Exp $
+#      $NetBSD: Makefile.shark.inc,v 1.26 2015/08/24 14:04:25 uebayasi Exp $
 
 CPPFLAGS+=             -D${MACHINE}
 CFLAGS+=               -fno-unwind-tables
@@ -10,7 +10,6 @@
 KERNLDSCRIPT=  ldscript
 EXTRA_CLEAN+=  ${KERNLDSCRIPT}
 
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 LOADADDRESS=   0xF0000020
 
 ldscript: \
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/sparc/conf/Makefile.sparc
--- a/sys/arch/sparc/conf/Makefile.sparc        Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/sparc/conf/Makefile.sparc        Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc,v 1.92 2015/08/18 10:00:11 uebayasi Exp $
+#      $NetBSD: Makefile.sparc,v 1.93 2015/08/24 14:04:25 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -62,7 +62,6 @@
 EXTRA_LINKFLAGS=       -X
 KERNLDSCRIPT?= ${SPARC}/conf/kern.ldscript
 LINKFORMAT=    -n
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.77 2015/08/18 10:00:11 uebayasi Exp $
+#      $NetBSD: Makefile.sparc64,v 1.78 2015/08/24 14:04:25 uebayasi Exp $
 
 #=========================================================================
 #
@@ -108,7 +108,6 @@
 ## (5) link settings
 ##
 TEXTADDR?=     01000000
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 .if ${LP64} == "yes"
 KERNLDSCRIPT?= ${SPARC64}/conf/kern.ldscript
 .else
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.36 2015/08/18 10:18:20 uebayasi Exp $
+# $NetBSD: Makefile.usermode,v 1.37 2015/08/24 14:04:25 uebayasi Exp $
 
 USETOOLS?=                     no
 NEED_OWN_INSTALL_TARGET?=      no
@@ -69,7 +69,6 @@
 
 LINKFLAGS_NORMAL=      -X
 KERNLDSCRIPT?= ${USERMODE}/conf/kern.ldscript
-#LINKSCRIPT=   -T ${KERNLDSCRIPT}
 
 SYSTEM_LD=     @${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
                ${_MKSHECHO}\
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen    Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/xen/conf/Makefile.xen    Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xen,v 1.39 2015/08/18 10:18:21 uebayasi Exp $
+#      $NetBSD: Makefile.xen,v 1.40 2015/08/24 14:04:25 uebayasi Exp $
 #      NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -109,7 +109,6 @@
 .endif
 LINKFLAGS_NORMAL=      -X
 KERNLDSCRIPT?= $S/arch/${XEN_BUILD}/conf/kern.ldscript.Xen
-LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 75be7ba863d4 -r 8553a953056c sys/arch/zaurus/conf/Makefile.zaurus.inc
--- a/sys/arch/zaurus/conf/Makefile.zaurus.inc  Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/arch/zaurus/conf/Makefile.zaurus.inc  Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.zaurus.inc,v 1.7 2015/08/19 04:33:00 uebayasi Exp $
+#      $NetBSD: Makefile.zaurus.inc,v 1.8 2015/08/24 14:04:25 uebayasi Exp $
 
 MACHINE_ARCH?=         arm
 CPPFLAGS+=             -D${MACHINE}
@@ -20,7 +20,6 @@
 KERNEL_BASE_VIRT=      $(LOADADDRESS)
 
 KERNLDSCRIPT=          ldscript
-LINKSCRIPT=            -T ${KERNLDSCRIPT}
 
 EXTRA_CLEAN+=          netbsd.map assym.d ldscript tmp
 
diff -r 75be7ba863d4 -r 8553a953056c sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Mon Aug 24 09:49:08 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Mon Aug 24 14:04:24 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.185 2015/08/19 05:46:11 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.186 2015/08/24 14:04:25 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -231,6 +231,7 @@
 SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ} .gdbinit
 .if defined(KERNLDSCRIPT)
 SYSTEM_DEP+=   ${KERNLDSCRIPT}
+LINKSCRIPT=    -T ${KERNLDSCRIPT}
 .endif