]> git.sesse.net Git - ffmpeg/commitdiff
configure: arm: Assume softfp ABI on darwin
authorMartin Storsjö <martin@martin.st>
Fri, 14 Aug 2015 06:47:21 +0000 (09:47 +0300)
committerMartin Storsjö <martin@martin.st>
Sat, 15 Aug 2015 21:17:22 +0000 (00:17 +0300)
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@hp.com>.

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

index 2c3e77a77d47e9e9914ab9050146b8cdad1307d2..133448026601da4485a3a9b3266c0263274c2646 100755 (executable)
--- 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 ;;