Module Name: src Committed By: uebayasi Date: Mon Aug 24 14:04:25 UTC 2015
Modified Files: src/sys/arch/aarch64/conf: Makefile.aarch64 src/sys/arch/amd64/conf: Makefile.amd64 src/sys/arch/cats/conf: Makefile.cats.inc src/sys/arch/epoc32/conf: Makefile.epoc32.inc src/sys/arch/evbarm/conf: Makefile.evbarm.inc src/sys/arch/hppa/conf: Makefile.hppa src/sys/arch/i386/conf: Makefile.i386 src/sys/arch/ia64/conf: Makefile.ia64 src/sys/arch/mips/conf: Makefile.mips src/sys/arch/netwinder/conf: Makefile.netwinder.inc src/sys/arch/powerpc/conf: Makefile.powerpc src/sys/arch/shark/conf: Makefile.shark.inc src/sys/arch/sparc/conf: Makefile.sparc src/sys/arch/sparc64/conf: Makefile.sparc64 src/sys/arch/usermode/conf: Makefile.usermode src/sys/arch/xen/conf: Makefile.xen src/sys/arch/zaurus/conf: Makefile.zaurus.inc src/sys/conf: Makefile.kern.inc Log Message: Define ${LINKSCRIPT} in one place. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/conf/Makefile.aarch64 cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/Makefile.amd64 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cats/conf/Makefile.cats.inc cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/Makefile.epoc32.inc cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/Makefile.evbarm.inc cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/conf/Makefile.hppa cvs rdiff -u -r1.184 -r1.185 src/sys/arch/i386/conf/Makefile.i386 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/conf/Makefile.ia64 cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mips/conf/Makefile.mips cvs rdiff -u -r1.10 -r1.11 src/sys/arch/netwinder/conf/Makefile.netwinder.inc cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/conf/Makefile.powerpc cvs rdiff -u -r1.25 -r1.26 src/sys/arch/shark/conf/Makefile.shark.inc cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/conf/Makefile.sparc cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc64/conf/Makefile.sparc64 cvs rdiff -u -r1.36 -r1.37 src/sys/arch/usermode/conf/Makefile.usermode cvs rdiff -u -r1.39 -r1.40 src/sys/arch/xen/conf/Makefile.xen cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/Makefile.zaurus.inc cvs rdiff -u -r1.185 -r1.186 src/sys/conf/Makefile.kern.inc 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/aarch64/conf/Makefile.aarch64 diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.5 src/sys/arch/aarch64/conf/Makefile.aarch64:1.6 --- src/sys/arch/aarch64/conf/Makefile.aarch64:1.5 Thu Aug 20 06:19:36 2015 +++ src/sys/arch/aarch64/conf/Makefile.aarch64 Mon Aug 24 14:04:24 2015 @@ -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 @@ locore.o: ${A64}/aarch64/locore.S assym. 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. Index: src/sys/arch/amd64/conf/Makefile.amd64 diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.50 src/sys/arch/amd64/conf/Makefile.amd64:1.51 --- src/sys/arch/amd64/conf/Makefile.amd64:1.50 Tue Aug 18 10:18:20 2015 +++ src/sys/arch/amd64/conf/Makefile.amd64 Mon Aug 24 14:04:24 2015 @@ -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 @@ TEXTADDR?= 0xffffffff80100000 EXTRA_LINKFLAGS= -z max-page-size=0x100000 LINKFLAGS_NORMAL= -X KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} ## ## (6) port specific target dependencies Index: src/sys/arch/cats/conf/Makefile.cats.inc diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.34 src/sys/arch/cats/conf/Makefile.cats.inc:1.35 --- src/sys/arch/cats/conf/Makefile.cats.inc:1.34 Thu Aug 20 06:20:19 2015 +++ src/sys/arch/cats/conf/Makefile.cats.inc Mon Aug 24 14:04:24 2015 @@ -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 @@ SYSTEM_LD_TAIL_EXTRA+=; \ ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout .endif -LINKSCRIPT= -T ${KERNLDSCRIPT} Index: src/sys/arch/epoc32/conf/Makefile.epoc32.inc diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.4 --- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3 Thu Aug 20 06:21:02 2015 +++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Mon Aug 24 14:04:24 2015 @@ -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 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/ep KERNEL_BASE_VIRT= $(LOADADDRESS) KERNLDSCRIPT= ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} EXTRA_CLEAN+= netbsd.map assym.d ${KERNLDSCRIPT} tmp Index: src/sys/arch/evbarm/conf/Makefile.evbarm.inc diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.32 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.33 --- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.32 Thu Aug 20 06:21:26 2015 +++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Mon Aug 24 14:04:24 2015 @@ -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 @@ EXTRA_CLEAN+= ${KERNELS:=.map} .if defined(KERNEL_BASE_PHYS) LINKTEXT= KERNLDSCRIPT= ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} EXTRA_CLEAN+= ${KERNLDSCRIPT} tmp Index: src/sys/arch/hppa/conf/Makefile.hppa diff -u src/sys/arch/hppa/conf/Makefile.hppa:1.3 src/sys/arch/hppa/conf/Makefile.hppa:1.4 --- src/sys/arch/hppa/conf/Makefile.hppa:1.3 Thu Aug 20 06:21:54 2015 +++ src/sys/arch/hppa/conf/Makefile.hppa Mon Aug 24 14:04:24 2015 @@ -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 @@ locore.o: ${HPPA}/hppa/locore.S ## (5) link settings ## KERNLDSCRIPT= ${HPPA}/conf/ld.script -LINKSCRIPT= -T ${KERNLDSCRIPT} TEXTADDR?= 00200000 LINKFLAGS_NORMAL= -X EXTRA_LINKFLAGS= -Map $@.map Index: src/sys/arch/i386/conf/Makefile.i386 diff -u src/sys/arch/i386/conf/Makefile.i386:1.184 src/sys/arch/i386/conf/Makefile.i386:1.185 --- src/sys/arch/i386/conf/Makefile.i386:1.184 Tue Aug 18 10:18:20 2015 +++ src/sys/arch/i386/conf/Makefile.i386 Mon Aug 24 14:04:24 2015 @@ -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 @@ lock_stubs.o: ${I386}/i386/lock_stubs.S TEXTADDR?= c0100000 LINKFLAGS_NORMAL= -X 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.4 src/sys/arch/ia64/conf/Makefile.ia64:1.5 --- src/sys/arch/ia64/conf/Makefile.ia64:1.4 Tue Aug 18 10:18:20 2015 +++ src/sys/arch/ia64/conf/Makefile.ia64 Mon Aug 24 14:04:24 2015 @@ -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 @@ locore.o: ${IA64}/ia64/locore.S assym.h ##TEXTADDR?= 0xdeadbeeffeeddead LINKFLAGS_NORMAL= -X KERNLDSCRIPT?= ${IA64}/conf/kern.ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} ## ## (6) port specific target dependencies Index: src/sys/arch/mips/conf/Makefile.mips diff -u src/sys/arch/mips/conf/Makefile.mips:1.61 src/sys/arch/mips/conf/Makefile.mips:1.62 --- src/sys/arch/mips/conf/Makefile.mips:1.61 Sat Nov 15 15:01:41 2014 +++ src/sys/arch/mips/conf/Makefile.mips Mon Aug 24 14:04:24 2015 @@ -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 @@ TEXTADDR?= ${DEFTEXTADDR} .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 Index: src/sys/arch/netwinder/conf/Makefile.netwinder.inc diff -u src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.10 src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.11 --- src/sys/arch/netwinder/conf/Makefile.netwinder.inc:1.10 Thu Aug 20 06:22:18 2015 +++ src/sys/arch/netwinder/conf/Makefile.netwinder.inc Mon Aug 24 14:04:24 2015 @@ -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_OBJ= nwmmu.o SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S KERNLDSCRIPT= ${THISARM}/conf/kern.ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} Index: src/sys/arch/powerpc/conf/Makefile.powerpc diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.58 src/sys/arch/powerpc/conf/Makefile.powerpc:1.59 --- src/sys/arch/powerpc/conf/Makefile.powerpc:1.58 Sat Nov 15 12:36:42 2014 +++ src/sys/arch/powerpc/conf/Makefile.powerpc Mon Aug 24 14:04:25 2015 @@ -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 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFIL KERNLDSCRIPT?= ${POWERPC}/conf/kern.ldscript TEXTADDR?= 0x100000 LINKFORMAT= -N -LINKSCRIPT= -T ${KERNLDSCRIPT} ENTRYPOINT= __start Index: src/sys/arch/shark/conf/Makefile.shark.inc diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.25 src/sys/arch/shark/conf/Makefile.shark.inc:1.26 --- src/sys/arch/shark/conf/Makefile.shark.inc:1.25 Wed Aug 19 05:47:38 2015 +++ src/sys/arch/shark/conf/Makefile.shark.inc Mon Aug 24 14:04:25 2015 @@ -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 @@ GENASSYM_EXTRAS+= ${THISARM}/shark/genas KERNLDSCRIPT= ldscript EXTRA_CLEAN+= ${KERNLDSCRIPT} -LINKSCRIPT= -T ${KERNLDSCRIPT} LOADADDRESS= 0xF0000020 ldscript: \ Index: src/sys/arch/sparc/conf/Makefile.sparc diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.92 src/sys/arch/sparc/conf/Makefile.sparc:1.93 --- src/sys/arch/sparc/conf/Makefile.sparc:1.92 Tue Aug 18 10:00:11 2015 +++ src/sys/arch/sparc/conf/Makefile.sparc Mon Aug 24 14:04:25 2015 @@ -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 @@ TEXTADDR?= F0004000 EXTRA_LINKFLAGS= -X KERNLDSCRIPT?= ${SPARC}/conf/kern.ldscript LINKFORMAT= -n -LINKSCRIPT= -T ${KERNLDSCRIPT} ## ## (6) port specific target dependencies Index: src/sys/arch/sparc64/conf/Makefile.sparc64 diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.77 src/sys/arch/sparc64/conf/Makefile.sparc64:1.78 --- src/sys/arch/sparc64/conf/Makefile.sparc64:1.77 Tue Aug 18 10:00:11 2015 +++ src/sys/arch/sparc64/conf/Makefile.sparc64 Mon Aug 24 14:04:25 2015 @@ -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 @@ dependkernlib: assym.h ## (5) link settings ## TEXTADDR?= 01000000 -LINKSCRIPT= -T ${KERNLDSCRIPT} .if ${LP64} == "yes" KERNLDSCRIPT?= ${SPARC64}/conf/kern.ldscript .else Index: src/sys/arch/usermode/conf/Makefile.usermode diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.36 src/sys/arch/usermode/conf/Makefile.usermode:1.37 --- src/sys/arch/usermode/conf/Makefile.usermode:1.36 Tue Aug 18 10:18:20 2015 +++ src/sys/arch/usermode/conf/Makefile.usermode Mon Aug 24 14:04:25 2015 @@ -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 @@ TEXTADDR?= %TEXTADDR% LINKFLAGS_NORMAL= -X 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.39 src/sys/arch/xen/conf/Makefile.xen:1.40 --- src/sys/arch/xen/conf/Makefile.xen:1.39 Tue Aug 18 10:18:21 2015 +++ src/sys/arch/xen/conf/Makefile.xen Mon Aug 24 14:04:25 2015 @@ -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 @@ TEXTADDR?= 0xffffffff80100000 .endif LINKFLAGS_NORMAL= -X KERNLDSCRIPT?= $S/arch/${XEN_BUILD}/conf/kern.ldscript.Xen -LINKSCRIPT= -T ${KERNLDSCRIPT} ## ## (6) port specific target dependencies Index: src/sys/arch/zaurus/conf/Makefile.zaurus.inc diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.7 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.8 --- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.7 Wed Aug 19 04:33:00 2015 +++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc Mon Aug 24 14:04:25 2015 @@ -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 @@ SYSTEM_LD_TAIL_EXTRA+=; \ KERNEL_BASE_VIRT= $(LOADADDRESS) KERNLDSCRIPT= ldscript -LINKSCRIPT= -T ${KERNLDSCRIPT} EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp Index: src/sys/conf/Makefile.kern.inc diff -u src/sys/conf/Makefile.kern.inc:1.185 src/sys/conf/Makefile.kern.inc:1.186 --- src/sys/conf/Makefile.kern.inc:1.185 Wed Aug 19 05:46:11 2015 +++ src/sys/conf/Makefile.kern.inc Mon Aug 24 14:04:25 2015 @@ -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_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJ SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} .gdbinit .if defined(KERNLDSCRIPT) SYSTEM_DEP+= ${KERNLDSCRIPT} +LINKSCRIPT= -T ${KERNLDSCRIPT} .endif .if defined(CTFMERGE) SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o