Skip to content

Commit 5f064a8

Browse files
committed
Use implicit FPU option for 'cpu'
As per http://www.keil.com/support/man/docs/armcc/armcc_chr1359124234797.htm Signed-off-by: CW2 <CW2@atlas.cz>
1 parent 8043d5d commit 5f064a8

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

DeviceCode/Targets/Native/STM32F4/STM32F4.settings

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
</ItemGroup>
2323

2424
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='RVDS'">
25-
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M4.fp</DEVICE_TYPE>
25+
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M4.fp.sp</DEVICE_TYPE>
2626
<BUILD_TOOL_GUID>{00C50096-00DD-00E7-BBA9-7FC84D408562}</BUILD_TOOL_GUID>
2727
</PropertyGroup>
2828
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='MDK'">
29-
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M4.fp</DEVICE_TYPE>
29+
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M4.fp.sp</DEVICE_TYPE>
3030
<BUILD_TOOL_GUID>{00EC0018-007A-0040-9936-929B39330107}</BUILD_TOOL_GUID>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='GCC'">

tools/Targets/Microsoft.Spot.system.mdk.targets

+1-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
<ARM_TYPE_FLAGS Condition="'$(OLD_STYLE_DEVICE_TYPE_NAME)'!='true' AND '$(DEVICE_TYPE)'!=''">$(SWTC)cpu $(DEVICE_TYPE)</ARM_TYPE_FLAGS>
115115
<ARM_TYPE_FLAGS Condition="'$(OLD_STYLE_DEVICE_TYPE_NAME)'=='true'">$(SWTC)device $(DEVICE_TYPE)</ARM_TYPE_FLAGS>
116116

117-
<!-- Use default fpu specification for Cortex-M4F -->
118-
<FLOATING_POINT_FLAG Condition="'$(PLATFORM_EMULATED_FLOATINGPOINT)'!='true' AND '$(DEVICE_TYPE)'!='Cortex-M4.fp'"> $(SWTC)fpu softvfp </FLOATING_POINT_FLAG>
117+
<!-- Use implicit FPU option for 'cpu', override with 'fpu'' if needed -->
119118
<FLOATING_POINT_FLAG Condition="'$(PLATFORM_EMULATED_FLOATINGPOINT)'=='true'"> $(SWTC)fpu none </FLOATING_POINT_FLAG>
120119

121120
<AS_CC_CPP_COMMON_FLAGS>$(AS_CC_CPP_COMMON_FLAGS) $(FLOATING_POINT_FLAG) $(ARM_TYPE_FLAGS)</AS_CC_CPP_COMMON_FLAGS>

0 commit comments

Comments
 (0)