Merge pull request #10020 from TacoGrandeTX/fix_iar_single_threaded

0xc0170 · web-flow · commit 43cbc106160f · 2019-04-08T10:38:42.000+02:00
Fix single-threaded apps for IAR v8 builds
diff --git a/rtos/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c b/rtos/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c
@@ -87,7 +87,7 @@ void __iar_program_start(void)
 
 void mbed_toolchain_init(void)
 {
-#if defined(__IAR_SYSTEMS_ICC__ ) && (__VER__ >= 8000000)
+#if defined(__IAR_SYSTEMS_ICC__ ) && (__VER__ >= 8000000) && !defined(MBED_RTOS_SINGLE_THREAD)
     __iar_Initlocks();
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void __iar_program_start(void)`
`87`	`87`
`88`	`88`	`void mbed_toolchain_init(void)`
`89`	`89`	`{`
`90`		`-#if defined(__IAR_SYSTEMS_ICC__ ) && (__VER__ >= 8000000)`
	`90`	`+#if defined(__IAR_SYSTEMS_ICC__ ) && (__VER__ >= 8000000) && !defined(MBED_RTOS_SINGLE_THREAD)`
`91`	`91`	`__iar_Initlocks();`
`92`	`92`	`#endif`
`93`	`93`