[FFmpeg-devel] [PATCH 1/2] aarch64: Stop using asm/hwcap.h for the HWCAP_* detection

[Martin Storsjö]

Including sys/auxv.h should be enough (it pulls in bits/hwcap.h,
which provides the same defines).
---
 configure               | 2 --
 libavutil/aarch64/cpu.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure b/configure
index bc0c0bd4e4..4ab20c54ec 100755
--- a/configure
+++ b/configure
@@ -2202,7 +2202,6 @@ HAVE_LIST_PUB="
 
 HEADERS_LIST="
     arpa_inet_h
-    asm_hwcap_h
     asm_types_h
     cdio_paranoia_h
     cdio_paranoia_paranoia_h
@@ -6453,7 +6452,6 @@ check_headers io.h
 enabled libdrm &&
     check_headers linux/dma-buf.h
 
-check_headers asm/hwcap.h
 check_headers linux/perf_event.h
 check_headers libcrystalhd/libcrystalhd_if.h
 check_headers malloc.h
diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c
index 2803b31443..bd780e8591 100644
--- a/libavutil/aarch64/cpu.c
+++ b/libavutil/aarch64/cpu.c
@@ -20,9 +20,8 @@
 #include "libavutil/cpu_internal.h"
 #include "config.h"
 
-#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL && HAVE_ASM_HWCAP_H
+#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL
 #include <stdint.h>
-#include <asm/hwcap.h>
 #include <sys/auxv.h>
 
 #define get_cpu_feature_reg(reg, val) \
-- 
2.34.1