From 40cf697566a4df3f20cf5b0f1f03b111c7e0d0f2 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 7 Dec 2012 02:16:18 +0200 Subject: [PATCH] configure: set float-abi even without armv6 --- configure | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 053dba90..e8e5b2aa 100755 --- a/configure +++ b/configure @@ -215,16 +215,18 @@ if [ "$ARCH" = "arm" ]; then # automatically set mfpu and mfloat-abi if they are not set if [ "$have_arm_neon" = "yes" ]; then - echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=neon" - echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=neon" + fpu="neon" elif [ "$have_armv6" = "yes" ]; then - echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=vfp" - echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=vfp" + fpu="vfp" fi - floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true - if [ "$floatabi_set_by_gcc" != "yes" -a "$have_armv6" = "yes" ]; then - echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp" - echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp" + if [ "x$fpu" != "x" ]; then + echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=$fpu" + echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=$fpu" + floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true + if [ "$floatabi_set_by_gcc" != "yes" ]; then + echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp" + echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp" + fi fi # must disable thumb as recompiler can't handle it -- 2.39.2