diff --git a/Solutions/MCBSTM32F400/MCBSTM32F400.settings b/Solutions/MCBSTM32F400/MCBSTM32F400.settings
index 19746763e..4283412de 100644
--- a/Solutions/MCBSTM32F400/MCBSTM32F400.settings
+++ b/Solutions/MCBSTM32F400/MCBSTM32F400.settings
@@ -14,6 +14,7 @@
         <ENDIANNESS>le</ENDIANNESS>
         <NO_BOOTLOADER_COMPRESSION>true</NO_BOOTLOADER_COMPRESSION>
         <TCP_IP_STACK>LWIP_1_4_1_OS</TCP_IP_STACK>
+        <PLATFORM_EMULATED_FLOATINGPOINT Condition="'$(COMPILER_TOOL)'=='GCC'">true</PLATFORM_EMULATED_FLOATINGPOINT>
     </PropertyGroup>
     <PropertyGroup>
         <OEMSystemInfoString>Copyright (C) Microsoft Corporation</OEMSystemInfoString>
diff --git a/Solutions/MCBSTM32F400/MCBSTM32F400_NONET.settings b/Solutions/MCBSTM32F400/MCBSTM32F400_NONET.settings
index c9faee51e..0a94c5049 100644
--- a/Solutions/MCBSTM32F400/MCBSTM32F400_NONET.settings
+++ b/Solutions/MCBSTM32F400/MCBSTM32F400_NONET.settings
@@ -13,6 +13,7 @@
         <IsSolutionWizardVisible>True</IsSolutionWizardVisible>
         <ENDIANNESS>le</ENDIANNESS>
         <NO_BOOTLOADER_COMPRESSION>true</NO_BOOTLOADER_COMPRESSION>
+        <PLATFORM_EMULATED_FLOATINGPOINT Condition="'$(COMPILER_TOOL)'=='GCC'">true</PLATFORM_EMULATED_FLOATINGPOINT>
     </PropertyGroup>
     <PropertyGroup>
         <OEMSystemInfoString>Copyright (C) Microsoft .NET Foundation</OEMSystemInfoString>
diff --git a/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings b/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
index a2a5d139c..82c3da8a5 100644
--- a/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
+++ b/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
@@ -16,6 +16,7 @@
     <IsSolutionWizardVisible>True</IsSolutionWizardVisible>
     <ENDIANNESS>le</ENDIANNESS>
     <NO_BOOTLOADER_COMPRESSION>true</NO_BOOTLOADER_COMPRESSION>
+    <PLATFORM_EMULATED_FLOATINGPOINT Condition="'$(COMPILER_TOOL)'=='GCC'">true</PLATFORM_EMULATED_FLOATINGPOINT>
   </PropertyGroup>
   <PropertyGroup>
     <!-- FIXME: Replaced with an appropriate value. -->
diff --git a/tools/Targets/Microsoft.Spot.system.gcc.targets b/tools/Targets/Microsoft.Spot.system.gcc.targets
index 270c6375d..093831fcc 100644
--- a/tools/Targets/Microsoft.Spot.system.gcc.targets
+++ b/tools/Targets/Microsoft.Spot.system.gcc.targets
@@ -64,7 +64,7 @@
     <CPP_FLAGS>$(CPP_FLAGS)-xc++ -w -fcheck-new</CPP_FLAGS>
 
     <FLOATING_POINT_FLAG Condition="('$(PLATFORM_EMULATED_FLOATINGPOINT)'!='true' and '$(DEVICE_TYPE)' == 'cortex-m4') or '$(INSTRUCTION_SET)'=='thumb2fp'">-mfloat-abi=hard -mfpu=fpv4-sp-d16</FLOATING_POINT_FLAG>
-    <FLOATING_POINT_FLAG Condition="'$(PLATFORM_EMULATED_FLOATINGPOINT)'=='true'">-mfloat-abi=soft</FLOATING_POINT_FLAG>
+    <FLOATING_POINT_FLAG Condition="'$(PLATFORM_EMULATED_FLOATINGPOINT)'=='true'">-mfloat-abi=softfp -mfpu=fpv4-sp-d16</FLOATING_POINT_FLAG>
 
     <AS_CC_CPP_COMMON_FLAGS>$(AS_CC_CPP_COMMON_FLAGS) $(FLOATING_POINT_FLAG) </AS_CC_CPP_COMMON_FLAGS>
     <AS_CC_CPP_COMMON_FLAGS>$(AS_CC_CPP_COMMON_FLAGS) $(ARCH_TYPE_FLAGS)</AS_CC_CPP_COMMON_FLAGS>