[x264-devel] [PATCH 1/1] ARM: do not override the toolchain default for FPU ABI

[Rémi Denis-Courmont]

x264 has to follow whatever the toolchain uses. Otherwise it will
proably fail to link against libc, much less run correctly.

In fact, things start to break even earlier, as the assembly code
checks immediately above will fail to compile. This was tested on
MeeGo 1.2 Harmattan SDK.
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 16007e0..a543b6a 100755
--- a/configure
+++ b/configure
@@ -613,7 +613,7 @@ fi
 
 if [ $asm = auto -a $ARCH = ARM ] ; then
     # set flags so neon is built by default
-    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-mfloat-abi)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
+    echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
 
     if  cc_check '' '' '__asm__("rev ip, ip");' ; then      define HAVE_ARMV6
         cc_check '' '' '__asm__("movt r0, #0");'         && define HAVE_ARMV6T2
-- 
1.7.5.4