From 3a8b5be2a256ffc6d8ec4fb35ecfb335d5a4a03b Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Mon, 30 Sep 2024 06:46:57 -0400
Subject: [PATCH] aarch64: Use elf_aux_info() for CPU feature detection on
 FreeBSD/OpenBSD

---
 common/cpu.c | 13 +++++++++++--
 configure    |  7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/cpu.c b/common/cpu.c
index fb7c07d53..0e464203f 100644
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -420,7 +420,7 @@ uint32_t x264_cpu_detect( void )
 
 #elif HAVE_AARCH64
 
-#ifdef __linux__
+#if defined(__linux__) || HAVE_ELF_AUX_INFO
 #include <sys/auxv.h>
 
 #define HWCAP_AARCH64_SVE   (1 << 22)
@@ -430,8 +430,17 @@ static uint32_t detect_flags( void )
 {
     uint32_t flags = 0;
 
+#if HAVE_ELF_AUX_INFO
+    unsigned long hwcap = 0;
+    unsigned long hwcap2 = 0;
+
+    elf_aux_info( AT_HWCAP, &hwcap, sizeof(hwcap) );
+    elf_aux_info( AT_HWCAP2, &hwcap2, sizeof(hwcap2) );
+#else
     unsigned long hwcap = getauxval( AT_HWCAP );
     unsigned long hwcap2 = getauxval( AT_HWCAP2 );
+#endif
+
     if ( hwcap & HWCAP_AARCH64_SVE )
         flags |= X264_CPU_SVE;
     if ( hwcap2 & HWCAP2_AARCH64_SVE2 )
@@ -458,7 +467,7 @@ uint32_t x264_cpu_detect( void )
 #endif
 
     // Where possible, try to do runtime detection as well.
-#ifdef __linux__
+#if defined(__linux__) || HAVE_ELF_AUX_INFO
     flags |= detect_flags();
 #endif
 
diff --git a/configure b/configure
index 63d9bd6b8..d50aca8d5 100755
--- a/configure
+++ b/configure
@@ -411,8 +411,7 @@ NL="
 # list of all preprocessor HAVE values we can define
 CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON AARCH64 BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \
              LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC INTEL_DISPATCHER \
-             MSA LSX MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R CLOCK_GETTIME BITDEPTH8 BITDEPTH10 \
-             SVE SVE2"
+             MSA LSX MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R CLOCK_GETTIME BITDEPTH8 BITDEPTH10 SVE SVE2 ELF_AUX_INFO"
 
 # parse options
 
@@ -1144,6 +1143,10 @@ elif cc_check 'time.h' '-lrt' 'clock_gettime(CLOCK_MONOTONIC, 0);' ; then
     LDFLAGS="$LDFLAGS -lrt"
 fi
 
+if cc_check 'sys/auxv.h' '' 'unsigned long auxv = 0; elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));' ; then
+    define HAVE_ELF_AUX_INFO
+fi
+
 if [ "$SYS" != "WINDOWS" ] && cpp_check "sys/mman.h unistd.h" "" "defined(MAP_PRIVATE)"; then
     define HAVE_MMAP
 fi