Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Revert "Fix to build Discovery 4 using GCC 5.4.1" #492

Merged
merged 1 commit into from
Aug 10, 2016
Merged

Revert "Fix to build Discovery 4 using GCC 5.4.1" #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<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. -->
Expand Down
2 changes: 0 additions & 2 deletions Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
<ExtraTargets>$(ExtraTargets);CompressBin</ExtraTargets>
<ScatterFileDefinition>scatterfile_bootloader_$(COMPILER_TOOL).$(SCATTER_EXT)</ScatterFileDefinition>
<EXEScatterFileDefinition>scatterfile_bootloader_$(COMPILER_TOOL).$(SCATTER_EXT)</EXEScatterFileDefinition>
<!-- newlib-nano does not support long-long and long-double formatting, use standard newlib instead -->
<NewlibNano Condition="'$(COMPILER_TOOL)'=='GCC'">true</NewlibNano>
</PropertyGroup>
<ItemGroup />
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<CompressImageDatSym>TinyClr_Dat_Start</CompressImageDatSym>
<CompressImageCfgSym>g_ConfigurationSector</CompressImageCfgSym>
<!-- newlib-nano does not support long-long and long-double formatting, use standard newlib instead -->
<NewlibNano Condition="'$(COMPILER_TOOL)'=='GCC'">true</NewlibNano>
<NewlibNano Condition="'$(COMPILER_TOOL)'=='GCC'">false</NewlibNano>
</PropertyGroup>
<ItemGroup>
<CompressImageSymdef Include="$(BIN_DIR)\$(AssemblyName).symdefs" />
Expand Down
2 changes: 1 addition & 1 deletion Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<FileMapping Name="*" Options="(.constdata*)" />
<FileMapping Name="*" Options="(.conststring*)" />
<FileMapping Name="*" Options="(.glue*)" />
<FileMapping Name="*" Options="(tinyclr_metadata)" />
<FileMapping Name="*" Options="(tinyclr_metadata)" />
<Include File="%SPOCLIENT%\Solutions\STM32F4DISCOVERY\scatterfile_gcc_missing_symbols.xml"/>
</ExecRegion>

Expand Down
5 changes: 0 additions & 5 deletions Solutions/STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<ScatterFile xmlns="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd">
<!--
- using newlib-nano adds libnosys.a, which calls sbrk, which requires the 'end' symbol
- this is pulled in by a _printf imported in function _Crypto_StepRSAOperation @ Crypto.lib(rsa_zenith.obj)
-->
<Provide Name="end" />
<!-- libc thinks that it needs these routines, but they are never called -->
<Provide Name="_sbrk" />
<Provide Name="_write" />
Expand Down
4 changes: 2 additions & 2 deletions tools/Targets/Microsoft.Spot.system.gcc.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<CC_CPP_TARGETTYPE_FLAGS Condition="'$(FLAVOR)'=='Instrumented'" >$(CC_CPP_TARGETTYPE_FLAGS) -O0</CC_CPP_TARGETTYPE_FLAGS>
<CC_CPP_TARGETTYPE_FLAGS Condition="'$(FLAVOR)'=='Release'" >$(CC_CPP_TARGETTYPE_FLAGS) -Os</CC_CPP_TARGETTYPE_FLAGS>

<CC_FLAGS>$(CC_FLAGS)-std=c11 -xc</CC_FLAGS>
<CC_FLAGS>$(CC_FLAGS)-xc</CC_FLAGS>

<ARCH_TARGETTYPE_FLAGS Condition="'$(FLAVOR)'=='RTM'" >-O3</ARCH_TARGETTYPE_FLAGS>
<ARCH_TARGETTYPE_FLAGS Condition="'$(FLAVOR)'=='Debug'" >-Og -femit-class-debug-always -g3 -ggdb</ARCH_TARGETTYPE_FLAGS>
Expand All @@ -67,7 +67,7 @@
NETMF already builds under two other compilers, so warnings from
yet another compiler aren't really that valuable anyway.
-->
<CPP_FLAGS>$(CPP_FLAGS)-std=c++11 -xc++ -w -fcheck-new -fabi-version=0 -fno-exceptions -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics </CPP_FLAGS>
<CPP_FLAGS>$(CPP_FLAGS)-xc++ -w -fcheck-new -fabi-version=0 -fno-exceptions -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics </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=softfp -mfpu=fpv4-sp-d16</FLOATING_POINT_FLAG>
Expand Down