From 3c6185788fe60e2d24f4bb09584b8f52ded83fa7 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Tue, 7 Jun 2022 16:33:22 +0800 Subject: [PATCH] freertos: Fix GCC 11 SMP FreeRTOS build errors This commit fixes the following build errors in SMP FreeRTOS when building with GCC 11: - "-Wattributes" warning due to conflicting attributes on xPortInterruptedFromISRContext() - "-Wtype-limits" warning due to taskVALID_CORE_ID() not casting xCoreID --- components/freertos/FreeRTOS-Kernel-SMP/include/freertos/task.h | 2 +- .../portable/xtensa/include/freertos/portmacro.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/freertos/FreeRTOS-Kernel-SMP/include/freertos/task.h b/components/freertos/FreeRTOS-Kernel-SMP/include/freertos/task.h index eac25381ed..2e36eb17b0 100644 --- a/components/freertos/FreeRTOS-Kernel-SMP/include/freertos/task.h +++ b/components/freertos/FreeRTOS-Kernel-SMP/include/freertos/task.h @@ -271,7 +271,7 @@ typedef enum #define taskSCHEDULER_RUNNING ( ( BaseType_t ) 2 ) /* Check if core value is valid */ -#define taskVALID_CORE_ID( xCoreID ) ( ( BaseType_t ) ( ( 0 <= xCoreID ) && ( xCoreID < configNUM_CORES ) ) ) +#define taskVALID_CORE_ID( xCoreID ) ( ( BaseType_t ) ( ( 0 <= (BaseType_t) xCoreID ) && ( (BaseType_t) xCoreID < configNUM_CORES ) ) ) /*----------------------------------------------------------- * TASK CREATION API diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h index 5c1cd214a1..4230dbea49 100644 --- a/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h +++ b/components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/portmacro.h @@ -267,7 +267,7 @@ static inline BaseType_t xPortInIsrContext(void) return xPortCheckIfInISR(); } -BaseType_t IRAM_ATTR xPortInterruptedFromISRContext(void); +BaseType_t xPortInterruptedFromISRContext(void); static inline UBaseType_t xPortSetInterruptMaskFromISR(void) {