aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-04-26 16:49:02 +0200
committerDiego Biurrun <diego@biurrun.de>2013-05-12 21:23:38 +0200
commitf54b55058a429c4eea5bae7e5bcb49bd29b34199 (patch)
tree72047044d0d383e765a0e1ee85f998458a3b2cae /configure
parente08c946c6860a78b0c479551d5f6735361160cbd (diff)
downloadffmpeg-f54b55058a429c4eea5bae7e5bcb49bd29b34199.tar.gz
configure: Rename cmov processor capability to i686
The goal is to make the capapility slightly more general and have it cover the availability of the nopl instruction in addition to cmov.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure b/configure
index 2dc71efed3..5e8e70e962 100755
--- a/configure
+++ b/configure
@@ -1253,7 +1253,6 @@ HAVE_LIST="
cdio_paranoia_h
cdio_paranoia_paranoia_h
closesocket
- cmov
CommandLineToArgvW
cpunop
CryptGenRandom
@@ -1287,6 +1286,7 @@ HAVE_LIST="
gettimeofday
gnu_as
gsm_h
+ i686
ibm_asm
inet_aton
io_h
@@ -1470,7 +1470,7 @@ ppc4xx_deps="ppc"
vis_deps="sparc"
-x86_64_suggest="cmov fast_cmov"
+x86_64_suggest="fast_cmov i686"
amd3dnow_deps="mmx"
amd3dnowext_deps="amd3dnow"
@@ -2870,21 +2870,21 @@ elif enabled x86; then
cpuflags="-march=$cpu"
disable mmx
;;
- # targets that do NOT support conditional mov (cmov)
+ # targets that do NOT support nopl and conditional mov (cmov)
pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
cpuflags="-march=$cpu"
- disable cmov
+ disable i686
;;
- # targets that do support conditional mov (cmov)
+ # targets that do support nopl and conditional mov (cmov)
i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
cpuflags="-march=$cpu"
- enable cmov
+ enable i686
enable fast_cmov
;;
# targets that do support conditional mov but on which it's slow
pentium4|pentium4m|prescott|nocona)
cpuflags="-march=$cpu"
- enable cmov
+ enable i686
disable fast_cmov
;;
esac
@@ -3895,7 +3895,7 @@ if enabled x86; then
echo "SSSE3 enabled ${ssse3-no}"
echo "AVX enabled ${avx-no}"
echo "FMA4 enabled ${fma4-no}"
- echo "CMOV enabled ${cmov-no}"
+ echo "i686 features enabled ${i686-no}"
echo "CMOV is fast ${fast_cmov-no}"
echo "EBX available ${ebx_available-no}"
echo "EBP available ${ebp_available-no}"