From 8d94a62b9cc2f7f7fbfd2e68dc09de82638c4355 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 18 Jun 2016 00:52:46 +0300
Subject: [PATCH] Revert back previous LINKFLAGS

---
 platformio/builder/scripts/basearm.py   | 7 +++----
 platformio/builder/scripts/espressif.py | 6 ++++--
 platformio/builder/scripts/ststm32.py   | 5 +++++
 platformio/builder/scripts/titiva.py    | 7 +++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index a8dc9cc7..20892b18 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -40,7 +40,8 @@ env.Replace(
         "-fdata-sections",
         "-Wall",
         "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['cpu']}"
+        "-mcpu=${BOARD_OPTIONS['build']['cpu']}",
+        "-nostdlib"
     ],
 
     CXXFLAGS=[
@@ -56,9 +57,7 @@ env.Replace(
         "-Os",
         "-Wl,--gc-sections,--relax",
         "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['cpu']}",
-        "-nostdlib",
-        "-nostartfiles"
+        "-mcpu=${BOARD_OPTIONS['build']['cpu']}"
     ],
 
     LIBS=["c", "gcc", "m"],
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 34058955..7c167489 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -71,7 +71,8 @@ env.Replace(
         "-Wpointer-arith",
         "-Wno-implicit-function-declaration",
         "-Wl,-EL",
-        "-fno-inline-functions"
+        "-fno-inline-functions",
+        "-nostdlib"
     ],
 
     CCFLAGS=[
@@ -81,7 +82,8 @@ env.Replace(
         "-falign-functions=4",
         "-U__STRICT_ANSI__",
         "-ffunction-sections",
-        "-fdata-sections"
+        "-fdata-sections",
+        "-MMD"  # output dependancy info
     ],
 
     CXXFLAGS=[
diff --git a/platformio/builder/scripts/ststm32.py b/platformio/builder/scripts/ststm32.py
index 3077f74d..8dbd70ef 100644
--- a/platformio/builder/scripts/ststm32.py
+++ b/platformio/builder/scripts/ststm32.py
@@ -66,6 +66,11 @@ env.Append(
     ],
 
     LIBS=["stdc++", "nosys"],
+
+    LINKFLAGS=[
+        "-nostartfiles",
+        "-nostdlib"
+    ]
 )
 
 #
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index 411eb0cb..e705cd62 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/platformio/builder/scripts/titiva.py
@@ -31,6 +31,13 @@ env.Replace(
     UPLOADCMD='"$UPLOADER" $SOURCES'
 )
 
+env.Append(
+    LINKFLAGS=[
+        "-nostartfiles",
+        "-nostdlib"
+    ]
+)
+
 #
 # Target: Build executable and linkable firmware
 #