RTX5: reorganize Armv8-M IRQ modules for IAR
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index 6cce791..8ed1d9b 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -3317,17 +3317,17 @@
<file category="source" name="CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S" condition="ARMv8MML_GCC"/>
<file category="source" name="CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S" condition="ARMv8MML_FP_GCC"/>
<!-- RTX sources (IAR handlers) -->
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_ns.s" condition="CM23_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM33_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM33_FP_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM35P_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM35P_FP_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM55_NOFPU_NOMVE_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM55_NOFPU_MVE_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="CM55_FPU_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_ns.s" condition="ARMv8MBL_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="ARMv8MML_IAR"/>
- <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_ns.s" condition="ARMv8MML_FP_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl.s" condition="CM23_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM33_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM33_FP_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM35P_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM35P_FP_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM55_NOFPU_NOMVE_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM55_NOFPU_MVE_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="CM55_FPU_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl.s" condition="ARMv8MBL_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="ARMv8MML_IAR"/>
+ <file category="source" name="CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s" condition="ARMv8MML_FP_IAR"/>
<!-- OS Tick (SysTick) -->
<file category="source" name="CMSIS/RTOS2/Source/os_systick.c"/>
</files>
diff --git a/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s b/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl.s
similarity index 98%
rename from CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s
rename to CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl.s
index 74be540..0596dab 100644
--- a/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s
+++ b/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl.s
@@ -24,6 +24,11 @@
; */
+ NAME irq_armv8mbl.s
+
+
+ #include "rtx_def.h"
+
#ifndef DOMAIN_NS
#define DOMAIN_NS 0
#endif
@@ -205,3 +210,4 @@
B SVC_Context ; Branch to context handling
+ END
diff --git a/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s b/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s
similarity index 98%
rename from CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s
rename to CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s
index 6848a03..0f19b60 100644
--- a/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s
+++ b/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml.s
@@ -24,6 +24,11 @@
; */
+ NAME irq_armv8mml.s
+
+
+ #include "rtx_def.h"
+
#ifndef DOMAIN_NS
#define DOMAIN_NS 0
#endif
@@ -206,3 +211,4 @@
B SVC_Context ; Branch to context handling
+ END