diff options
| author | Martin Storsjö <martin@martin.st> | 2023-10-17 10:21:50 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2023-10-24 14:46:14 +0300 |
| commit | 0679e853315b3cef81fe0120c37e6cc7c9ffba91 (patch) | |
| tree | 0471c8471c1aa862e7b16eb5d9405c390626c3dd | |
| parent | c258623c0a635d98e7e21123215446ebd2201b1e (diff) | |
| download | ffmpeg-0679e853315b3cef81fe0120c37e6cc7c9ffba91.tar.gz | |
aarch64: Stop using asm/hwcap.h for the HWCAP_* detection
Including sys/auxv.h should be enough (it pulls in bits/hwcap.h,
which provides the same defines).
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavutil/aarch64/cpu.c | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -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) \ |