cmsis: fix armcc compat header redefition of enable/disable irq

Martin Kojtal · Martin Kojtal · commit dca1d5c42e45 · 2021-07-29T14:31:39.000+01:00
The fix will be in the 5.8.1 CMSIS, we cherry-pick it to our imported version. See ARM-software/CMSIS_5@e797cca
diff --git a/cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Include/cmsis_armclang.h b/cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Include/cmsis_armclang.h
@@ -373,20 +373,24 @@ __STATIC_FORCEINLINE int32_t __SMMLA (int32_t op1, int32_t op2, int32_t op3)
   \details Enables IRQ interrupts by clearing the I-bit in the CPSR.
            Can only be executed in Privileged modes.
  */
+#ifndef __ARM_COMPAT_H
 __STATIC_FORCEINLINE void __enable_irq(void)
 {
   __ASM volatile ("cpsie i" : : : "memory");
 }
+#endif
 
 /**
   \brief   Disable IRQ Interrupts
   \details Disables IRQ interrupts by setting the I-bit in the CPSR.
   Can only be executed in Privileged modes.
  */
+#ifndef __ARM_COMPAT_H
 __STATIC_FORCEINLINE void __disable_irq(void)
 {
   __ASM volatile ("cpsid i" : : : "memory");
 }
+#endif
 
 /**
   \brief   Enable FIQ

Original file line number	Diff line number	Diff line change
`@@ -373,20 +373,24 @@ __STATIC_FORCEINLINE int32_t __SMMLA (int32_t op1, int32_t op2, int32_t op3)`
`373`	`373`	`\details Enables IRQ interrupts by clearing the I-bit in the CPSR.`
`374`	`374`	`Can only be executed in Privileged modes.`
`375`	`375`	`*/`
	`376`	`+#ifndef __ARM_COMPAT_H`
`376`	`377`	`__STATIC_FORCEINLINE void __enable_irq(void)`
`377`	`378`	`{`
`378`	`379`	`__ASM volatile ("cpsie i" : : : "memory");`
`379`	`380`	`}`
	`381`	`+#endif`
`380`	`382`
`381`	`383`	`/**`
`382`	`384`	`\brief Disable IRQ Interrupts`
`383`	`385`	`\details Disables IRQ interrupts by setting the I-bit in the CPSR.`
`384`	`386`	`Can only be executed in Privileged modes.`
`385`	`387`	`*/`
	`388`	`+#ifndef __ARM_COMPAT_H`
`386`	`389`	`__STATIC_FORCEINLINE void __disable_irq(void)`
`387`	`390`	`{`
`388`	`391`	`__ASM volatile ("cpsid i" : : : "memory");`
`389`	`392`	`}`
	`393`	`+#endif`
`390`	`394`
`391`	`395`	`/**`
`392`	`396`	`\brief Enable FIQ`