aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2009-10-01 21:38:25 +0000
committerDavid Conrad <lessen42@gmail.com>2009-10-01 21:38:25 +0000
commitde27f4d95726aed333e8ef78fdfbc0b4357130d8 (patch)
tree70451d52260b33eeafb278a9508bf6773df18c65
parent553e9f75297c84939ba1fa8c87cfa0ee6c6a6e84 (diff)
downloadffmpeg-de27f4d95726aed333e8ef78fdfbc0b4357130d8.tar.gz
Check whether 32-bit x86 is really 64-bit
Fixes configure on OS X 10.6 Originally committed as revision 20134 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure13
1 files changed, 5 insertions, 8 deletions
diff --git a/configure b/configure
index 4e24df0a47..ab71cb3e19 100755
--- a/configure
+++ b/configure
@@ -1817,20 +1817,17 @@ case "$arch" in
enable fast_64bit
spic=$shared
;;
- i386|i486|i586|i686|i86pc|BePC)
+ i386|i486|i586|i686|i86pc|BePC|x86_64|amd64)
arch="x86"
subarch="x86_32"
enable fast_unaligned
- ;;
- x86_64|amd64)
- arch="x86"
- subarch="x86_32"
- enable cmov
- enable fast_cmov
- enable fast_unaligned
check_cc <<EOF && enable fast_64bit && subarch="x86_64" && spic=$shared
int test[sizeof(char*) - 7];
EOF
+ if test "$subarch" = "x86_64"; then
+ enable cmov
+ enable fast_cmov
+ fi
;;
*)
arch="unknown"