diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:29:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:29:40 +0200 |
| commit | 69d52ef8ffcfc9246b58fd77b020f255ed64384b (patch) | |
| tree | 0d2341822e495ddd86dba363bcdcabc8d3433c1e /configure | |
| parent | 6585275e79cd2cc29472c84a4786106ee41f7924 (diff) | |
| parent | f54b55058a429c4eea5bae7e5bcb49bd29b34199 (diff) | |
| download | ffmpeg-streaming-69d52ef8ffcfc9246b58fd77b020f255ed64384b.zip ffmpeg-streaming-69d52ef8ffcfc9246b58fd77b020f255ed64384b.tar.gz | |
Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'
* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
configure: Rename cmov processor capability to i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1416,7 +1416,6 @@ HAVE_LIST=" CL_cl_h clock_gettime closesocket - cmov CommandLineToArgvW cpunop CryptGenRandom @@ -1451,6 +1450,7 @@ HAVE_LIST=" glob gnu_as gsm_h + i686 ibm_asm inet_aton io_h @@ -1659,7 +1659,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" @@ -3194,21 +3194,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 @@ -4393,7 +4393,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}" |
