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

[Rémi Denis-Courmont]

x264 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 30 14:07:43 2011 -0700| [c9ba582d61db3e2b0a8587a46a7cb78f5371f9c7] | committer: Jason Garrett-Glaser

ARM: do not override the toolchain default for FPU ABI

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c9ba582d61db3e2b0a8587a46a7cb78f5371f9c7
---

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 41f7a7c..9ce13bc 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