summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-08 18:06:44 +0000
committerzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-08 18:06:44 +0000
commit79dc1dddeef00a258cfb91c1e9c37b18f6f3528b (patch)
treeaea7538db0f4ae8912af0c2f12c937440d1d612c /configure
parentbab14c11d7875b3c84cb8bfafd5c554e26541356 (diff)
downloadmpv-79dc1dddeef00a258cfb91c1e9c37b18f6f3528b.tar.bz2
mpv-79dc1dddeef00a258cfb91c1e9c37b18f6f3528b.tar.xz
Fix fast_cmov detection broken by r24371
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24372 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 4 insertions, 5 deletions
diff --git a/configure b/configure
index ac117c4c44..2a7a4eb0be 100755
--- a/configure
+++ b/configure
@@ -1714,6 +1714,7 @@ case "$host_arch" in
else
proc=pentium4
fi
+ test $_fast_cmov = "auto" && _fast_cmov=no
;;
*) proc=prescott iproc=686 ;;
esac
@@ -1858,10 +1859,6 @@ EOF
if test $_cmov = "yes" && test $_fast_cmov = "auto" ; then
_fast_cmov="yes"
- case "$proc" in
- pentium4|prescott|nocona)
- _fast_cmov="no"
- esac
else
_fast_cmov="no"
fi
@@ -1902,7 +1899,9 @@ EOF
*)
# 64-bit prescotts exist, but as far as GCC is concerned they
# have the same capabilities as a nocona.
- proc=nocona;;
+ proc=nocona
+ test $_fast_cmov = "auto" && _fast_cmov=no
+ ;;
esac
;;
*)