Merge pull request #2413 from liruncong/errorwarn

部分警告及问题修改

components/cplusplus/crt_init.c

@@ -13,10 +13,10 @@
 
 #include <rtthread.h>
 
-#ifdef __CC_ARM
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
 extern void $Super$$__cpp_initialize__aeabi_(void);
 /* we need to change the cpp_initialize order */
-void $Sub$$__cpp_initialize__aeabi_(void)
+RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void)
 {
     /* empty */
 }
@@ -34,19 +34,9 @@ RT_WEAK void *__dso_handle = 0;
 
 #endif
 
-RT_WEAK
-int cplusplus_system_init(void)
+RT_WEAK int cplusplus_system_init(void)
 {
-#if defined(__GNUC__) && !defined(__CC_ARM)
-    typedef void (*pfunc) ();
-    extern pfunc __ctors_start__[];
-    extern pfunc __ctors_end__[];
-    pfunc *p;
-
-    for (p = __ctors_start__; p < __ctors_end__; p++)
-        (*p)();
-
-#elif defined(__CC_ARM)
+#if defined(__CC_ARM) || defined(__CLANG_ARM)
     /* If there is no SHT$$INIT_ARRAY, calling
      * $Super$$__cpp_initialize__aeabi_() will cause fault. At least until Keil5.12
      * the problem still exists. So we have to initialize the C++ runtime by ourself.
@@ -63,9 +53,16 @@ int cplusplus_system_init(void)
         PROC *proc = (PROC*)((const char*)base + *base);
         (*proc)();
     }
+#elif defined(__GNUC__)
+    typedef void(*pfunc) ();
+    extern pfunc __ctors_start__[];
+    extern pfunc __ctors_end__[];
+    pfunc *p;
+
+    for (p = __ctors_start__; p < __ctors_end__; p++)
+        (*p)();
 #endif
 
     return 0;
 }
 INIT_COMPONENT_EXPORT(cplusplus_system_init);
-

components/libc/compilers/armlibc/SConscript

@@ -14,7 +14,7 @@ if GetDepend('RT_USING_DFS') == False:
 if GetDepend('RT_USING_MODULE') == False:
     SrcRemove(src, ['libc_syms.c'])
 
-if rtconfig.PLATFORM == 'armcc':
+if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang':
     group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 

components/libc/compilers/armlibc/stubs.c

@@ -251,7 +251,7 @@ void _ttywrch(int ch)
 #endif
 }
 
-void _sys_exit(int return_code)
+RT_WEAK void _sys_exit(int return_code)
 {
     /* TODO: perhaps exit the thread which is invoking this function */
     while (1);

components/net/lwip-1.4.1/src/include/netif/ethernetif.h

@@ -17,27 +17,35 @@
 
 struct eth_device
 {
-	/* inherit from rt_device */
-	struct rt_device parent;
+    /* inherit from rt_device */
+    struct rt_device parent;
 
-	/* network interface for lwip */
-	struct netif *netif;
-	struct rt_semaphore tx_ack;
+    /* network interface for lwip */
+    struct netif *netif;
+    struct rt_semaphore tx_ack;
 
-	rt_uint16_t flags;
-	rt_uint8_t  link_changed;
-	rt_uint8_t  link_status;
+    rt_uint16_t flags;
+    rt_uint8_t  link_changed;
+    rt_uint8_t  link_status;
 
-	/* eth device interface */
-	struct pbuf* (*eth_rx)(rt_device_t dev);
-	rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
+    /* eth device interface */
+    struct pbuf* (*eth_rx)(rt_device_t dev);
+    rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
 };
 
-rt_err_t eth_device_ready(struct eth_device* dev);
-rt_err_t eth_device_init(struct eth_device * dev, char *name);
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag);
-rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    rt_err_t eth_device_ready(struct eth_device* dev);
+    rt_err_t eth_device_init(struct eth_device * dev, const char *name);
+    rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
+    rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
 
-int eth_system_device_init(void);
+    int eth_system_device_init(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __NETIF_ETHERNETIF_H__ */

components/net/lwip-1.4.1/src/netif/ethernetif.c

@@ -177,7 +177,7 @@ static err_t eth_netif_device_init(struct netif *netif)
 }
 
 /* Keep old drivers compatible in RT-Thread */
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags)
+rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
 {
     struct netif* netif;
 
@@ -242,7 +242,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
     return RT_EOK;
 }
 
