Skip to content

Commit f6e165f

Browse files
authored
Merge pull request #15016 from 0xc0170/fix-iar-cmsis-update
Fix IAR cmsis update breakage
2 parents faf8737 + 19f2138 commit f6e165f

File tree

7 files changed

+3
-7
lines changed

7 files changed

+3
-7
lines changed

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
NAME irq_armv6m.s
2828

2929

30-
#include "rtx_def.h"
3130

3231
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3332
TCB_SP_OFS EQU 56 ; TCB.SP offset

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
NAME irq_armv6m.s
2828

2929

30-
#include "rtx_def.h"
3130

3231
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3332
TCB_SP_OFS EQU 56 ; TCB.SP offset

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
NAME irq_armv8mbl.s
2828

2929

30-
#include "rtx_def.h"
3130

3231
#ifndef DOMAIN_NS
3332
#define DOMAIN_NS 0

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
NAME irq_armv7m.s
2828

2929

30-
#include "rtx_def.h"
3130

3231
#ifdef __ARMVFP__
3332
FPU_USED EQU 1

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
NAME irq_armv8mml.s
2828

2929

30-
#include "rtx_def.h"
3130

3231
#ifndef DOMAIN_NS
3332
#define DOMAIN_NS 0

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
NAME irq_armv7m.s
2828

2929

30-
#include "rtx_def.h"
30+
3131

3232
#ifdef __ARMVFP__
3333
FPU_USED EQU 1

tools/importer/cmsis_importer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@
148148
"fb354752eb69403ad503c8e53da67da6483776d6",
149149
"08ab8cc47d8722bf0c767990cd615cf1c427d006",
150150
"00580ce3f5d64b76342b7f26deed55e842056ea0",
151-
"c122158d496d59fbd723bdb17bbc7bd5cc95245e"
151+
"c122158d496d59fbd723bdb17bbc7bd5cc95245e",
152+
"43a86f30450f8e9cec366434f6f752430847b4cf"
152153
]
153154
}
154155

0 commit comments

Comments
 (0)