From b326755989b346d0d935e0628e8865f9b2951c30 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 4 Dec 2012 23:29:34 +0000 Subject: arm: rename ARMVFP config symbol to VFP This is consistent with usual ARM nomenclature as well as with the VFPV3 and NEON symbols which both lack the ARM prefix. Signed-off-by: Mans Rullgard --- libavutil/arm/Makefile | 4 ++-- libavutil/arm/asm.S | 2 +- libavutil/arm/cpu.c | 2 +- libavutil/arm/cpu.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libavutil/arm') diff --git a/libavutil/arm/Makefile b/libavutil/arm/Makefile index ac7eca6751..5da44b0542 100644 --- a/libavutil/arm/Makefile +++ b/libavutil/arm/Makefile @@ -1,8 +1,8 @@ OBJS += arm/cpu.o \ arm/float_dsp_init_arm.o \ -ARMVFP-OBJS += arm/float_dsp_init_vfp.o \ - arm/float_dsp_vfp.o \ +VFP-OBJS += arm/float_dsp_init_vfp.o \ + arm/float_dsp_vfp.o \ NEON-OBJS += arm/float_dsp_init_neon.o \ arm/float_dsp_neon.o \ diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 8ac28e263e..a1817892f0 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -46,7 +46,7 @@ #if HAVE_NEON .fpu neon -#elif HAVE_ARMVFP +#elif HAVE_VFP .fpu vfp #endif diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 33dca1c65a..7058aeb1f1 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -24,7 +24,7 @@ int ff_get_cpu_flags_arm(void) return AV_CPU_FLAG_ARMV5TE * HAVE_ARMV5TE | AV_CPU_FLAG_ARMV6 * HAVE_ARMV6 | AV_CPU_FLAG_ARMV6T2 * HAVE_ARMV6T2 | - AV_CPU_FLAG_VFP * HAVE_ARMVFP | + AV_CPU_FLAG_VFP * HAVE_VFP | AV_CPU_FLAG_VFPV3 * HAVE_VFPV3 | AV_CPU_FLAG_NEON * HAVE_NEON; } diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 72e16d409f..91c959ab27 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -25,7 +25,7 @@ #define have_armv5te(flags) (HAVE_ARMV5TE && ((flags) & AV_CPU_FLAG_ARMV5TE)) #define have_armv6(flags) (HAVE_ARMV6 && ((flags) & AV_CPU_FLAG_ARMV6)) #define have_armv6t2(flags) (HAVE_ARMV6T2 && ((flags) & AV_CPU_FLAG_ARMV6T2)) -#define have_vfp(flags) (HAVE_ARMVFP && ((flags) & AV_CPU_FLAG_VFP)) +#define have_vfp(flags) (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP)) #define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) #define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) -- cgit v1.2.3