From 89d9642f9ff97232ed467262123dde3dc0f2a94b Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Fri, 9 Jul 2021 15:42:57 +0100 Subject: [PATCH] cmsis: patch rtx_def because of our deps rtx_def.h is included in assembly files. As it pulls in the RTE components headers, this is causing lot of assembly errros coming from C/C++ headers. Similar to our previous patch for older CMSIS versions: 7149ffed11c0ef6a16f8808f12b7aca16921a66a We will review how RTE_Components are used and this is valid, I haven't found any docs mentioning it should be valid for assembly files. --- cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h index a7076a4e46fc..fb468730d220 100644 --- a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h +++ b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h @@ -14,9 +14,11 @@ #ifndef RTX_DEF_H_ #define RTX_DEF_H_ -#ifdef _RTE_ -#include "RTE_Components.h" -#endif +// Mbed OS - this is intentionally commented out due to C/C++ headers being pulled it +// This header is included in assembly files +//#ifdef _RTE_ +//#include "RTE_Components.h" +//#endif #include "RTX_Config.h" #if (defined(OS_OBJ_MEM_USAGE) && (OS_OBJ_MEM_USAGE != 0))