summaryrefslogtreecommitdiff
authorAdrian Bunk <adrian.bunk@movial.com>2009-09-09 13:31:40 (GMT)
committer David Schleef <ds@schleef.org>2010-02-04 19:54:58 (GMT)
commit227782d45d14ca0d68ee73b54eab71c1582dcbfa (patch) (side-by-side diff)
tree799c847a6f78adf3070e1f07c3e1e78a1fe1e383
parent7a154119019b14aa532c73e635be4e4905f0652e (diff)
downloadliboil-227782d45d14ca0d68ee73b54eab71c1582dcbfa.zip
liboil-227782d45d14ca0d68ee73b54eab71c1582dcbfa.tar.gz
fix ARM -mfloat-abi=soft builds
If __SOFTFP__ is defined, VFP support is not available even when __VFP_FP__ is defined.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--liboil/arm/math_vfp.c2
-rw-r--r--liboil/arm/math_vfp_asm.S2
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 <liboil/liboilclasses.h>
#include <liboil/liboilfunction.h>
-#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
**