From d219bd78432b35acf206f963198b3ee8381dca44 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 18 Nov 2014 01:17:38 +0000 Subject: (except for the arm architectures...) unify the way the ld.script is used and depended, mimicking new changes by guenther to amd64. --- sys/arch/octeon/conf/Makefile.octeon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/arch/octeon') diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon index 452cdff1bad..b0b27bb2d41 100644 --- a/sys/arch/octeon/conf/Makefile.octeon +++ b/sys/arch/octeon/conf/Makefile.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.octeon,v 1.18 2014/10/04 18:10:14 brad Exp $ +# $OpenBSD: Makefile.octeon,v 1.19 2014/11/18 01:17:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -45,8 +45,8 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} -LINKFLAGS= -e start -T ${_machdir}/conf/ld.script -Ttext=${LINK_ADDRESS} \ - -nopie +LDSCRIPT= ${_machdir}/conf/ld.script +LINKFLAGS= -e start -T ${LDSCRIPT} -Ttext=${LINK_ADDRESS} -nopie STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} @@ -77,7 +77,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< # ${SYSTEM_LD_TAIL} SYSTEM_HEAD= locore.o param.o ioconf.o SYSTEM_OBJ= ${SYSTEM_HEAD} ${OBJS} -SYSTEM_DEP= Makefile ${SYSTEM_OBJ} +SYSTEM_DEP= Makefile ${SYSTEM_OBJ} ${LDSCRIPT} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS} -- cgit v1.2.3