Check whether 32-bit x86 is really 64-bit

[ffmpeg] / configure

diff --git a/configure b/configure
index 04f20e65d73b95920687bddde49e41d1a92f3d82..ab71cb3e199ec6250c012cb36bc90af90441f262 100755 (executable)
--- 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"
@@ -2163,7 +2160,8 @@ elif enabled x86; then
 EOF
 
     # check whether EBX is available on x86
-    check_asm ebx_available '""::"b"(0)' && check_asm ebx_available '"":::"%ebx"'
+    check_asm ebx_available '""::"b"(0)' &&
+        check_asm ebx_available '"":::"%ebx"'
 
     # check whether more than 10 operands are supported
     check_cc <<EOF && enable ten_operands