RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '84146963d23d76b09af633e97413cd97d9b3021e' 

* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-29 13:52:05 +02:00
parent 5f9b1aae50 84146963d2
commit 8f68ef4681
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1337,6 +1337,7 @@ ARCH_EXT_LIST_X86='
amd3dnowext
avx
fma4
i686
mmx
mmxext
sse
@ -1461,7 +1462,6 @@ HAVE_LIST="
glob
gnu_as
gsm_h
i686
ibm_asm
inet_aton
io_h
@ -1679,7 +1679,9 @@ ppc4xx_deps="ppc"
vis_deps="sparc"
x86_64_suggest="fast_cmov i686"
cpunop_deps="i686"
x86_64_select="i686"
x86_64_suggest="fast_cmov"
amd3dnow_deps="mmx"
amd3dnowext_deps="amd3dnow"
@ -3977,7 +3979,7 @@ EOF
die "yasm not found, use --disable-yasm for a crippled build"
check_yasm "vextractf128 xmm0, ymm0, 0" || disable avx_external avresample
check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
check_yasm "CPU amdnop" && enabled i686 && enable cpunop
check_yasm "CPU amdnop" && enable cpunop
fi
case "$cpu" in