diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-06-05 12:44:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-06-05 12:44:00 +0000 |
| commit | 2dfa61178f13fdb1920a28907e3ecc76bbf87920 (patch) | |
| tree | 470e56992f5bbda0724a6d60c7e2f4280a10e515 /sys/arch/sparc64 | |
| parent | 33b937a3e33fda45ea1d235733d5e56807d8938c (diff) | |
The arm* architectures edit the ld.script, creating a copy in the compile
directories. Copy it in the same way on other architectures, for the same
effect. Something upcoming will want that file there anyways.
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/conf/Makefile.sparc64 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 06bec23968a..78fece436a4 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.82 2017/06/03 22:21:34 deraadt Exp $ +# $OpenBSD: Makefile.sparc64,v 1.83 2017/06/05 12:43:59 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -37,8 +37,7 @@ DEBUG?= -g COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} -LDSCRIPT= ${_machdir}/conf/ld.script -LINKFLAGS= -n -T ${LDSCRIPT} --warn-common -nopie +LINKFLAGS= -n -T ld.script --warn-common -nopie .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -68,7 +67,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} ${LDSCRIPT} +SYSTEM_DEP= Makefile ${SYSTEM_OBJ} ld.script SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \ umask 007; \ @@ -112,6 +111,9 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} +ld.script: ${_machdir}/conf/ld.script + cp ${_machdir}/conf/ld.script $@ + vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c |