RTX5: update projects for building libraries

- update projects for Arm, GCC and IAR libraries
- add library configuration file (RTX_Config.h)
- use renamed IRQ modules
- update MISRA configuration (project for Arm)

CMSIS/DoxyGen/RTOS2/src/cmsis_os2.txt

@@ -1620,7 +1620,7 @@ The CMSIS-RTOS2 RTX v5 implementation is using the following <b>Namespace</b> pr
 \page misraCompliance5 MISRA C:2012 Compliance 
 The RTX5 C source files use <b><a class=el href="http://www.misra.org.uk/" target="_blank">MISRA C:2012</a></b> guidelines as underlying coding standard.
 
-For MISRA validation, <b><a class=el href="http://www.gimpel.com/" target="_blank">PC-lint</a></b> V9.00L is used with configuration for Arm Compiler V6.9.
+For MISRA validation, <b><a class=el href="http://www.gimpel.com/" target="_blank">PC-lint</a></b> V9.00L is used with configuration for Arm Compiler V6.16.
 The PC-Lint validation setup is part of the project file <b>.\\CMSIS\\RTOS2\\RTX\\Library\\ARM\\MDK\\RTX_CM.uvprojx</b> as shown below. 
 Refer to <b><a class=el href="https://www.keil.com/support/man/docs/uv4/uv4_ut_pclint_validation.htm" target="_blank">Setup for PC-Lint</a></b> for more information.
 
@@ -1629,11 +1629,13 @@ Refer to <b><a class=el href="https://www.keil.com/support/man/docs/uv4/uv4_ut_p
 The PC-Lint configuration uses the following Options under <b>Tools - PC-Lint Setup...</b>:
  - Config File: co-ARMCC-6.lnt (20-Mar-2017) with additional options:
 \code
-   +rw(__restrict)
-   -esym(526,__builtin_*) -esym(628,__builtin_*)
-   -sem(__builtin_clz, pure)
-   +doffsetof(t,m)=((size_t)&((t*)0)->m) -emacro((413,923,9078),offsetof)
-   -ecall(534,__disable_irq)
+   -esym(526,__builtin_*)
+   -esym(628,__builtin_*)
+   -esym(718,__builtin_*)
+   -esym(746,__builtin_*)
+   -sem(__CLZ, pure)
+   +doffsetof(t,m)=((size_t)&((t*)0)->m)
+   -emacro((413,923,9078),offsetof)
 \endcode
  - Included Project Information: 
    - Enable: Add 'Include' paths
@@ -1646,7 +1648,7 @@ The PC-Lint configuration uses the following Options under <b>Tools - PC-Lint Se
    - includes definition file: au-misra3.lnt (12-Jun-2014)
  - Additional Lint Commands (for both single and multiple files):
 \code
-   - emacro(835,osRtxConfigPrivilegedMode)
+   -emacro(835,osRtxConfigPrivilegedMode)
 \endcode
 
 The C source code is annotated with PC-Lint control comments to allows MISRA deviations.
@@ -1842,7 +1844,7 @@ This design decision implies the following MISRA deviations:
 
 All locations in the source code are marked with: 
 \code
-  //lint -e(923) -e(9078) "cast from pointer to unsigned int" [MISRA Note 7]
+  //lint -e{923} -e{9078} "cast from pointer to unsigned int" [MISRA Note 7]
 \endcode
 
 Code example:
