From b7590d71220f29dea5264714cbeaf28f906fcafb Mon Sep 17 00:00:00 2001 From: uebayasi Date: Sat, 15 Nov 2014 14:25:10 +0000 Subject: [PATCH] Use LINKSCRIPT. --- sys/arch/aarch64/conf/Makefile.aarch64 | 4 ++-- sys/arch/epoc32/conf/Makefile.epoc32.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/aarch64/conf/Makefile.aarch64 b/sys/arch/aarch64/conf/Makefile.aarch64 index eead4f114739..c5efc04acd54 100644 --- a/sys/arch/aarch64/conf/Makefile.aarch64 +++ b/sys/arch/aarch64/conf/Makefile.aarch64 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.aarch64,v 1.3 2014/08/17 21:17:43 joerg Exp $ +# $NetBSD: Makefile.aarch64,v 1.4 2014/11/15 14:25:10 uebayasi Exp $ # Makefile for NetBSD # @@ -62,7 +62,7 @@ LDSCRIPT?= ${A64}/conf/kern.ldscript LOADADDRESS?= 0xFFFFFFFF00000000 LINKFLAGS_NORMAL= -X .if "${LDSCRIPT}" != "" -LINKFLAGS_NORMAL+= -T ${LDSCRIPT} +LINKSCRIPT= -T ${LDSCRIPT} .endif # Strip AArch64 mapping symbols from the kernel image, as they interfere diff --git a/sys/arch/epoc32/conf/Makefile.epoc32.inc b/sys/arch/epoc32/conf/Makefile.epoc32.inc index cf88da593bc3..f09940dc14d1 100644 --- a/sys/arch/epoc32/conf/Makefile.epoc32.inc +++ b/sys/arch/epoc32/conf/Makefile.epoc32.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.epoc32.inc,v 1.1 2013/04/28 12:11:25 kiyohara Exp $ +# $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $ MACHINE_ARCH= arm CPPFLAGS+= -D${MACHINE} @@ -8,7 +8,7 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/epoc32_start.S KERNEL_BASE_VIRT= $(LOADADDRESS) -LINKFLAGS= -T ldscript +LINKSCRIPT= -T ldscript EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp