Merge branch 'bugfix/abort_log_error_v3.1' into 'release/v3.1'

donghengqaz · donghengqaz · commit afd919cee5d4 · 2019-12-02T14:26:25.000+08:00
newlib: fix abort function cause critical error (backport v3.1)

See merge request sdk/ESP8266_RTOS_SDK!1202
diff --git a/components/newlib/newlib/port/syscall.c b/components/newlib/newlib/port/syscall.c
@@ -110,7 +110,7 @@ void _exit(int status)
 
 void abort(void)
 {
-    ESP_LOGE("ABORT","Error found and abort!");
+    ets_printf("abort() was called at PC %p on core %d\r\n", __builtin_return_address(0) - 3, xPortGetCoreID());
 
     /* cause a exception to jump into panic function */
     while (1) {

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void _exit(int status)`
`110`	`110`
`111`	`111`	`void abort(void)`
`112`	`112`	`{`
`113`		`- ESP_LOGE("ABORT","Error found and abort!");`
	`113`	`+ ets_printf("abort() was called at PC %p on core %d\r\n", __builtin_return_address(0) - 3, xPortGetCoreID());`
`114`	`114`
`115`	`115`	`/* cause a exception to jump into panic function */`
`116`	`116`	`while (1) {`