From 828f257277bd7418bbc0431bbd78569a2f609af1 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 15 Sep 2021 09:03:17 -0700
Subject: [PATCH] Remove nonexistent include path for arm64 crypto files.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D31932
---
 sys/conf/files.arm64             | 4 ++--
 sys/modules/armv8crypto/Makefile | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index bae23b17cc40..36dea68306f3 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -113,12 +113,12 @@ armv8_crypto_wrap.o				optional armv8crypto	\
 	clean		"armv8_crypto_wrap.o"
 aesv8-armx.o					optional armv8crypto	\
 	dependency	"$S/crypto/openssl/aarch64/aesv8-armx.S"	\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} -march=armv8-a+crypto ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} -march=armv8-a+crypto ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesv8-armx.o"
 ghashv8-armx.o					optional armv8crypto	\
 	dependency	"$S/crypto/openssl/aarch64/ghashv8-armx.S"	\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} -march=armv8-a+crypto ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} -march=armv8-a+crypto ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"ghashv8-armx.o"
 
diff --git a/sys/modules/armv8crypto/Makefile b/sys/modules/armv8crypto/Makefile
index bd38fe039fc9..b252a72609be 100644
--- a/sys/modules/armv8crypto/Makefile
+++ b/sys/modules/armv8crypto/Makefile
@@ -20,7 +20,6 @@ armv8_crypto_wrap.o: armv8_crypto_wrap.c
 aesv8-armx.o: aesv8-armx.S
 	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \
 	    -I${SRCTOP}/sys/crypto/armv8 \
-	    -I${SRCTOP}/sys/crypto/openssl/crypto \
 	    ${WERROR} ${PROF} \
 	    -march=armv8-a+crypto ${.IMPSRC}
 	${CTFCONVERT_CMD}
@@ -28,7 +27,6 @@ aesv8-armx.o: aesv8-armx.S
 ghashv8-armx.o: ghashv8-armx.S
 	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \
 	    -I${SRCTOP}/sys/crypto/armv8 \
-	    -I${SRCTOP}/sys/crypto/openssl/crypto \
 	    ${WERROR} ${PROF} \
 	    -march=armv8-a+crypto ${.IMPSRC}
 	${CTFCONVERT_CMD}