From: Mahavir Jain <mahavir@espressif.com>
Date: Wed, 7 Aug 2019 06:19:55 +0000 (+0530)
Subject: esp32_gdbstub: fix build error with esp32-2019r1 toolchain
X-Git-Tag: v4.1-dev~20^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5203a1543996e5ad9aacd33672dda9103c0c8aad;p=esp-idf

esp32_gdbstub: fix build error with esp32-2019r1 toolchain

Fixes https://github.com/espressif/esp-idf/issues/3866
---

diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index 4a104f0290..9b56938623 100644
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -429,6 +429,7 @@ static inline void disableAllWdts(void)
     TIMERG1.wdt_wprotect = 0;
 }
 
+#if CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT
 static void esp_panic_dig_reset(void) __attribute__((noreturn));
 
 static void esp_panic_dig_reset(void)
@@ -444,6 +445,7 @@ static void esp_panic_dig_reset(void)
         ;
     }
 }
+#endif
 
 static void putEntry(uint32_t pc, uint32_t sp)
 {
diff --git a/components/esp_gdbstub/src/gdbstub.c b/components/esp_gdbstub/src/gdbstub.c
index fbb3d26bf1..f15be617f2 100644
--- a/components/esp_gdbstub/src/gdbstub.c
+++ b/components/esp_gdbstub/src/gdbstub.c
@@ -205,12 +205,14 @@ static void handle_H_command(const unsigned char* cmd, int len)
         } else if (requested_task_index > s_scratch.task_count) {
             ret = "E00";
         } else {
-            TaskHandle_t handle;
+            TaskHandle_t handle = NULL;
             get_task_handle(requested_task_index, &handle);
             /* FIXME: for the task currently running on the other CPU, extracting the registers from TCB
              * isn't valid. Need to use some IPC mechanism to obtain the registers of the other CPU
              */
-            esp_gdbstub_tcb_to_regfile(handle, &s_scratch.regfile);
+            if (handle != NULL) {
+                esp_gdbstub_tcb_to_regfile(handle, &s_scratch.regfile);
+            }
         }
         esp_gdbstub_send_str_packet(ret);
     } else {