Skip to content

Commit c122158

Browse files
author
Martin Kojtal
committed
cmsis: preprocess irq files
We use preprocessor for asm files even for Armcc. If symbol is defined it's replaced by preprocessor, asembler would just see 1 or 0 in this case and errors: TARGET_M33\\irq_armv8mml.S", line 31: Error: A1185E: Symbol missing Use preprocessor instead.
1 parent c018771 commit c122158

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

3131
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3232
TCB_SP_OFS EQU 56 ; TCB.SP offset

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

3131
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3232
TCB_SP_OFS EQU 56 ; TCB.SP offset

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

31-
IF :LNOT::DEF:DOMAIN_NS
31+
#ifndef DOMAIN_NS
3232
DOMAIN_NS EQU 0
33-
ENDIF
33+
#endif
3434

3535
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3636
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

3131
IF ({FPU}="FPv4-SP")
3232
FPU_USED EQU 1

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

31-
IF :LNOT::DEF:DOMAIN_NS
31+
#ifndef DOMAIN_NS
3232
DOMAIN_NS EQU 0
33-
ENDIF
33+
#endif
3434

3535
IF ({FPU}="FPv5-SP") || ({FPU}="FPv5_D16")
3636
FPU_USED EQU 1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
; */
2525

2626

27-
IF :LNOT::DEF:RTX_STACK_CHECK
27+
#ifndef RTX_STACK_CHECK
2828
RTX_STACK_CHECK EQU 0
29-
ENDIF
29+
#endif
3030

3131
IF ({FPU}="FPv4-SP")
3232
FPU_USED EQU 1

0 commit comments

Comments
 (0)