Merge pull request #4604 from 0xc0170/fix_4602

cmain IAR: add mbed main
2017-06-26 10:30:39 -05:00 · 2017-06-26 10:30:39 -05:00 · c9647e0e00
parent e57296d5b9 857ec23db8
commit c9647e0e00
1 changed files with 5 additions and 0 deletions
--- 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: