Index: liboil-0.3.15/liboil/arm/math_vfp.c
===================================================================
--- liboil-0.3.15.orig/liboil/arm/math_vfp.c	2008-03-13 13:17:59.000000000 -0700
+++ liboil-0.3.15/liboil/arm/math_vfp.c	2009-05-06 01:51:09.000000000 -0700
@@ -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);
Index: liboil-0.3.15/liboil/arm/math_vfp_asm.S
===================================================================
--- liboil-0.3.15.orig/liboil/arm/math_vfp_asm.S	2007-11-15 18:53:47.000000000 -0800
+++ liboil-0.3.15/liboil/arm/math_vfp_asm.S	2009-05-06 01:50:39.000000000 -0700
@@ -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
 **