8000 Undo 5117 changes to ICACHE macros (#5130) · esp8266/Arduino@aa8c535 · GitHub
[go: up one dir, main page]
Skip to content

Commit aa8c535

Browse files
earlephilhowerearlephilhower
authored
Undo 5117 changes to ICACHE macros (#5130)
With the changes in PR #5117, blink and other examples compile but the 8266 gets stuck in a reset loop. Undo the changes from that commit until we can figure out the root cause and fix it.
1 parent 8f438b1 commit aa8c535

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

‎tools/sdk/include/c_types.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@ typedef enum {
8484
#define SHMEM_ATTR
8585

8686
#ifdef ICACHE_FLASH
87-
#define __ICACHE_STRINGIZE_NX(A) #A
88-
#define __ICACHE_STRINGIZE(A) __ICACHE_STRINGIZE_NX(A)
89-
#define ICACHE_FLASH_ATTR __attribute__((section("\".irom0.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
90-
#define ICACHE_RAM_ATTR __attribute__((section("\".iram.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
91-
#define ICACHE_RODATA_ATTR __attribute__((section("\".irom.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
87+
#define ICACHE_FLASH_ATTR __attribute__((section(".irom0.text")))
88+
#define ICACHE_RAM_ATTR __attribute__((section(".iram.text")))
89+
#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
9290
#else
9391
#define ICACHE_FLASH_ATTR
9492
#define ICACHE_RAM_ATTR

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ SECTIONS
127127
*libwpa.a:(.literal.* .text.*)
128128
*libwpa2.a:(.literal.* .text.*)
129129
*libwps.a:(.literal.* .text.*)
130-
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)
130+
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text .irom.text.*)
131131
_irom0_text_end = ABSOLUTE(.);
132132
_flash_code_end = ABSOLUTE(.);
133133
} >irom0_0_seg :irom0_0_phdr
@@ -164,8 +164,8 @@ SECTIONS
164164
*(.init.literal)
165165
*(.init)
166166
*(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
167-
*.cpp.o(.iram.text .iram.text.*)
168-
*.c.o(.iram.text .iram.text.*)
167+
*.cpp.o(.iram.text)
168+
*.c.o(.iram.text)
169169
#ifdef VTABLES_IN_IRAM
170170
*(.rodata._ZTV*) /* C++ vtables */
171171
#endif

0 commit comments

Comments
 (0)
0