From: Fiona Glaser <fiona@x264.com>
Date: Sat, 16 May 2009 19:16:34 +0000 (-0700)
Subject: Make i686 the default arch on x86_32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dbe5d467d218484376650b1349b5350639ea5fb;p=libx264

Make i686 the default arch on x86_32
Disabling asm will default to a generic arch.
Also fix configure for gcc 4.4.
---

diff --git a/configure b/configure
index f4b53446..f02d3e70 100755
--- a/configure
+++ b/configure
@@ -31,15 +31,11 @@ cc_check() {
 int main () { $3 return 0; }
 EOF
     $CC conftest.c $CFLAGS $LDFLAGS $2 -o conftest 2>$DEVNULL
-    TMP="$?"
-    return $TMP
 }
 
 as_check() {
     echo "$1" > conftest.asm
     $AS conftest.asm $ASFLAGS $2 -o conftest.o 2>$DEVNULL
-    TMP="$?"
-    return $TMP
 }
 
 rm -f config.h config.mak x264.pc conftest*
@@ -236,6 +232,9 @@ case $host_cpu in
     ARCH="X86"
     AS="yasm"
     ASFLAGS="$ASFLAGS -O2"
+    if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then
+      CFLAGS="$CFLAGS -march=i686"
+    fi
     if [ "$SYS" = MACOSX ]; then
       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
     elif [ "$SYS" = MINGW ]; then