From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Tue, 18 Aug 2015 07:02:01 +0000 (+0200)
Subject: Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fdca9350139bae44623b90a7db4d8116c3487372;p=ffmpeg

Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3'

* commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3':
  configure: arm: Assume softfp ABI on darwin

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

fdca9350139bae44623b90a7db4d8116c3487372
diff --cc configure
index 55cc7fb64b2,13344802660..a6c57d07f27
--- a/configure
+++ b/configure
@@@ -4796,10 -4015,10 +4796,10 @@@ EO
          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 ;;
 +            *) check_ld "cc" <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;
  __asm__ (".eabi_attribute 28, 1");
  int main(void) { return 0; }
  EOF