aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-08-27 23:33:57 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-28 17:03:05 +0200
commit84146963d23d76b09af633e97413cd97d9b3021e (patch)
tree58975a3183698b8d217f22d00e776081a34fb167
parent6454c44f9f74dbaed17d32cf0eaec185386c27fa (diff)
downloadffmpeg-84146963d23d76b09af633e97413cd97d9b3021e.tar.gz
configure: x86: Fix handling of i686 and cpunop features
The i686 feature really is a CPU feature and should be handled as such. The cpunop dependency on i686 should be expressed with a standard _deps declaration instead of a manual test.
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index a27cf36437..4de0fd2f66 100755
--- a/configure
+++ b/configure
@@ -1178,6 +1178,7 @@ ARCH_EXT_LIST_X86='
amd3dnowext
avx
fma4
+ i686
mmx
mmxext
sse
@@ -1290,7 +1291,6 @@ HAVE_LIST="
gettimeofday
gnu_as
gsm_h
- i686
ibm_asm
inet_aton
io_h
@@ -1480,7 +1480,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"
@@ -3567,7 +3569,7 @@ EOF
check_yasm "vextractf128 xmm0, ymm0, 0" && enable yasm ||
die "yasm not found, use --disable-yasm for a crippled build"
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