Sorry again. This attachment should make it through.
I've not got a git checkout to hand to do it the nice way.

James Howe  |  Software Designer, Aurasma  |  HP Inc UK Limited  |  +44 1223
796209 (o)  |  +44 7990 558790 (m)  | james.h...@hp.com

-----Original Message-----
From: Howe, James 
Sent: 11 August 2015 15:47
To: 'ffmpeg-devel@ffmpeg.org'
Subject: Patch: --disable-vfp doesn't

Shouldn't be doing the vfp checks if vfp is not enabled. Just use soft.
This patch is against 2.5.2.
I apologise for not having the time to check trunk and rebase there if it
doesn't apply cleanly.
--- ./configure
+++ /.configure
@@ -4493,17 +4493,21 @@
 
     enabled thumb && check_cflags -mthumb || check_cflags -marm
 
-    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 "cc" <<EOF && enable vfp_args && fpabi=vfp || 
fpabi=soft ;;
+    if enabled vfp; then
+        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 "cc" <<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."
+            esac
+            warn "Compiler does not indicate floating-point ABI, guessing 
$fpabi."
+        fi
+    else
+        fpabi=soft
     fi
 
     enabled armv5te && check_insn armv5te 'qadd r0, r0, r0'

Attachment: smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to