Skip to content

Commit

Permalink
cmsis: patch rtx_def because of our deps
Browse files Browse the repository at this point in the history
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:
7149ffe

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.
  • Loading branch information
0xc0170 committed Jul 9, 2021
1 parent 551bceb commit 89d9642
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/rtx_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 89d9642

Please sign in to comment.