-rt_err_t eth_device_init(struct eth_device * dev, char *name)
+rt_err_t eth_device_init(struct eth_device * dev, const char *name)
 {
     rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;
 

components/net/lwip-2.0.2/src/include/netif/ethernetif.h

@@ -17,27 +17,35 @@
 
 struct eth_device
 {
-	/* inherit from rt_device */
-	struct rt_device parent;
+    /* inherit from rt_device */
+    struct rt_device parent;
 
-	/* network interface for lwip */
-	struct netif *netif;
-	struct rt_semaphore tx_ack;
+    /* network interface for lwip */
+    struct netif *netif;
+    struct rt_semaphore tx_ack;
 
-	rt_uint16_t flags;
-	rt_uint8_t  link_changed;
-	rt_uint8_t  link_status;
+    rt_uint16_t flags;
+    rt_uint8_t  link_changed;
+    rt_uint8_t  link_status;
 
-	/* eth device interface */
-	struct pbuf* (*eth_rx)(rt_device_t dev);
-	rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
+    /* eth device interface */
+    struct pbuf* (*eth_rx)(rt_device_t dev);
+    rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
 };
 
-rt_err_t eth_device_ready(struct eth_device* dev);
-rt_err_t eth_device_init(struct eth_device * dev, char *name);
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag);
-rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    rt_err_t eth_device_ready(struct eth_device* dev);
+    rt_err_t eth_device_init(struct eth_device * dev, const char *name);
+    rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
+    rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
 
-int eth_system_device_init(void);
+    int eth_system_device_init(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __NETIF_ETHERNETIF_H__ */

components/net/lwip-2.0.2/src/netif/ethernetif.c

@@ -205,7 +205,7 @@ static err_t eth_netif_device_init(struct netif *netif)
 }
 
 /* Keep old drivers compatible in RT-Thread */
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags)
+rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
 {
     struct netif* netif;
 
@@ -269,7 +269,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
     return RT_EOK;
 }
 
-rt_err_t eth_device_init(struct eth_device * dev, char *name)
+rt_err_t eth_device_init(struct eth_device * dev, const char *name)
 {
     rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;
 

components/net/lwip-2.1.0/src/include/netif/ethernetif.h

@@ -17,27 +17,35 @@
 
 struct eth_device
 {
-	/* inherit from rt_device */
-	struct rt_device parent;
+    /* inherit from rt_device */
+    struct rt_device parent;
 
-	/* network interface for lwip */
-	struct netif *netif;
-	struct rt_semaphore tx_ack;
+    /* network interface for lwip */
+    struct netif *netif;
+    struct rt_semaphore tx_ack;
 
-	rt_uint16_t flags;
-	rt_uint8_t  link_changed;
-	rt_uint8_t  link_status;
+    rt_uint16_t flags;
+    rt_uint8_t  link_changed;
+    rt_uint8_t  link_status;
 
-	/* eth device interface */
-	struct pbuf* (*eth_rx)(rt_device_t dev);
-	rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
+    /* eth device interface */
+    struct pbuf* (*eth_rx)(rt_device_t dev);
+    rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
 };
 
-rt_err_t eth_device_ready(struct eth_device* dev);
-rt_err_t eth_device_init(struct eth_device * dev, char *name);
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag);
-rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    rt_err_t eth_device_ready(struct eth_device* dev);
+    rt_err_t eth_device_init(struct eth_device * dev, const char *name);
+    rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
+    rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
 
-int eth_system_device_init(void);
+    int eth_system_device_init(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __NETIF_ETHERNETIF_H__ */

components/net/lwip-2.1.0/src/netif/ethernetif.c

@@ -210,7 +210,7 @@ static err_t eth_netif_device_init(struct netif *netif)
 }
 
 /* Keep old drivers compatible in RT-Thread */
-rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags)
+rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
 {
     struct netif* netif;
 
@@ -273,7 +273,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
     return RT_EOK;
 }
 
-rt_err_t eth_device_init(struct eth_device * dev, char *name)
+rt_err_t eth_device_init(struct eth_device * dev, const char *name)
 {
     rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;
 

src/slab.c

@@ -398,10 +398,10 @@ void rt_system_heap_init(void *begin_addr, void *end_addr)
  * Calculate the zone index for the allocation request size and set the
  * allocation request size to that particular zone's chunk size.
  */
-rt_inline int zoneindex(rt_uint32_t *bytes)
+rt_inline int zoneindex(rt_size_t *bytes)
 {
     /* unsigned for shift opt */
-    rt_uint32_t n = (rt_uint32_t) * bytes;
+    rt_uint32_t n = (rt_uint32_t)(*bytes);
 
     if (n < 128)
     {