From 411f8d878f8fc10d110c25bba5e94b60fdd1a847 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 3 Jan 2018 15:33:55 +0200
Subject: [PATCH] Add support for @PlatformIO Core 3.5.0

---
 tools/sdk/ld/eagle.app.v6.common.ld | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
index 00f731c4e..c61741ab0 100644
--- a/tools/sdk/ld/eagle.app.v6.common.ld
+++ b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -118,7 +118,7 @@ SECTIONS
     *(.xt_except_desc_end)
     *(.dynamic)
     *(.gnu.version_d)
-    . = ALIGN(4);		/* this table MUST be 4-byte aligned */
+    . = ALIGN(4);       /* this table MUST be 4-byte aligned */
     _bss_table_start = ABSOLUTE(.);
     LONG(_bss_start)
     LONG(_bss_end)
@@ -157,18 +157,17 @@ SECTIONS
     *.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, \
            EXCLUDE_FILE (umm_malloc.c.o) .text*)
     *.cpp.o(.literal*, .text*)
-    *.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
-    *.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
-    *.pioenvs\\*\\lib\*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
-    *.pioenvs/*/lib/*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
-    *.pioenvs\\*\\src\\*.o(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
-    *.pioenvs/*/src/*.o(EXCLUDE_FILE (umm_malloc.o) .literal*, \
-    EXCLUDE_FILE (umm_malloc.o) .text*)
+    /* PlatformIO */
+    /* framework */
+    *.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
+    *.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
+    /* project dependencies */
+    *.pioenvs\\*\\lib*\lib*.a:(.literal*, .text*)
+    *.pioenvs/*/lib*/lib*.a:(.literal*, .text*)
+    /* project source objects */
+    *.pioenvs\\*\\src\\*.o(.literal*, .text*)
+    *.pioenvs/*/src/*.o(.literal*, .text*)
+    /* End PlatformIO */
     *libc.a:(.literal .text .literal.* .text.*)
     *libm.a:(.literal .text .literal.* .text.*)
     *libgcc.a:_umoddi3.o(.literal .text)
@@ -232,12 +231,17 @@ SECTIONS
     *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *.cpp.o(.iram.text)
     *.c.o(.iram.text)
+    /* PlatformIO */
+    /* framework */
     *.pioenvs\\*\\lib*.a:(.iram.text)
     *.pioenvs/*/lib*.a:(.iram.text)
-    *.pioenvs\\*\\lib\\*.a:(.iram.text)
-    *.pioenvs/*/lib/*.a:(.iram.text)
+    /* project dependencies */
+    *.pioenvs\\*\\lib*\\lib*.a:(.iram.text)
+    *.pioenvs/*/lib*/lib*.a:(.iram.text)
+    /* project source objects */
     *.pioenvs\\*\\src\\*.o(.iram.text)
     *.pioenvs/*/src/*.o(.iram.text)
+    /* End PlatformIO */
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)