[libav-stable] configure: arm: Assume softfp ABI on darwin

Martin Storsjö git at libav.org
Sat Aug 15 23:20:28 CEST 2015


Module: libav
Branch: master
Commit: cb2dbe2c762dae44d890aa26620bcdd9022fd0f3

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Fri Aug 14 09:47:21 2015 +0300

configure: arm: Assume softfp ABI on darwin

Don't try to detect the float ABI by checking at the toolchain
name or by trying to assemble and link files with eabi_attributes.

This fixes the float ABI detection when building using clang
with -fembed-bitcode, where the current eabi_attributes check
accidentally passes.

This issue was pointed out by James Howe <james.howe at hp.com>.

CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>

---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 2c3e77a..1334480 100755
--- a/configure
+++ b/configure
@@ -4015,7 +4015,7 @@ elif enabled arm; then
         enable vfp_args
     elif check_cpp_condition stddef.h "defined _M_ARM_FP && _M_ARM_FP >= 30"; then
         enable vfp_args
-    elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__"; then
+    elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then
         case "${cross_prefix:-$cc}" in
             *hardfloat*)         enable vfp_args;   fpabi=vfp ;;
             *) check_ld <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;



More information about the libav-stable mailing list