@@ -1852,7 +1854,7 @@ static osThreadId_t svcRtxThreadNew (osThreadFunc_t func, void *argument, const
   void         *stack_mem;
     :
   if (stack_mem != NULL) {
-    //lint -e(923) -e(9078) "cast from pointer to unsigned int" [MISRA Note 7]
+    //lint -e{923} "cast from pointer to unsigned int" [MISRA Note 7]
     if ((((uint32_t)stack_mem & 7U) != 0U) || (stack_size == 0U)) {
     :
 \endcode
@@ -1868,7 +1870,7 @@ This design decision implies the following MISRA deviations:
 
 All locations in the source code are marked with: 
 \code
-  //lint -e(923) -e(9078) "cast from pointer to unsigned int" [MISRA Note 8]
+  //lint -e{923} -e{9078} "cast from pointer to unsigned int" [MISRA Note 8]
 \endcode
 
 The required pointer arithmetic is implemented in \em rtx_memory.c with the following function:

CMSIS/RTOS2/RTX/Library/ARM/MDK/RTX_CM.uvoptx

@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -160,21 +160,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -326,21 +326,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -492,21 +492,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -663,21 +663,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -834,21 +834,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -1005,21 +1005,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -1176,21 +1176,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -1347,21 +1347,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -1518,21 +1518,21 @@
       <LntExFlags>63</LntExFlags>
       <pMisraName>.\Lint\MISRA_C_2012_Config.lnt</pMisraName>
       <pszMrule>MISRA_C_2012_Config</pszMrule>
-      <pSingCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pSingCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
 --uEVR_RTX_DISABLE
 </pSingCmds>
-      <pMultCmds>+rw(__restrict)
--esym(526,__builtin_*)
+      <pMultCmds>-esym(526,__builtin_*)
 -esym(628,__builtin_*)
--sem(__builtin_clz, pure)
--ecall(534,__disable_irq)
+-esym(718,__builtin_*)
+-esym(746,__builtin_*)
+-sem(__CLZ, pure)
 +doffsetof(t,m)=((size_t)&amp;((t*)0)-&gt;m)
 -emacro((413,923,9078),offsetof)
 -emacro(835,osRtxConfigPrivilegedMode)
@@ -1546,7 +1546,7 @@
   </Target>
 
   <Group>
-    <GroupName>Core</GroupName>
+    <GroupName>Configuration</GroupName>
     <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1554,6 +1554,26 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\RTX_Config.h</PathWithFileName>
+      <FilenameWithoutPath>RTX_Config.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Core</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1564,8 +1584,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1576,8 +1596,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>3</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1588,8 +1608,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1600,8 +1620,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1612,8 +1632,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1624,8 +1644,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1636,8 +1656,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1648,8 +1668,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1660,8 +1680,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1672,8 +1692,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1684,8 +1704,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1696,8 +1716,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1716,62 +1736,50 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\ARM\irq_cm0.s</PathWithFileName>
-      <FilenameWithoutPath>irq_cm0.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\ARM\irq_cm3.s</PathWithFileName>
-      <FilenameWithoutPath>irq_cm3.s</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv6m.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv6m.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\ARM\irq_cm4f.s</PathWithFileName>
-      <FilenameWithoutPath>irq_cm4f.s</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv7m.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv7m.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\ARM\irq_armv8mbl.s</PathWithFileName>
-      <FilenameWithoutPath>irq_armv8mbl.s</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv8mbl.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv8mbl.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\ARM\irq_armv8mml.s</PathWithFileName>
-      <FilenameWithoutPath>irq_armv8mml.s</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv8mml.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv8mml.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

CMSIS/RTOS2/RTX/Library/GCC/MDK/RTX_CM.uvoptx

@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -1384,7 +1384,7 @@
   </Target>
 
   <Group>
-    <GroupName>Core</GroupName>
+    <GroupName>Configuration</GroupName>
     <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1392,6 +1392,26 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\RTX_Config.h</PathWithFileName>
+      <FilenameWithoutPath>RTX_Config.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Core</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1402,8 +1422,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1414,8 +1434,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>3</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1426,8 +1446,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1438,8 +1458,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1450,8 +1470,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1462,8 +1482,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1474,8 +1494,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1486,8 +1506,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1498,8 +1518,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1510,8 +1530,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1522,8 +1542,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1534,8 +1554,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1554,43 +1574,31 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\GCC\irq_cm0.S</PathWithFileName>
-      <FilenameWithoutPath>irq_cm0.S</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>15</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\GCC\irq_cm3.S</PathWithFileName>
-      <FilenameWithoutPath>irq_cm3.S</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv6m.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv6m.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>16</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\Source\GCC\irq_cm4f.S</PathWithFileName>
-      <FilenameWithoutPath>irq_cm4f.S</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\Source\GCC\irq_armv7m.S</PathWithFileName>
+      <FilenameWithoutPath>irq_armv7m.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -1602,7 +1610,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>

CMSIS/RTOS2/RTX/Library/IAR/IDE/RTX_CM.ewp

@@ -66,7 +66,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -347,7 +347,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -622,7 +622,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -694,7 +695,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -1014,6 +1015,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -1108,7 +1125,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -1389,7 +1406,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -1664,7 +1681,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -1736,7 +1754,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -2056,6 +2074,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -2150,7 +2184,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -2431,7 +2465,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -2706,7 +2740,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -2778,7 +2813,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -3098,6 +3133,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -3192,7 +3243,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -3473,7 +3524,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -3748,7 +3799,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -3820,7 +3872,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -4140,6 +4192,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -4234,7 +4302,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -4516,7 +4584,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -4791,7 +4859,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -4863,7 +4932,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -5183,6 +5252,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -5277,7 +5362,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -5558,7 +5643,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -5833,7 +5918,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -5905,7 +5991,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -6225,6 +6311,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -6319,7 +6421,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -6601,7 +6703,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -6876,7 +6978,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -6948,7 +7051,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -7268,6 +7371,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -7362,7 +7481,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -7643,7 +7762,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -7918,7 +8037,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -7990,7 +8110,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -8310,6 +8430,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -8404,7 +8540,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.3.20186</state>
+                    <state>8.40.1.21529</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -8686,7 +8822,7 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$\..\..\..\Config</state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
                     <state>$PROJ_DIR$\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\Include</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Core\Include</state>
@@ -8961,7 +9097,8 @@
                 </option>
                 <option>
                     <name>AUserIncludes</name>
-                    <state></state>
+                    <state>$PROJ_DIR$\..\..\..\Library</state>
+                    <state>$PROJ_DIR$\..\..\..\Include</state>
                 </option>
                 <option>
                     <name>AExtraOptionsCheckV2</name>
@@ -9033,7 +9170,7 @@
             <name>ILINK</name>
             <archiveVersion>0</archiveVersion>
             <data>
-                <version>22</version>
+                <version>23</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>0</debug>
                 <option>
@@ -9353,6 +9490,22 @@
                     <name>OILinkExtraOption</name>
                     <state>1</state>
                 </option>
+                <option>
+                    <name>IlinkRawBinaryFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign2</name>
+                    <state></state>
+                </option>
             </data>
         </settings>
         <settings>
@@ -9427,25 +9580,12 @@
     <group>
         <name>Handlers</name>
         <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mbl.s</name>
+            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv6m.s</name>
             <excluded>
-                <configuration>CM0</configuration>
-                <configuration>CM3</configuration>
-                <configuration>CM4F</configuration>
-                <configuration>V8MBN</configuration>
-                <configuration>V8MM</configuration>
-                <configuration>V8MMN</configuration>
-                <configuration>V8MMF</configuration>
-                <configuration>V8MMFN</configuration>
-            </excluded>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mbl_ns.s</name>
-            <excluded>
-                <configuration>CM0</configuration>
                 <configuration>CM3</configuration>
                 <configuration>CM4F</configuration>
                 <configuration>V8MB</configuration>
+                <configuration>V8MBN</configuration>
                 <configuration>V8MM</configuration>
                 <configuration>V8MMN</configuration>
                 <configuration>V8MMF</configuration>
@@ -9453,34 +9593,9 @@
             </excluded>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mml.s</name>
+            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv7m.s</name>
             <excluded>
                 <configuration>CM0</configuration>
-                <configuration>CM3</configuration>
-                <configuration>CM4F</configuration>
-                <configuration>V8MB</configuration>
-                <configuration>V8MBN</configuration>
-                <configuration>V8MMN</configuration>
-                <configuration>V8MMFN</configuration>
-            </excluded>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mml_ns.s</name>
-            <excluded>
-                <configuration>CM0</configuration>
-                <configuration>CM3</configuration>
-                <configuration>CM4F</configuration>
-                <configuration>V8MB</configuration>
-                <configuration>V8MBN</configuration>
-                <configuration>V8MM</configuration>
-                <configuration>V8MMF</configuration>
-            </excluded>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_cm0.s</name>
-            <excluded>
-                <configuration>CM3</configuration>
-                <configuration>CM4F</configuration>
                 <configuration>V8MB</configuration>
                 <configuration>V8MBN</configuration>
                 <configuration>V8MM</configuration>
@@ -9490,12 +9605,11 @@
             </excluded>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_cm3.s</name>
+            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mbl.s</name>
             <excluded>
                 <configuration>CM0</configuration>
+                <configuration>CM3</configuration>
                 <configuration>CM4F</configuration>
-                <configuration>V8MB</configuration>
-                <configuration>V8MBN</configuration>
                 <configuration>V8MM</configuration>
                 <configuration>V8MMN</configuration>
                 <configuration>V8MMF</configuration>
@@ -9503,16 +9617,13 @@
             </excluded>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_cm4f.s</name>
+            <name>$PROJ_DIR$\..\..\..\Source\IAR\irq_armv8mml.s</name>
             <excluded>
                 <configuration>CM0</configuration>
                 <configuration>CM3</configuration>
+                <configuration>CM4F</configuration>
                 <configuration>V8MB</configuration>
                 <configuration>V8MBN</configuration>
-                <configuration>V8MM</configuration>
-                <configuration>V8MMN</configuration>
-                <configuration>V8MMF</configuration>
-                <configuration>V8MMFN</configuration>
             </excluded>
         </file>
     </group>

CMSIS/RTOS2/RTX/Library/RTX_Config.h

@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2013-2021 Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * -----------------------------------------------------------------------------
+ *
+ * $Revision:   V5.5.2
+ *
+ * Project:     CMSIS-RTOS RTX
+ * Title:       RTX Library Configuration definitions
+ *
+ * -----------------------------------------------------------------------------
+ */
+ 
+#ifndef RTX_CONFIG_H_
+#define RTX_CONFIG_H_
+ 
+//-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
+ 
+// <h>System Configuration
+// =======================
+ 
+//   <q>Object Memory usage counters
+//   <i> Enables object memory usage counters (requires RTX source variant).
+#ifndef OS_OBJ_MEM_USAGE
+#define OS_OBJ_MEM_USAGE            0
+#endif
+ 
+// </h>
+ 
+// <h>Thread Configuration
+// =======================
+ 
+//   <q>Stack overrun checking
+//   <i> Enables stack overrun check at thread switch (requires RTX source variant).
+//   <i> Enabling this option increases slightly the execution time of a thread switch.
+#ifndef OS_STACK_CHECK
+#define OS_STACK_CHECK              0
+#endif
+ 
+// </h>
+ 
+// <h>Event Recorder Configuration
+// ===============================
+ 
+//   <h>RTOS Event Generation
+//   <i> Enables event generation for RTX components (requires RTX source variant).
+ 
+//     <q>Memory Management
+//     <i> Enables Memory Management event generation.
+#ifndef OS_EVR_MEMORY
+#define OS_EVR_MEMORY               1
+#endif
+ 
+//     <q>Kernel
+//     <i> Enables Kernel event generation.
+#ifndef OS_EVR_KERNEL
+#define OS_EVR_KERNEL               1
+#endif
+ 
+//     <q>Thread
+//     <i> Enables Thread event generation.
+#ifndef OS_EVR_THREAD
+#define OS_EVR_THREAD               1
+#endif
+ 
+//     <q>Generic Wait
+//     <i> Enables Generic Wait event generation.
+#ifndef OS_EVR_WAIT
+#define OS_EVR_WAIT                 1
+#endif
+ 
+//     <q>Thread Flags
+//     <i> Enables Thread Flags event generation.
+#ifndef OS_EVR_THFLAGS
+#define OS_EVR_THFLAGS              1
+#endif
+ 
+//     <q>Event Flags
+//     <i> Enables Event Flags event generation.
+#ifndef OS_EVR_EVFLAGS
+#define OS_EVR_EVFLAGS              1
+#endif
+ 
+//     <q>Timer
+//     <i> Enables Timer event generation.
+#ifndef OS_EVR_TIMER
+#define OS_EVR_TIMER                1
+#endif
+ 
+//     <q>Mutex
+//     <i> Enables Mutex event generation.
+#ifndef OS_EVR_MUTEX
+#define OS_EVR_MUTEX                1
+#endif
+ 
+//     <q>Semaphore
+//     <i> Enables Semaphore event generation.
+#ifndef OS_EVR_SEMAPHORE
+#define OS_EVR_SEMAPHORE            1
+#endif
+ 
+//     <q>Memory Pool
+//     <i> Enables Memory Pool event generation.
+#ifndef OS_EVR_MEMPOOL
+#define OS_EVR_MEMPOOL              1
+#endif
+ 
+//     <q>Message Queue
+//     <i> Enables Message Queue event generation.
+#ifndef OS_EVR_MSGQUEUE
+#define OS_EVR_MSGQUEUE             1
+#endif
+ 
+//   </h>
+ 
+// </h>
+ 
+//------------- <<< end of configuration section >>> ---------------------------
+ 
+#endif  // RTX_CONFIG_H_