From 52b1623c6b4fee563f01ce91d76e2df23ed090c1 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Fri, 8 Nov 2024 09:22:29 -0700
Subject: Hook up new aarch64 feature detection

---
 crypto/CMakeLists.txt                         |  4 ++-
 crypto/Makefile.am                            |  3 +++
 patches/patch-aarch64-crypto-cpu-caps.c.patch | 39 +++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 patches/patch-aarch64-crypto-cpu-caps.c.patch

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index a2b06d3..cf85036 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -180,7 +180,9 @@ if(HOST_ASM_MINGW64_X86_64)
 	set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
 endif()
 
-if(HOST_X86_64)
+if(HOST_AARCH64)
+	set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps.c)
+elseif(HOST_X86_64)
 	set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c)
 elseif(HOST_I386)
 	set(CRYPTO_SRC ${CRYPTO_SRC} arch/i386/crypto_cpu_caps.c)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index f601ec9..9df0a2e 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -202,6 +202,9 @@ endif
 endif
 endif
 
+if HOST_AARCH64
+libcrypto_la_SOURCES += arch/aarch64/crypto_cpu_caps.c
+endif
 if HOST_X86_64
 libcrypto_la_SOURCES += arch/amd64/crypto_cpu_caps.c
 endif
diff --git a/patches/patch-aarch64-crypto-cpu-caps.c.patch b/patches/patch-aarch64-crypto-cpu-caps.c.patch
new file mode 100644
index 0000000..2a1006e
--- /dev/null
+++ b/patches/patch-aarch64-crypto-cpu-caps.c.patch
@@ -0,0 +1,39 @@
+Disable feature detection until we find a more portable way.
+
+--- crypto/arch/aarch64/crypto_cpu_caps.c	Fri Nov  8 09:23:31 2024
+--- crypto/arch/aarch64/crypto_cpu_caps.c	Fri Nov  8 09:02:47 2024
+@@ -16,9 +16,12 @@
+  */
+ 
+ #include <sys/types.h>
++
++#if defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+ 
+ #include <machine/cpu.h>
++#endif
+ 
+ #include <stddef.h>
+ #include <stdio.h>
+@@ -66,6 +69,7 @@
+ 	return caps;
+ }
+ 
++#if defined(__OpenBSD__)
+ static int
+ read_isar0(uint64_t *isar0)
+ {
+@@ -83,6 +87,13 @@
+ 
+ 	return 1;
+ }
++#else
++static int
++read_isar0(uint64_t *isar0)
++{
++	return 0;
++}
++#endif
+ 
+ void
+ crypto_cpu_caps_init(void)
-- 
cgit v1.2.3-55-g6feb