Merge pull request #5635 from c1728p9/fix_lazy_init

0xc0170 · web-flow · commit bea41d1ebbfa · 2017-12-12T17:41:21.000Z
Protect local static object construction in ARMCC
diff --git a/TESTS/mbed_drivers/race_test/main.cpp b/TESTS/mbed_drivers/race_test/main.cpp
@@ -58,11 +58,13 @@ static SingletonPtr<TestClass> test_class;
 static void main_func_race()
 {
     get_test_class();
+    TEST_ASSERT_EQUAL_UINT32(1, instance_count);
 }
 
 static void main_class_race()
 {
     test_class->do_something();
+    TEST_ASSERT_EQUAL_UINT32(1, instance_count);
 }
 
 void test_case_func_race()
diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
@@ -977,6 +977,10 @@ extern "C" void __env_unlock( struct _reent *_r )
     __rtos_env_unlock(_r);
 }
 
+#endif
+
+#if defined (__GNUC__) || defined(__CC_ARM) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
+
 #define CXA_GUARD_INIT_DONE             (1 << 0)
 #define CXA_GUARD_INIT_IN_PROGRESS      (1 << 1)
 #define CXA_GUARD_MASK                  (CXA_GUARD_INIT_DONE | CXA_GUARD_INIT_IN_PROGRESS)

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,13 @@ static SingletonPtr<TestClass> test_class;`
`58`	`58`	`static void main_func_race()`
`59`	`59`	`{`
`60`	`60`	`get_test_class();`
	`61`	`+ TEST_ASSERT_EQUAL_UINT32(1, instance_count);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`static void main_class_race()`
`64`	`65`	`{`
`65`	`66`	`test_class->do_something();`
	`67`	`+ TEST_ASSERT_EQUAL_UINT32(1, instance_count);`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`void test_case_func_race()`