2009-04-02 Zoltan Varga <vargaz@gmail.com>

	* mini-arm.c (mono_arch_output_basic_block): Fix the ARM_FPU_NONE build.

svn path=/trunk/mono/; revision=130819

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 6ddb5ebb55f421e7d2f8f1be6f878c51fe8cfc3d..a139c8f330ad3e854b81dabd216e3c5ced97de55 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2009-04-02  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini-arm.c (mono_arch_output_basic_block): Fix the ARM_FPU_NONE build.
+
        * mini-arm.h mini-arm.c cpu-arm.md: Finish VFP support.
 
 2009-04-01  Mark Probst  <mark.probst@gmail.com>

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index 918b67da13bf7e3bf1da3ccc5076298fbeb41d43..581182d597ee5d7cea9c8b5378d8c309b912488a 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -3540,7 +3540,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
 #ifdef ARM_FPU_FPA
                        if (ins->dreg != ins->sreg1)
                                ARM_MVFD (code, ins->dreg, ins->sreg1);
-#else
+#elif defined(ARM_FPU_VFP)
                        ARM_CPYD (code, ins->dreg, ins->sreg1);
 #endif
                        break;