summaryrefslogtreecommitdiff
path: root/sys/arch/arm64/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm64/conf')
-rw-r--r--sys/arch/arm64/conf/Makefile.arm647
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index b320d959af0..582a2564f2e 100644
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.arm64,v 1.16 2017/06/25 14:02:23 deraadt Exp $
+# $OpenBSD: Makefile.arm64,v 1.17 2017/06/29 05:40:37 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -72,7 +72,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_HEAD= locore0.o gap.o
+SYSTEM_HEAD= locore0.o
SYSTEM_OBJ= ${SYSTEM_HEAD} ${OBJS} param.o ioconf.o
SYSTEM_DEP= Makefile ${SYSTEM_OBJ} ld.script
SYSTEM_LD_HEAD= @rm -f $@
@@ -119,11 +119,10 @@ mcount.o: $S/lib/libkern/mcount.c Makefile
ioconf.o: ioconf.c
${NORMAL_C}
-ld.script: ${_archdir}/conf/kern.ldscript
+ld.script: ${_archdir}/conf/kern.ldscript makegap.sh
cat ${_archdir}/conf/kern.ldscript | \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ld.script
-
gapdummy.o:
echo 'const char gapdummy;' > gapdummy.c
${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@