commit 6ba8aa63c123730664b270a2ea401c1b89f601c8
author Shubham Kulkarni <57181281+shubhamkulkarni97@users.noreply.github.com> Fri Aug 13 06:16:25 2021 +0530
committer GitHub <noreply@github.com> Thu Aug 12 17:46:25 2021 -0700
tree 285a3ffef574917ef8c84036a213a962be79ea5d
parent d858d1ff36ca11fd4240a3340cd3a737da36897f

Xtensa_ESP32: Fix build issues when external SPIRAM is enabled (#381)

Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>

portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h

diff --git a/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h b/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
index 6d9280b..32a7959 100644
--- a/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
+++ b/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
@@ -89,6 +89,9 @@
 
     #include <esp_heap_caps.h>
     #include "soc/soc_memory_layout.h"
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0))
+    #include "soc/compare_set.h"
+#endif /* ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0) */
 
 /*#include "xtensa_context.h" */
 

portable/ThirdParty/GCC/Xtensa_ESP32/port.c

diff --git a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
index f2a4e19..e6ac135 100644
--- a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
+++ b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
@@ -484,6 +484,8 @@
     esp_set_watchpoint( 1, ( char * ) addr, 32, ESP_WATCHPOINT_STORE );
 }
 
+#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0))
+
 #if defined( CONFIG_SPIRAM_SUPPORT )
 
 /*
@@ -522,6 +524,7 @@
     }
 #endif //defined(CONFIG_SPIRAM_SUPPORT)
 
+#endif /* ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0) */
 
 
 uint32_t xPortGetTickRateHz( void )