Merge pull request #8887 from deepikabhavnani/uVision_fix

Adding debugger awarness with Keil MDK

rtos/TARGET_CORTEX/mbed_rtos_rtx.c

@@ -51,7 +51,7 @@ osThreadAttr_t _main_thread_attr;
 #define MBED_CONF_APP_MAIN_STACK_SIZE MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE
 #endif
 MBED_ALIGN(8) char _main_stack[MBED_CONF_APP_MAIN_STACK_SIZE];
-mbed_rtos_storage_thread_t _main_obj;
+mbed_rtos_storage_thread_t _main_obj __attribute__((section(".bss.os.thread.cb")));
 
 osMutexId_t               singleton_mutex_id;
 mbed_rtos_storage_mutex_t singleton_mutex_obj;

rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c

@@ -122,9 +122,12 @@ static osRtxThread_t os_idle_thread_cb \
 __attribute__((section(".bss.os.thread.cb")));
 
 // Idle Thread Stack
+#if defined (__CC_ARM)
+static uint64_t os_idle_thread_stack[OS_IDLE_THREAD_STACK_SIZE/8];
+#else
 static uint64_t os_idle_thread_stack[OS_IDLE_THREAD_STACK_SIZE/8] \
 __attribute__((section(".bss.os.thread.stack")));
-
+#endif
 // Idle Thread Attributes
 static const osThreadAttr_t os_idle_thread_attr = {
 #if defined(OS_IDLE_THREAD_NAME)
@@ -178,9 +181,13 @@ __attribute__((section(".data.os.timer.mpi"))) =
 static osRtxThread_t os_timer_thread_cb \
 __attribute__((section(".bss.os.thread.cb")));
 
+#if defined (__CC_ARM)
+static uint64_t os_timer_thread_stack[OS_TIMER_THREAD_STACK_SIZE/8];
+#else
 // Timer Thread Stack
 static uint64_t os_timer_thread_stack[OS_TIMER_THREAD_STACK_SIZE/8] \
 __attribute__((section(".bss.os.thread.stack")));
+#endif
 
 // Timer Thread Attributes
 static const osThreadAttr_t os_timer_thread_attr = {

tools/importer/cmsis_importer.json

@@ -152,7 +152,8 @@
       "1752803626865147dca92f30a39cef8d04581736",
       "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
       "fb354752eb69403ad503c8e53da67da6483776d6",
-      "d3f7abdb7c109517e6a71daed8bae63ad6436afc"
+      "d3f7abdb7c109517e6a71daed8bae63ad6436afc",
+      "ba92372b8d754cf65917a560cd27e4088548de0e"
     ]
 }
 

tools/profiles/debug.json

@@ -24,7 +24,7 @@
         "asm": [],
         "c": ["-D__ASSERT_MSG", "-std=gnu99"],
         "cxx": ["-fno-rtti", "-std=gnu++98"],
-        "ld": ["--verbose", "--remove", "--show_full_path", "--legacyalign"]
+        "ld": ["--verbose", "--remove", "--show_full_path", "--legacyalign", "--keep=os_cb_sections"]
     },
     "ARM": {
         "common": ["-c", "--gnu", "-Otime", "--split_sections",
@@ -34,7 +34,7 @@
         "asm": [],
         "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
         "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
+        "ld": ["--show_full_path", "--keep=os_cb_sections"]
     },
     "uARM": {
         "common": ["-c", "--gnu", "-Otime", "--split_sections",

tools/profiles/develop.json

@@ -23,7 +23,7 @@
         "asm": [],
         "c": ["-D__ASSERT_MSG", "-std=gnu99"],
         "cxx": ["-fno-rtti", "-std=gnu++98"],
-        "ld": ["--show_full_path", "--legacyalign"]
+        "ld": ["--show_full_path", "--legacyalign", "--keep=os_cb_sections"]
     },
     "ARM": {
         "common": ["-c", "--gnu", "-Otime", "--split_sections",
@@ -32,7 +32,7 @@
         "asm": [],
         "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
         "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
+        "ld": ["--show_full_path", "--keep=os_cb_sections"]
     },
     "uARM": {
         "common": ["-c", "--gnu", "-Otime", "--split_sections",

tools/profiles/release.json

@@ -23,7 +23,7 @@
         "asm": [],
         "c": ["-D__ASSERT_MSG", "-std=gnu99"],
         "cxx": ["-fno-rtti", "-std=gnu++98"],
-        "ld": ["--show_full_path", "--legacyalign"]
+        "ld": ["--show_full_path", "--legacyalign", "--keep=os_cb_sections"]
     },
     "ARM": {
         "common": ["-c", "--gnu", "-Ospace", "--split_sections",
@@ -32,7 +32,7 @@
         "asm": [],
         "c": ["--md", "--no_depend_system_headers", "--c99", "-D__ASSERT_MSG"],
         "cxx": ["--cpp", "--no_rtti", "--no_vla"],
-        "ld": ["--show_full_path"]
+        "ld": ["--show_full_path",  "--keep=os_cb_sections"]
     },
     "uARM": {
         "common": ["-c", "--gnu", "-Ospace", "--split_sections",