From 306fd2947c9b046f3dfdc54466a9723f58516f7c Mon Sep 17 00:00:00 2001 From: Martin Kojtal <0xc0170@gmail.com> Date: Wed, 21 Jun 2017 15:29:55 +0100 Subject: [PATCH] cmain IAR: add mbed main This fixes #4602 issue, mbed_main should be invoked right before the real main --- cmsis/TOOLCHAIN_IAR/cmain.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmsis/TOOLCHAIN_IAR/cmain.S b/cmsis/TOOLCHAIN_IAR/cmain.S index 15a12119cd..0da55009b3 100644 --- a/cmsis/TOOLCHAIN_IAR/cmain.S +++ b/cmsis/TOOLCHAIN_IAR/cmain.S @@ -46,6 +46,7 @@ EXTERN exit EXTERN __iar_dynamic_initialization EXTERN mbed_sdk_init + EXTERN mbed_main EXTERN SystemInit THUMB @@ -87,6 +88,10 @@ _call_main: FUNCALL __cmain, __iar_argc_argv BL __iar_argc_argv ; Maybe setup command line + MOVS r0,#0 ; No parameters + FUNCALL __cmain, mbed_main + BL mbed_main + FUNCALL __cmain, main BL main _main: