Module Name: src Committed By: uebayasi Date: Tue Aug 18 10:00:11 UTC 2015
Modified Files: src/sys/arch/sparc/conf: Makefile.sparc src/sys/arch/sparc64/conf: Makefile.sparc64 Log Message: Adjust paths to ${KERNLDSCRIPT} files so that dependency is resolved. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/sparc/conf/Makefile.sparc cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc64/conf/Makefile.sparc64 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/sparc/conf/Makefile.sparc diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.91 src/sys/arch/sparc/conf/Makefile.sparc:1.92 --- src/sys/arch/sparc/conf/Makefile.sparc:1.91 Tue Aug 18 08:39:12 2015 +++ src/sys/arch/sparc/conf/Makefile.sparc Tue Aug 18 10:00:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sparc,v 1.91 2015/08/18 08:39:12 uebayasi Exp $ +# $NetBSD: Makefile.sparc,v 1.92 2015/08/18 10:00:11 uebayasi Exp $ # Makefile for NetBSD # @@ -60,9 +60,9 @@ amd7930intr.o bsd_fdintr.o lock_stubs.o: ## TEXTADDR?= F0004000 EXTRA_LINKFLAGS= -X -KERNLDSCRIPT?= kern.ldscript +KERNLDSCRIPT?= ${SPARC}/conf/kern.ldscript LINKFORMAT= -n -LINKSCRIPT= -T ${SPARC}/conf/${KERNLDSCRIPT} +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.76 src/sys/arch/sparc64/conf/Makefile.sparc64:1.77 --- src/sys/arch/sparc64/conf/Makefile.sparc64:1.76 Tue Aug 18 08:39:12 2015 +++ src/sys/arch/sparc64/conf/Makefile.sparc64 Tue Aug 18 10:00:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sparc64,v 1.76 2015/08/18 08:39:12 uebayasi Exp $ +# $NetBSD: Makefile.sparc64,v 1.77 2015/08/18 10:00:11 uebayasi Exp $ #========================================================================= # @@ -108,11 +108,11 @@ dependkernlib: assym.h ## (5) link settings ## TEXTADDR?= 01000000 -LINKSCRIPT= -T ${SPARC64}/conf/${KERNLDSCRIPT} +LINKSCRIPT= -T ${KERNLDSCRIPT} .if ${LP64} == "yes" -KERNLDSCRIPT?= kern.ldscript +KERNLDSCRIPT?= ${SPARC64}/conf/kern.ldscript .else -KERNLDSCRIPT?= kern32.ldscript +KERNLDSCRIPT?= ${SPARC64}/conf/kern32.ldscript .endif ##