File tree Expand file tree Collapse file tree 2 files changed +17
-13
lines changed
fsp/src/bsp/cmsis/Device/RENESAS/Include Expand file tree Collapse file tree 2 files changed +17
-13
lines changed Original file line number Diff line number Diff line change @@ -54,3 +54,7 @@ Patch List:
54
54
* Allows custom implementation of option setting memory
55
55
Impacted files:
56
56
drivers/ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c
57
+
58
+ * Move the include for cmsis_compiler.h after include for Renesas CMSIS header file
59
+ Impacted files:
60
+ drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h
Original file line number Diff line number Diff line change 25
25
extern "C" {
26
26
#endif
27
27
28
- /* Workaround for LLVM. __ARM_ARCH_8_1M_MAIN__ is defined for CM85 parts. But CMSIS_5 does not support this */
29
- #if defined(__llvm__ ) && !defined(__CLANG_TIDY__ ) && defined(__ARM_ARCH_8_1M_MAIN__ )
30
- #undef __ARM_ARCH_8_1M_MAIN__
31
- #define __ARM_ARCH_8M_MAIN__ 1
32
- #endif
33
- #include "cmsis_compiler.h"
34
-
35
- /* Workaround for compilers that are not defining __ARM_ARCH_8_1M_MAIN__ for CM85 parts. Search CM85_WORKAROUND for related code changes */
36
- #if BSP_CFG_MCU_PART_SERIES == 8
37
- #undef __ARM_ARCH_8M_MAIN__
38
- #define __ARM_ARCH_8_1M_MAIN__ 1
39
- #endif
40
-
41
28
/** @addtogroup Configuration_of_CMSIS
42
29
* @{
43
30
*/
@@ -115,6 +102,19 @@ extern "C" {
115
102
#endif
116
103
#endif
117
104
105
+ /* Workaround for LLVM. __ARM_ARCH_8_1M_MAIN__ is defined for CM85 parts. But CMSIS_5 does not support this */
106
+ #if defined(__llvm__ ) && !defined(__CLANG_TIDY__ ) && defined(__ARM_ARCH_8_1M_MAIN__ )
107
+ #undef __ARM_ARCH_8_1M_MAIN__
108
+ #define __ARM_ARCH_8M_MAIN__ 1
109
+ #endif
110
+ #include "cmsis_compiler.h"
111
+
112
+ /* Workaround for compilers that are not defining __ARM_ARCH_8_1M_MAIN__ for CM85 parts. Search CM85_WORKAROUND for related code changes */
113
+ #if BSP_CFG_MCU_PART_SERIES == 8
114
+ #undef __ARM_ARCH_8M_MAIN__
115
+ #define __ARM_ARCH_8_1M_MAIN__ 1
116
+ #endif
117
+
118
118
#if __ARM_ARCH_7EM__
119
119
#define RENESAS_CORTEX_M4
120
120
#elif __ARM_ARCH_6M__
You can’t perform that action at this time.
0 commit comments