Skip to content

Commit 4806bda

Browse files
Support PIO Wl-T and Arduino -T linking properly
The interrupt vectors in IRAM are ommitted when there is a PROVIDE statement in the linker control files when using the PIO method of -Wl,-T<linkfile>. Drop the PROVIDES (they're in RAM anyway and not ROM related), and add the required "-u"s to the P{IO build script. Should have no iumpact on the Arduino side. Fixes #6087
1 parent eea9999 commit 4806bda

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tools/platformio-build.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ def scons_patched_match_splitext(path, suffixes=None):
9393
"-u", "app_entry",
9494
"-u", "_printf_float",
9595
"-u", "_scanf_float"
96+
"-u _DebugExceptionVector",
97+
"-u _DoubleExceptionVector",
98+
"-u _KernelExceptionVector",
99+
"-u _NMIExceptionVector",
100+
"-u _UserExceptionVector"
96101
],
97102

98103
CPPDEFINES=[

tools/sdk/ld/eagle.rom.addr.v6.ld

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,8 @@ PROVIDE ( UartRegReadProc = 0x4000381c );
4141
PROVIDE ( UartRegWriteProc = 0x400037ac );
4242
PROVIDE ( UartRxString = 0x40003c30 );
4343
PROVIDE ( Uart_Init = 0x40003a14 );
44-
PROVIDE ( _DebugExceptionVector = 0x40000010 );
45-
PROVIDE ( _DoubleExceptionVector = 0x40000070 );
46-
PROVIDE ( _KernelExceptionVector = 0x40000030 );
47-
PROVIDE ( _NMIExceptionVector = 0x40000020 );
4844
PROVIDE ( _ResetHandler = 0x400000a4 );
4945
PROVIDE ( _ResetVector = 0x40000080 );
50-
PROVIDE ( _UserExceptionVector = 0x40000050 );
5146
PROVIDE ( __adddf3 = 0x4000c538 );
5247
PROVIDE ( __addsf3 = 0x4000c180 );
5348
PROVIDE ( __divdf3 = 0x4000cb94 );

0 commit comments

Comments
 (0)