From 6031485b6ac1cfd8d2fe566ec0053a3941e253c8 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 23 Mar 2022 15:13:31 +0000
Subject: Start disentangling armv7 and aarch64 code

arm_arch.h and armcap.c are shared between armv7 and aarch64 which
results in an inscrutable #ifdef maze. Move copies of these files
into arch/{arm,aarch64}/ with appropriate names and some trivial
minor adjustments.

ok deraadt inoguchi kettenis
---
 src/lib/libcrypto/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/Makefile')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 00cd2e0721..15f3ba1e60 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2022/01/14 08:38:05 tb Exp $
+# $OpenBSD: Makefile,v 1.72 2022/03/23 15:13:31 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -28,6 +28,7 @@ CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
 CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this?
 
 CFLAGS+= -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/arch/${MACHINE_CPU}
 CFLAGS+= -I${LCRYPTO_SRC}/asn1
 CFLAGS+= -I${LCRYPTO_SRC}/bio
 CFLAGS+= -I${LCRYPTO_SRC}/bn
-- 
cgit v1.2.3-55-g6feb