From 71dd2828174754ad0fec2573ca8b9fcf88c97799 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Thu, 29 Jun 2017 05:40:35 +0000
Subject: [PATCH] TEMPORARILY disable gap compilation, until lld is
 fixed/updated to newer code with a variety of ld.script bugs fixed.

---
 sys/arch/arm64/arm64/autoconf.c    | 4 +++-
 sys/arch/arm64/conf/Makefile.arm64 | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/arch/arm64/arm64/autoconf.c b/sys/arch/arm64/arm64/autoconf.c
index 56528250a7d..c50fddf687f 100644
--- a/sys/arch/arm64/arm64/autoconf.c
+++ b/sys/arch/arm64/arm64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.3 2017/06/04 14:10:42 patrick Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.4 2017/06/29 05:40:35 deraadt Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -34,6 +34,7 @@ enum devclass bootdev_class = DV_DULL;
 void
 unmap_startup(void)
 {
+#if 0
 	extern void *_start, *endboot;
 	vaddr_t p = (vaddr_t)&_start;
 
@@ -41,6 +42,7 @@ unmap_startup(void)
 		pmap_kremove(p, PAGE_SIZE);
 		p += PAGE_SIZE;
 	} while (p < (vaddr_t)&endboot);
+#endif
 }
 
 void
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 $@
-- 
2.20.1