Skip to content

Commit 2c99453

Browse files
Fix duplicated stc=gnu99/c17 in build
1 parent 8f8a196 commit 2c99453

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cores/esp8266/core_esp8266_postmortem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void __wrap_system_restart_local() {
149149
ets_printf_P(PSTR("\nSoft WDT reset\n"));
150150
}
151151
else if (rst_info.reason == REASON_USER_STACK_SMASH) {
152-
ets_printf_P(PSTR("\nStack corrupted, stack smash detected.\n"));
152+
ets_printf_P(PSTR("\nStack overflow detected.\n"));
153153
}
154154
else {
155155
ets_printf_P(PSTR("\nGeneric Reset\n"));
@@ -297,7 +297,7 @@ void __panic_func(const char* file, int line, const char* func) {
297297
uintptr_t __stack_chk_guard = 0x08675309 ^ RANDOM_REG32;
298298
void __stack_chk_fail(void) {
299299
s_user_reset_reason = REASON_USER_STACK_SMASH;
300-
ets_printf_P(PSTR("\nGCC detected stack overrun"));
300+
ets_printf_P(PSTR("\nPANIC: Stack overrun"));
301301

302302
if (gdb_present())
303303
__asm__ __volatile__ ("syscall"); // triggers GDB when enabled

platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
5555
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
5656

5757
compiler.c.cmd=xtensa-lx106-elf-gcc
58-
compiler.c.flags=-c {compiler.warning_flags} -std=c17 {build.stacksmash_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
58+
compiler.c.flags=-c {compiler.warning_flags} -std=c17 {build.stacksmash_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
5959

6060
compiler.S.cmd=xtensa-lx106-elf-gcc
6161
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls

0 commit comments

Comments
 (0)