diff options
| author | Adrian Bunk <adrian.bunk@movial.com> | 2009-09-09 16:31:40 +0300 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2010-02-04 11:54:58 -0800 |
| commit | 227782d45d14ca0d68ee73b54eab71c1582dcbfa (patch) | |
| tree | 799c847a6f78adf3070e1f07c3e1e78a1fe1e383 | |
| parent | 7a154119019b14aa532c73e635be4e4905f0652e (diff) | |
fix ARM -mfloat-abi=soft builds
If __SOFTFP__ is defined, VFP support is not available
even when __VFP_FP__ is defined.
| -rw-r--r-- | liboil/arm/math_vfp.c | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 30 | #include <liboil/liboilclasses.h> | 30 | #include <liboil/liboilclasses.h> |
| 31 | #include <liboil/liboilfunction.h> | 31 | #include <liboil/liboilfunction.h> |
| 32 | 32 | ||
| 33 | #if __VFP_FP__ | 33 | #if defined(__VFP_FP__) && !defined(__SOFTFP__) |
| 34 | 34 | ||
| 35 | extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); | 35 | extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); |
| 36 | extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n); | 36 | 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 @@ | |||
| 24 | * SUCH DAMAGE. | 24 | * SUCH DAMAGE. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #if __VFP_FP__ | 27 | #if defined(__VFP_FP__) && !defined(__SOFTFP__) |
| 28 | /* | 28 | /* |
| 29 | ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp | 29 | ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp |
| 30 | ** | 30 | ** |