Merge branch 'bugfix/esp32s2beta_crtbegin' into 'master'

esp32s2beta: fix crash at startup due to toolchain crtbegin being linked

See merge request espressif/esp-idf!6783
This commit is contained in:
Angus Gratton
2019-11-22 07:01:32 +08:00
3 changed files with 6 additions and 8 deletions

View File

@@ -408,7 +408,6 @@ void xt_unhandled_exception(XtExcFrame *frame)
panicPutStr("Unknown");
}
panicPutStr(")");
#ifdef PANIC_COMPLETE_IN_ESP32C
if (esp_cpu_in_ocd_debug_mode()) {
panicPutStr(" at pc=");
panicPutHex(frame->pc);
@@ -426,7 +425,6 @@ void xt_unhandled_exception(XtExcFrame *frame)
setFirstBreakpoint(frame->pc);
return;
}
#endif
panicPutStr(". Exception was unhandled.\r\n");
}
commonErrorHandler(frame);