aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:52:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:52:09 +0200
commit8f68ef46817f6795ee89b2720a17ea972c3f6639 (patch)
tree9c32cd56dbf8731f55b879b79f9fd1a4cf5ff910
parent5f9b1aae504fd6842b049866b0974f710e0bd3ca (diff)
parent84146963d23d76b09af633e97413cd97d9b3021e (diff)
downloadffmpeg-8f68ef46817f6795ee89b2720a17ea972c3f6639.tar.gz
Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'
* commit '84146963d23d76b09af633e97413cd97d9b3021e': configure: x86: Fix handling of i686 and cpunop features Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index ad9e03dde4..035fb8abb8 100755
--- a/configure
+++ b/configure
@@ -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