[FFmpeg-cvslog] ARM: improve VFP ABI check

Mans Rullgard git
Tue Jan 18 23:07:50 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jan 16 18:42:36 2011 +0000| [44caaa560b8527acba99bc493040600add0fdb74] | committer: Mans Rullgard

ARM: improve VFP ABI check

Recent gcc versions define __ARM_PCS or __ARM_PCS_VFP to indicate the
VFP ABI in use, and ARM RVCT defines __SOFTFP__ when using this ABI.
If none of these are defined, check $cross_prefix and $cc for the
substring "hardfloat", and finally fall back to a linker test.  This
gives the correct result in most configurations.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44caaa560b8527acba99bc493040600add0fdb74
---

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

diff --git a/configure b/configure
index 9a68b73..123de51 100755
--- a/configure
+++ b/configure
@@ -2526,10 +2526,18 @@ elif enabled arm; then
     check_cflags -marm
     nogas=die
 
-    check_ld <<EOF && enable vfp_args
+    if     check_cpp_condition stddef.h "defined __ARM_PCS_VFP"; then
+        enable vfp_args
+    elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__"; then
+        case "${cross_prefix:-$cc}" in
+            *hardfloat*)         enable vfp_args;   fpabi=vfp ;;
+            *) check_ld <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;
 __asm__ (".eabi_attribute 28, 1");
 int main(void) { return 0; }
 EOF
+        esac
+        warn "Compiler does not indicate floating-point ABI, guessing $fpabi."
+    fi
 
     # We have to check if pld is a nop and disable it.
     check_asm pld '"pld [r0]"'




More information about the ffmpeg-cvslog mailing list