commit 57ad24cfdd60ad4b6cfc61e0e004856ec1676261
Author: Peter Grehan <grehan@FreeBSD.org>
Date:   Thu Jun 3 15:54:09 2021 +1000

    Compile fixes

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index cc235ce2d92..5ac02c0eda0 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -1,6 +1,6 @@
 # $FreeBSD$
 hyp_genassym.o			optional	vmm			\
-	dependency	"$S/arm64/vmm/hyp_genassym.c offset.inc"	\
+	dependency	"$S/arm64/vmm/hyp_genassym.c offset.inc device_if.h"	\
 	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"hyp_genassym.o"
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index 7cebcc9f01a..8ff38cf7746 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -34,7 +34,7 @@ SRCS+=	vgic_v3.c \
 CLEANFILES=	hyp_assym.h hyp_genassym.o
 OBJS_DEPEND_GUESS.vmm_hyp.o+= hyp_assym.h
 
-.else if ${MACHINE_CPUARCH} == "amd64"
+.elif ${MACHINE_CPUARCH} == "amd64"
 DPSRCS+=	vmx_assym.h svm_assym.h
 DPSRCS+=	vmx_genassym.c svm_genassym.c offset.inc