From 3e181422d8f9fe40dc3152b72b79075cc90b4db3 Mon Sep 17 00:00:00 2001 From: deepikabhavnani Date: Tue, 6 Feb 2018 21:52:19 -0600 Subject: [PATCH] RTX5: 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. --- .../RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S | 4 ++-- .../Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl_ns.S | 3 --- .../RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S | 10 ++++------ .../Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml_ns.S | 3 --- .../RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S | 4 ++-- .../Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl_ns.S | 3 --- .../RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S | 8 ++++---- .../Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp.S | 3 --- .../TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp_ns.S | 4 ---- .../Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_ns.S | 3 --- .../RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl.S | 5 ----- .../Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_ns.S | 5 ----- .../RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml.S | 5 ----- .../Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_ns.S | 5 ----- 14 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_ns.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml.S delete mode 100644 rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_ns.S diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S index 1586a95549..33cf9a0b58 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S @@ -24,9 +24,9 @@ ; */ - IF :LNOT::DEF:__DOMAIN_NS +#ifndef __DOMAIN_NS __DOMAIN_NS EQU 0 - ENDIF +#endif I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset TCB_SM_OFS EQU 48 ; TCB.stack_mem offset diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl_ns.S deleted file mode 100644 index 10d3170921..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl_ns.S +++ /dev/null @@ -1,3 +0,0 @@ -__DOMAIN_NS EQU 1 - INCLUDE irq_armv8mbl.s - END diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S index b8b25a1a32..20a5705449 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S @@ -24,15 +24,13 @@ ; */ - IF :LNOT::DEF:__DOMAIN_NS +#ifndef __DOMAIN_NS __DOMAIN_NS EQU 0 - ENDIF +#endif - IF ({FPU}="FPv5-SP") || ({FPU}="FPv5_D16") -__FPU_USED EQU 1 - ELSE +#ifndef __FPU_USED __FPU_USED EQU 0 - ENDIF +#endif I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset TCB_SM_OFS EQU 48 ; TCB.stack_mem offset diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml_ns.S deleted file mode 100644 index b868bab6a3..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml_ns.S +++ /dev/null @@ -1,3 +0,0 @@ -__DOMAIN_NS EQU 1 - INCLUDE irq_armv8mml.s - END diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S index 497e5c917f..5c4e7f9871 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S @@ -27,9 +27,9 @@ .file "irq_armv8mbl.S" .syntax unified - .ifndef __DOMAIN_NS +#ifndef __DOMAIN_NS .equ __DOMAIN_NS, 0 - .endif +#endif .equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset .equ TCB_SM_OFS, 48 // TCB.stack_mem offset diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl_ns.S deleted file mode 100644 index b8bd9c4a49..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl_ns.S +++ /dev/null @@ -1,3 +0,0 @@ - .equ __DOMAIN_NS, 1 - .include "../Source/GCC/irq_armv8mbl.S" - .end diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S index 3248b9eb3b..12062b6e19 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S @@ -27,13 +27,13 @@ .file "irq_armv8mml.S" .syntax unified - .ifndef __DOMAIN_NS ++#ifndef __DOMAIN_NS .equ __DOMAIN_NS, 0 - .endif +#endif - .ifndef __FPU_USED +#ifndef __FPU_USED .equ __FPU_USED, 0 - .endif +#endif .equ I_T_RUN_OFS, 20 // osRtxInfo.thread.run offset .equ TCB_SM_OFS, 48 // TCB.stack_mem offset diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp.S deleted file mode 100644 index 4e78031ed4..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp.S +++ /dev/null @@ -1,3 +0,0 @@ - .equ __FPU_USED, 1 - .include "../Source/GCC/irq_armv8mml.S" - .end diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp_ns.S deleted file mode 100644 index 3f7c724332..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_fp_ns.S +++ /dev/null @@ -1,4 +0,0 @@ - .equ __FPU_USED, 1 - .equ __DOMAIN_NS, 1 - .include "../Source/GCC/irq_armv8mml.S" - .end diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_ns.S deleted file mode 100644 index fdd030e647..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml_ns.S +++ /dev/null @@ -1,3 +0,0 @@ - .equ __DOMAIN_NS, 1 - .include "../Source/GCC/irq_armv8mml.S" - .end diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl.S deleted file mode 100644 index 3b4e9f3652..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl.S +++ /dev/null @@ -1,5 +0,0 @@ - NAME irq_armv8mbl.s -#define __DOMAIN_NS 0 - INCLUDE irq_armv8mbl_common.s - - END diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_ns.S deleted file mode 100644 index 7ee9d0465d..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_ns.S +++ /dev/null @@ -1,5 +0,0 @@ - NAME irq_armv8mbl_ns.s -#define __DOMAIN_NS 1 - INCLUDE irq_armv8mbl_common.s - - END diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml.S deleted file mode 100644 index 8a8bd8a0f1..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml.S +++ /dev/null @@ -1,5 +0,0 @@ - NAME irq_armv8mml.s -#define __DOMAIN_NS 0 - INCLUDE irq_armv8mml_common.s - END - diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_ns.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_ns.S deleted file mode 100644 index 827abb4920..0000000000 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_ns.S +++ /dev/null @@ -1,5 +0,0 @@ - NAME irq_armv8mml_ns.s -#define __DOMAIN_NS 1 - INCLUDE irq_armv8mml_common.s - END -