Skip to content

Commit cd8932a

Browse files
authored
Add support for new @platformio's "build" directory
Provide comments for PlatformIO's additional lines
1 parent b0bb1e1 commit cd8932a

File tree

1 file changed

+41
-15
lines changed

1 file changed

+41
-15
lines changed

tools/sdk/ld/eagle.app.v6.common.ld

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ SECTIONS
118118
*(.xt_except_desc_end)
119119
*(.dynamic)
120120
*(.gnu.version_d)
121-
. = ALIGN(4); /* this table MUST be 4-byte aligned */
121+
. = ALIGN(4); /* this table MUST be 4-byte aligned */
122122
_bss_table_start = ABSOLUTE(.);
123123
LONG(_bss_start)
124124
LONG(_bss_end)
@@ -157,18 +157,28 @@ SECTIONS
157157
*.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, \
158158
EXCLUDE_FILE (umm_malloc.c.o) .text*)
159159
*.cpp.o(.literal*, .text*)
160-
*.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
161-
EXCLUDE_FILE (umm_malloc.o) .text*)
162-
*.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
163-
EXCLUDE_FILE (umm_malloc.o) .text*)
164-
*.pioenvs\\*\\lib\*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
165-
EXCLUDE_FILE (umm_malloc.o) .text*)
166-
*.pioenvs/*/lib/*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, \
167-
EXCLUDE_FILE (umm_malloc.o) .text*)
168-
*.pioenvs\\*\\src\\*.o(EXCLUDE_FILE (umm_malloc.o) .literal*, \
169-
EXCLUDE_FILE (umm_malloc.o) .text*)
170-
*.pioenvs/*/src/*.o(EXCLUDE_FILE (umm_malloc.o) .literal*, \
171-
EXCLUDE_FILE (umm_malloc.o) .text*)
160+
/* PlatformIO */
161+
/* Core <=3.5.0 (deprecated) */
162+
/* framework */
163+
*.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
164+
*.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
165+
/* project dependencies */
166+
*.pioenvs\\*\\lib*\lib*.a:(.literal*, .text*)
167+
*.pioenvs/*/lib*/lib*.a:(.literal*, .text*)
168+
/* project source objects */
169+
*.pioenvs\\*\\src\\*.o(.literal*, .text*)
170+
*.pioenvs/*/src/*.o(.literal*, .text*)
171+
/* Core >3.5.0 */
172+
/* framework */
173+
*build\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
174+
*build/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
175+
/* project dependencies */
176+
*build\\*\\lib*\lib*.a:(.literal*, .text*)
177+
*build/*/lib*/lib*.a:(.literal*, .text*)
178+
/* project source objects */
179+
*build\\*\\src\\*.o(.literal*, .text*)
180+
*build/*/src/*.o(.literal*, .text*)
181+
/* End PlatformIO */
172182
*libc.a:(.literal .text .literal.* .text.*)
173183
*libm.a:(.literal .text .literal.* .text.*)
174184
*libgcc.a:_umoddi3.o(.literal .text)
@@ -232,12 +242,28 @@ SECTIONS
232242
*(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
233243
*.cpp.o(.iram.text)
234244
*.c.o(.iram.text)
245+
/* PlatformIO */
246+
/* Core <=3.5.0 (deprecated) */
247+
/* framework */
235248
*.pioenvs\\*\\lib*.a:(.iram.text)
236249
*.pioenvs/*/lib*.a:(.iram.text)
237-
*.pioenvs\\*\\lib\\*.a:(.iram.text)
238-
*.pioenvs/*/lib/*.a:(.iram.text)
250+
/* project dependencies */
251+
*.pioenvs\\*\\lib*\\lib*.a:(.iram.text)
252+
*.pioenvs/*/lib*/lib*.a:(.iram.text)
253+
/* project source objects */
239254
*.pioenvs\\*\\src\\*.o(.iram.text)
240255
*.pioenvs/*/src/*.o(.iram.text)
256+
/* Core >3.5.0 */
257+
/* framework */
258+
*build\\*\\lib*.a:(.iram.text)
259+
*build/*/lib*.a:(.iram.text)
260+
/* project dependencies */
261+
*build\\*\\lib*\\lib*.a:(.iram.text)
262+
*build/*/lib*/lib*.a:(.iram.text)
263+
/* project source objects */
264+
*build\\*\\src\\*.o(.iram.text)
265+
*build/*/src/*.o(.iram.text)
266+
/* End PlatformIO */
241267
*(.fini.literal)
242268
*(.fini)
243269
*(.gnu.version)

0 commit comments

Comments
 (0)