* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
arm: rename ARMVFP config symbol to VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -70,7 +70,7 @@ config.h: .config |
70 | 70 |
|
71 | 71 |
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ |
72 | 72 |
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ |
73 |
- ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ |
|
73 |
+ ARMV5TE-OBJS ARMV6-OBJS VFP-OBJS NEON-OBJS \ |
|
74 | 74 |
ALTIVEC-OBJS VIS-OBJS \ |
75 | 75 |
MMX-OBJS YASM-OBJS \ |
76 | 76 |
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS \ |
... | ... |
@@ -1,6 +1,6 @@ |
1 | 1 |
OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes) |
2 | 2 |
OBJS-$(HAVE_ARMV6) += $(ARMV6-OBJS) $(ARMV6-OBJS-yes) |
3 |
-OBJS-$(HAVE_ARMVFP) += $(ARMVFP-OBJS) $(ARMVFP-OBJS-yes) |
|
3 |
+OBJS-$(HAVE_VFP) += $(VFP-OBJS) $(VFP-OBJS-yes) |
|
4 | 4 |
OBJS-$(HAVE_NEON) += $(NEON-OBJS) $(NEON-OBJS-yes) |
5 | 5 |
|
6 | 6 |
OBJS-$(HAVE_MIPSFPU) += $(MIPSFPU-OBJS) $(MIPSFPU-OBJS-yes) |
... | ... |
@@ -296,7 +296,7 @@ Optimization options (experts only): |
296 | 296 |
--disable-armv5te disable armv5te optimizations |
297 | 297 |
--disable-armv6 disable armv6 optimizations |
298 | 298 |
--disable-armv6t2 disable armv6t2 optimizations |
299 |
- --disable-armvfp disable ARM VFP optimizations |
|
299 |
+ --disable-vfp disable VFP optimizations |
|
300 | 300 |
--disable-neon disable NEON optimizations |
301 | 301 |
--disable-vis disable VIS optimizations |
302 | 302 |
--disable-inline-asm disable use of inline assembler |
... | ... |
@@ -1241,8 +1241,8 @@ ARCH_EXT_LIST_ARM=' |
1241 | 1241 |
armv5te |
1242 | 1242 |
armv6 |
1243 | 1243 |
armv6t2 |
1244 |
- armvfp |
|
1245 | 1244 |
neon |
1245 |
+ vfp |
|
1246 | 1246 |
vfpv3 |
1247 | 1247 |
' |
1248 | 1248 |
|
... | ... |
@@ -1551,9 +1551,9 @@ CMDLINE_APPEND=" |
1551 | 1551 |
armv5te_deps="arm" |
1552 | 1552 |
armv6_deps="arm" |
1553 | 1553 |
armv6t2_deps="arm" |
1554 |
-armvfp_deps="arm" |
|
1555 | 1554 |
neon_deps="arm" |
1556 |
-vfpv3_deps="armvfp" |
|
1555 |
+vfp_deps="arm" |
|
1556 |
+vfpv3_deps="vfp" |
|
1557 | 1557 |
|
1558 | 1558 |
map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM |
1559 | 1559 |
|
... | ... |
@@ -3493,8 +3493,8 @@ EOF |
3493 | 3493 |
enabled armv5te && check_insn armv5te 'qadd r0, r0, r0' |
3494 | 3494 |
enabled armv6 && check_insn armv6 'sadd16 r0, r0, r0' |
3495 | 3495 |
enabled armv6t2 && check_insn armv6t2 'movt r0, #0' |
3496 |
- enabled armvfp && check_insn armvfp 'fadds s0, s0, s0' |
|
3497 | 3496 |
enabled neon && check_insn neon 'vadd.i16 q0, q0, q0' |
3497 |
+ enabled vfp && check_insn vfp 'fadds s0, s0, s0' |
|
3498 | 3498 |
enabled vfpv3 && check_insn vfpv3 'vmov.f32 s0, #1.0' |
3499 | 3499 |
|
3500 | 3500 |
map 'enabled_any ${v}_external ${v}_inline || disable $v' $ARCH_EXT_LIST_ARM |
... | ... |
@@ -4186,7 +4186,7 @@ if enabled arm; then |
4186 | 4186 |
echo "ARMv5TE enabled ${armv5te-no}" |
4187 | 4187 |
echo "ARMv6 enabled ${armv6-no}" |
4188 | 4188 |
echo "ARMv6T2 enabled ${armv6t2-no}" |
4189 |
- echo "ARM VFP enabled ${armvfp-no}" |
|
4189 |
+ echo "VFP enabled ${vfp-no}" |
|
4190 | 4190 |
echo "NEON enabled ${neon-no}" |
4191 | 4191 |
fi |
4192 | 4192 |
if enabled mips; then |
... | ... |
@@ -48,9 +48,9 @@ ARMV6-OBJS += arm/dsputil_init_armv6.o \ |
48 | 48 |
arm/dsputil_armv6.o \ |
49 | 49 |
arm/simple_idct_armv6.o \ |
50 | 50 |
|
51 |
-ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o |
|
51 |
+VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o |
|
52 | 52 |
|
53 |
-ARMVFP-OBJS += arm/dsputil_vfp.o \ |
|
53 |
+VFP-OBJS += arm/dsputil_vfp.o \ |
|
54 | 54 |
arm/dsputil_init_vfp.o \ |
55 | 55 |
|
56 | 56 |
NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ |
... | ... |
@@ -24,7 +24,7 @@ int ff_get_cpu_flags_arm(void) |
24 | 24 |
return AV_CPU_FLAG_ARMV5TE * HAVE_ARMV5TE | |
25 | 25 |
AV_CPU_FLAG_ARMV6 * HAVE_ARMV6 | |
26 | 26 |
AV_CPU_FLAG_ARMV6T2 * HAVE_ARMV6T2 | |
27 |
- AV_CPU_FLAG_VFP * HAVE_ARMVFP | |
|
27 |
+ AV_CPU_FLAG_VFP * HAVE_VFP | |
|
28 | 28 |
AV_CPU_FLAG_VFPV3 * HAVE_VFPV3 | |
29 | 29 |
AV_CPU_FLAG_NEON * HAVE_NEON; |
30 | 30 |
} |
... | ... |
@@ -25,7 +25,7 @@ |
25 | 25 |
#define have_armv5te(flags) (HAVE_ARMV5TE && ((flags) & AV_CPU_FLAG_ARMV5TE)) |
26 | 26 |
#define have_armv6(flags) (HAVE_ARMV6 && ((flags) & AV_CPU_FLAG_ARMV6)) |
27 | 27 |
#define have_armv6t2(flags) (HAVE_ARMV6T2 && ((flags) & AV_CPU_FLAG_ARMV6T2)) |
28 |
-#define have_vfp(flags) (HAVE_ARMVFP && ((flags) & AV_CPU_FLAG_VFP)) |
|
28 |
+#define have_vfp(flags) (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP)) |
|
29 | 29 |
#define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) |
30 | 30 |
#define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) |
31 | 31 |
|