From d54030cdf24edf830541a9328dc7acd6e480b322 Mon Sep 17 00:00:00 2001
From: Steve Maillet <smaillet-ms@users.noreply.github.com>
Date: Wed, 10 Aug 2016 12:58:28 -0700
Subject: [PATCH] Revert "Fix to build Discovery 4 using GCC 5.4.1"

---
 Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings         | 1 -
 Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj        | 2 --
 Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj              | 2 +-
 .../STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml     | 2 +-
 .../STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml     | 5 -----
 tools/Targets/Microsoft.Spot.system.gcc.targets              | 4 ++--
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings b/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
index 82c3da8a5..a2a5d139c 100644
--- a/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
+++ b/Solutions/STM32F4DISCOVERY/STM32F4DISCOVERY.settings
@@ -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. -->
diff --git a/Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj b/Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj
index 0e7ef2b7f..d8c4f5188 100644
--- a/Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj
+++ b/Solutions/STM32F4DISCOVERY/TinyBooter/TinyBooter.proj
@@ -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>
diff --git a/Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj b/Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj
index c3161ee1a..bb8254842 100644
--- a/Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj
+++ b/Solutions/STM32F4DISCOVERY/TinyCLR/TinyCLR.proj
@@ -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" />
diff --git a/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml b/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml
index 7bd5e9f24..ad604bb70 100644
--- a/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml
+++ b/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml
@@ -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>
 
diff --git a/Solutions/STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml b/Solutions/STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml
index 0721f1dc7..65d649caa 100644
--- a/Solutions/STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml
+++ b/Solutions/STM32F4DISCOVERY/scatterfile_gcc_missing_symbols.xml
@@ -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" />
diff --git a/tools/Targets/Microsoft.Spot.system.gcc.targets b/tools/Targets/Microsoft.Spot.system.gcc.targets
index 5889a8685..20f2b19e2 100644
--- a/tools/Targets/Microsoft.Spot.system.gcc.targets
+++ b/tools/Targets/Microsoft.Spot.system.gcc.targets
@@ -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>
@@ -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>