diff --git a/Makefile b/Makefile
index fcb7e5501bc8f78d180b9acd0fd7e3b660782c25..ca1ace18cb93732fa7c7144f04e2650ca8d15909 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ config.h: .config
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
- ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \
+ ARMV5TE-OBJS ARMV6-OBJS VFP-OBJS NEON-OBJS \
ALTIVEC-OBJS VIS-OBJS \
MMX-OBJS YASM-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS \
diff --git a/arch.mak b/arch.mak
index 79c9e2b1f70053dab84a58c44f8a53e3a52be01d..b71c8e51f3bf713ec45d9eb4dda206108e9fab9f 100644
--- a/arch.mak
+++ b/arch.mak
@@ -1,6 +1,6 @@
OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes)
OBJS-$(HAVE_ARMV6) += $(ARMV6-OBJS) $(ARMV6-OBJS-yes)
-OBJS-$(HAVE_ARMVFP) += $(ARMVFP-OBJS) $(ARMVFP-OBJS-yes)
+OBJS-$(HAVE_VFP) += $(VFP-OBJS) $(VFP-OBJS-yes)
OBJS-$(HAVE_NEON) += $(NEON-OBJS) $(NEON-OBJS-yes)
OBJS-$(HAVE_MIPSFPU) += $(MIPSFPU-OBJS) $(MIPSFPU-OBJS-yes)
diff --git a/configure b/configure
index cbb243cd2fddd5fcb083c417d50da5449217da6d..63e6ccc4667a4519058b3f1a45db2e00accea20e 100755
--- a/configure
+++ b/configure
@@ -296,7 +296,7 @@ Optimization options (experts only):
--disable-armv5te disable armv5te optimizations
--disable-armv6 disable armv6 optimizations
--disable-armv6t2 disable armv6t2 optimizations
- --disable-armvfp disable ARM VFP optimizations
+ --disable-vfp disable VFP optimizations
--disable-neon disable NEON optimizations
--disable-vis disable VIS optimizations
--disable-inline-asm disable use of inline assembler
@@ -1241,8 +1241,8 @@ ARCH_EXT_LIST_ARM='
armv5te
armv6
armv6t2
- armvfp
neon
+ vfp
vfpv3
'
@@ -1551,9 +1551,9 @@ CMDLINE_APPEND="
armv5te_deps="arm"
armv6_deps="arm"
armv6t2_deps="arm"
-armvfp_deps="arm"
neon_deps="arm"
-vfpv3_deps="armvfp"
+vfp_deps="arm"
+vfpv3_deps="vfp"
map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
@@ -3493,8 +3493,8 @@ EOF
enabled armv5te && check_insn armv5te 'qadd r0, r0, r0'
enabled armv6 && check_insn armv6 'sadd16 r0, r0, r0'
enabled armv6t2 && check_insn armv6t2 'movt r0, #0'
- enabled armvfp && check_insn armvfp 'fadds s0, s0, s0'
enabled neon && check_insn neon 'vadd.i16 q0, q0, q0'
+ enabled vfp && check_insn vfp 'fadds s0, s0, s0'
enabled vfpv3 && check_insn vfpv3 'vmov.f32 s0, #1.0'
map 'enabled_any ${v}_external ${v}_inline || disable $v' $ARCH_EXT_LIST_ARM
@@ -4186,7 +4186,7 @@ if enabled arm; then
echo "ARMv5TE enabled ${armv5te-no}"
echo "ARMv6 enabled ${armv6-no}"
echo "ARMv6T2 enabled ${armv6t2-no}"
- echo "ARM VFP enabled ${armvfp-no}"
+ echo "VFP enabled ${vfp-no}"
echo "NEON enabled ${neon-no}"
fi
if enabled mips; then
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index acfd6262911834de8f6dfabcee1bbfe16801ea73..b315d8da0e47170567f3aeb98c9f492552ead50d 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -48,9 +48,9 @@ ARMV6-OBJS += arm/dsputil_init_armv6.o \
arm/dsputil_armv6.o \
arm/simple_idct_armv6.o \
-ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o
+VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o
-ARMVFP-OBJS += arm/dsputil_vfp.o \
+VFP-OBJS += arm/dsputil_vfp.o \
arm/dsputil_init_vfp.o \
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
diff --git a/libavutil/arm/Makefile b/libavutil/arm/Makefile
index ac7eca6751ea3fdfbb3b15eaea51af22a1ca7137..5da44b05427ab677fa086339a8d6f227763170af 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 07bb6ae5b9c800edf2fc0f28c4ac380c283c215c..6061e47a63440aca6961b5408bd6a57dd60583ed 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 33dca1c65af476554cffe1a9d470da87f586570b..7058aeb1f1face00e50a09dddcf0920a35f9e107 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 72e16d409fdcf02d63705de009da86fe9ece4e65..91c959ab27a523885510ea9e93831ffda22be0c7 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))