From 227782d45d14ca0d68ee73b54eab71c1582dcbfa Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 9 Sep 2009 16:31:40 +0300 Subject: fix ARM -mfloat-abi=soft builds If __SOFTFP__ is defined, VFP support is not available even when __VFP_FP__ is defined. --- liboil/arm/math_vfp.c | 2 +- liboil/arm/math_vfp_asm.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liboil/arm/math_vfp.c b/liboil/arm/math_vfp.c index ffd3981..0bed96e 100644 --- a/liboil/arm/math_vfp.c +++ b/liboil/arm/math_vfp.c @@ -30,7 +30,7 @@ #include #include -#if __VFP_FP__ +#if defined(__VFP_FP__) && !defined(__SOFTFP__) extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n); diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S index ea68dba..ae5c803 100644 --- a/liboil/arm/math_vfp_asm.S +++ b/liboil/arm/math_vfp_asm.S @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#if __VFP_FP__ +#if defined(__VFP_FP__) && !defined(__SOFTFP__) /* ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp ** -- cgit v1.2.1