Merge pull request #15016 from 0xc0170/fix-iar-cmsis-update

Fix IAR cmsis update breakage
ARMmbed · Aug 24, 2021 · f6e165f · f6e165f
2 parents faf8737 + 19f2138
commit f6e165f
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 7 deletions.
diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
@@ -27,7 +27,6 @@
                 NAME     irq_armv6m.s
 
 
-                #include "rtx_def.h"
 
 I_T_RUN_OFS     EQU      20                     ; osRtxInfo.thread.run offset
 TCB_SP_OFS      EQU      56                     ; TCB.SP offset

diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
@@ -27,7 +27,6 @@
                 NAME     irq_armv6m.s
 
 
-                #include "rtx_def.h"
 
 I_T_RUN_OFS     EQU      20                     ; osRtxInfo.thread.run offset
 TCB_SP_OFS      EQU      56                     ; TCB.SP offset

diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
@@ -27,7 +27,6 @@
                 NAME     irq_armv8mbl.s
 
 
-                #include "rtx_def.h"
 
 #ifndef DOMAIN_NS
 #define DOMAIN_NS        0

diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
@@ -27,7 +27,6 @@
                 NAME     irq_armv7m.s
 
 
-                #include "rtx_def.h"
 
 #ifdef __ARMVFP__
 FPU_USED        EQU      1

diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
@@ -27,7 +27,6 @@
                 NAME     irq_armv8mml.s
 
 
-                #include "rtx_def.h"
 
 #ifndef DOMAIN_NS
 #define DOMAIN_NS        0

diff --git a/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S b/cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
@@ -27,7 +27,7 @@
                 NAME     irq_armv7m.s
 
 
-                #include "rtx_def.h"
+
 
 #ifdef __ARMVFP__
 FPU_USED        EQU      1

diff --git a/tools/importer/cmsis_importer.json b/tools/importer/cmsis_importer.json
@@ -148,7 +148,8 @@
       "fb354752eb69403ad503c8e53da67da6483776d6",
       "08ab8cc47d8722bf0c767990cd615cf1c427d006",
       "00580ce3f5d64b76342b7f26deed55e842056ea0",
-      "c122158d496d59fbd723bdb17bbc7bd5cc95245e"
+      "c122158d496d59fbd723bdb17bbc7bd5cc95245e",
+      "43a86f30450f8e9cec366434f6f752430847b4cf"
     ]
 }