From da7ee2c86fc32b4f92a7643819bb5426e1c9b357 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Wed, 30 Mar 2016 11:49:41 +0300
Subject: [PATCH] Update build flags form atmelsam // Resolve #601

---
 platformio/builder/scripts/atmelsam.py          | 17 +++++++++++++----
 .../builder/scripts/frameworks/arduino.py       | 16 +---------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py
index e9a24b10..173b78b3 100644
--- a/platformio/builder/scripts/atmelsam.py
+++ b/platformio/builder/scripts/atmelsam.py
@@ -95,13 +95,26 @@ else:
     )
 
 env.Append(
+    CFLAGS=[
+        "-std=gnu11",
+        "--param", "max-inline-insns-single=500"
+    ],
+
     CXXFLAGS=[
+        "-std=gnu++11",
         "-fno-threadsafe-statics"
     ],
 
     CPPDEFINES=[
         "USBCON",
         'USB_MANUFACTURER="PlatformIO"'
+    ],
+
+    LINKFLAGS=[
+        "-Wl,--check-sections",
+        "-Wl,--unresolved-symbols=report-all",
+        "-Wl,--warn-common",
+        "-Wl,--warn-section-align"
     ]
 )
 
@@ -124,10 +137,6 @@ if "sam3x8e" in env.get("BOARD_OPTIONS", {}).get("build", {}).get("mcu", None):
     )
 elif "zero" in env.subst("$BOARD"):
     env.Append(
-        CCFLAGS=[
-            "--param", "max-inline-insns-single=500"
-        ],
-
         LINKFLAGS=[
             "--specs=nosys.specs",
             "--specs=nano.specs"
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index 2fd12154..198846fd 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -256,16 +256,6 @@ if BOARD_BUILDOPTS.get("core", None) == "teensy3":
         "M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0")
     )
 
-if "zero" in env.subst("$BOARD"):
-    envsafe.Append(
-        CFLAGS=[
-            "-std=gnu11"
-        ],
-
-        CXXFLAGS=[
-            "-std=gnu++11",
-        ]
-    )
 
 libs.append(envsafe.BuildLibrary(
     join("$BUILD_DIR", "FrameworkArduino"),
@@ -279,11 +269,7 @@ if "sam3x8e" in BOARD_BUILDOPTS.get("mcu", None):
                  "${BOARD_OPTIONS['build']['variant']}")
         ]
     )
-    envsafe.Append(
-        CFLAGS=[
-            "-std=gnu99"
-        ]
-    )
+
     libs.append("sam_sam3x8e_gcc_rel")
 
 env.Prepend(LIBS=libs)