TEMPORARILY disable gap compilation, until lld is fixed/updated to

newer code with a variety of ld.script bugs fixed.

diff --git a/sys/arch/arm64/arm64/autoconf.c b/sys/arch/arm64/arm64/autoconf.c
index 5652825..c50fddf 100644 (file)
--- 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 b320d95..582a256 100644 (file)
--- 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 $@