From 73c8c0341cce9e1a6c4169721f5123f97fc4be2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> Date: Thu, 7 Jan 2016 15:06:49 +0200 Subject: [PATCH] arm: Fix vfp dead code elimination with have_vfp_vm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes builds with --disable-vfp. Checking for the armv6 cpu flag is incorrect, since vfpv2 isn't armv6 specific. Signed-off-by: Martin Storsjö <martin@martin.st> --- libavutil/arm/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 5563fc1c690..127993e5ddb 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -33,7 +33,7 @@ /* some functions use the VFPv2 vector mode which is deprecated in ARMv7-A * and might trap on such CPU depending on the OS configuration */ #define have_vfp_vm(flags) \ - (have_armv6(flags) && ((flags) & AV_CPU_FLAG_VFP_VM)) + (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP_VM)) /* Some functions use the 'setend' instruction which is deprecated on ARMv8 * and serializing on some ARMv7 cores. This macro ensures such functions -- GitLab