diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-10-13 05:55:28 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-10-13 05:55:28 +0000 |
| commit | 1cc4e99a8e66758fde0dcc85be99e0e2479440e1 (patch) | |
| tree | 5dcfb989cdda4737b4c474135ccc6bfd63d843ca /sys/arch/arm64/conf | |
| parent | 7d5eac398d70e5a1f261640406f3763fcd387a7b (diff) | |
Use gap.o on arm64. After the recent llvm/lld 5.0.0 update the linker
script can be used. ok kettenis@
Diffstat (limited to 'sys/arch/arm64/conf')
| -rw-r--r-- | sys/arch/arm64/conf/Makefile.arm64 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64 index 625068da87f..4858c3395ec 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.23 2017/09/28 16:16:34 patrick Exp $ +# $OpenBSD: Makefile.arm64,v 1.24 2017/10/13 05:55:27 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -66,7 +66,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_HEAD= locore0.o +SYSTEM_HEAD= locore0.o gap.o SYSTEM_OBJ= ${SYSTEM_HEAD} ${OBJS} param.o ioconf.o SYSTEM_DEP= Makefile ${SYSTEM_OBJ} ld.script SYSTEM_LD_HEAD= @rm -f $@ @@ -113,7 +113,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -ld.script: ${_archdir}/conf/kern.ldscript makegap.sh +ld.script: ${_archdir}/conf/kern.ldscript cat ${_archdir}/conf/kern.ldscript | \ sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \ -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ld.script |