Merge pull request #2361 from ARMmbed/sync_with_mbedos

Sync with Mbed OS

Author: Arto Kinnunen

mbed_lib.json

@@ -9,12 +9,6 @@
     },
     "macros": ["NS_USE_EXTERNAL_MBED_TLS"],
     "target_overrides": {
-        "KW24D": {
-            "nanostack.configuration": "lowpan_router"
-        },
-        "NCS36510": {
-            "nanostack.configuration": "lowpan_router"
-        },
         "TB_SENSE_12": {
             "nanostack.configuration": "lowpan_router"
         },

source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h

@@ -94,10 +94,6 @@
     #elif defined(__clang__)
         #define FNET_CFG_COMP_CLANG (1)
         #define FNET_COMP_STR       "CLANG"
-        /* Keil uVision compiler using armcc. */
-    #elif defined(__CC_ARM)
-        #define FNET_CFG_COMP_UV    (1)
-        #define FNET_COMP_STR       "UV"
         /* GNU GCC */
     #elif defined(__GNUC__)
         #define FNET_CFG_COMP_GNUC  (1)

source/nsconfig.h

@@ -24,10 +24,6 @@
 
 #include "ns_types.h"
 
-#ifdef __CC_ARM
-#pragma diag_suppress 546 // transfer of control bypasses initialization
-#endif
-
 #define __ns_cfg_header(x) #x
 #define _ns_cfg_header(x) __ns_cfg_header(configs/cfg_##x.h)
 #define ns_cfg_header(x) _ns_cfg_header(x)