From b228cd9db0b7ed79d99f1d9be15d512791f367cc Mon Sep 17 00:00:00 2001 From: Deepika Date: Tue, 8 Jan 2019 14:40:40 -0600 Subject: [PATCH 1/2] CMSIS/RTX: Update Armv8M IAR 8.x assembly files - add END Add missing END to the IAR assembly files. In future this commit should be merged to other assembly file commit, when performing CMSIS update. https://github.com/ARMmbed/mbed-os/commit/287121ffdc4c9c19f9ce8872e4edd941862daca1 --- .../RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S | 2 ++ .../RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S index ec38438d0c..3249a947a7 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S @@ -297,3 +297,5 @@ Sys_ContextRestore2 Sys_ContextExit BX LR ; Exit from handler + + END diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S index 629bfe93fb..755cde63d4 100644 --- a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S +++ b/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S @@ -270,3 +270,5 @@ Sys_ContextRestore2 Sys_ContextExit BX LR ; Exit from handler + + END From 09db6565e43ebf510042b884bcf16153aa2c9cdd Mon Sep 17 00:00:00 2001 From: Deepika Date: Tue, 8 Jan 2019 14:52:08 -0600 Subject: [PATCH 2/2] Added IAR assembly file update commit to cmsis importer In future when performing CMSIS update b228cd9db0b7ed79d99f1d9be15d512791f367cc commit can be merged to 287121ffdc4c9c19f9ce8872e4edd941862daca1 - CMSIS/RTX: Pre-processor defines used for assembly --- tools/importer/cmsis_importer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/importer/cmsis_importer.json b/tools/importer/cmsis_importer.json index 1882f0069a..0418913f64 100644 --- a/tools/importer/cmsis_importer.json +++ b/tools/importer/cmsis_importer.json @@ -148,6 +148,7 @@ "cc2e0517e1c6440abf88f2815b8e1501a55cdd4d", "b88254809eb626689c8aeb41304a308bf4e34a04", "287121ffdc4c9c19f9ce8872e4edd941862daca1", + "b228cd9db0b7ed79d99f1d9be15d512791f367cc", "1752803626865147dca92f30a39cef8d04581736", "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9" ]