Skip to content

Commit 67b677d

Browse files
deepikabhavnanic1728p9
authored andcommitted
CMSIS/RTX: Pre-processor defines used for assembly
CMSIS repo does not support pre-processor defines, hence multiple assembly files are added for secure/non-secure and floating point tools. Mbed OS tools support assembly file pre-processing, but the build system does not support multiple assembly files for each target, hence updating the assembly files. (cherry picked from commit 287121f)
1 parent 4fd0daf commit 67b677d

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S

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

2626

27-
IF :LNOT::DEF:DOMAIN_NS
28-
DOMAIN_NS EQU 0
29-
ENDIF
27+
#ifndef DOMAIN_NS
28+
DOMAIN_NS EQU 0
29+
#endif
3030

3131
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3232
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S

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

2626

27-
IF :LNOT::DEF:DOMAIN_NS
28-
DOMAIN_NS EQU 0
29-
ENDIF
27+
#ifndef DOMAIN_NS
28+
DOMAIN_NS EQU 0
29+
#endif
3030

31-
IF ({FPU}="FPv5-SP") || ({FPU}="FPv5_D16")
32-
__FPU_USED EQU 1
33-
ELSE
31+
#ifndef __FPU_USED
3432
__FPU_USED EQU 0
35-
ENDIF
33+
#endif
3634

3735
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3836
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
.file "irq_armv8mbl.S"
2828
.syntax unified
2929

30-
.ifndef DOMAIN_NS
30+
#ifndef DOMAIN_NS
3131
.equ DOMAIN_NS, 0
32-
.endif
32+
#endif
3333

3434
.equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset
3535
.equ TCB_SM_OFS, 48 // TCB.stack_mem offset

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
.file "irq_armv8mml.S"
2828
.syntax unified
2929

30-
.ifndef DOMAIN_NS
30+
#ifndef DOMAIN_NS
3131
.equ DOMAIN_NS, 0
32-
.endif
32+
#endif
3333

34-
.ifndef __FPU_USED
34+
#ifndef __FPU_USED
3535
.equ __FPU_USED, 0
36-
.endif
36+
#endif
3737

3838
.equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset
3939
.equ TCB_SM_OFS, 48 // TCB.stack_mem offset

0 commit comments

Comments
 (0)