提交 c7aa6f06 编写于 作者: mysterywolf's avatar mysterywolf

[fix bug] #3902

上级 aeff91b2
This folder is "common" for armlibc newlibc and dlib. It's not "common" for minilibc. # Attention :
\ No newline at end of file
1. This folder is "common" for armlibc newlibc and dlib. It's not "common" for minilibc.
2. If you want to add new .c files, please do not forget to fix SConscript file too. eg:
```python
if GetDepend('RT_USING_POSIX') == False:
SrcRemove(src, ['unistd.c'])
```
\ No newline at end of file
...@@ -66,7 +66,7 @@ typedef uintptr_t mem_ptr_t; ...@@ -66,7 +66,7 @@ typedef uintptr_t mem_ptr_t;
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */ #endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
#endif #endif
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__) #if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#include <sys/time.h> #include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0 #define LWIP_TIMEVAL_PRIVATE 0
#else #else
...@@ -78,10 +78,15 @@ typedef uintptr_t mem_ptr_t; ...@@ -78,10 +78,15 @@ typedef uintptr_t mem_ptr_t;
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__)) #define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ #elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
#define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__((packed))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
#define PACK_STRUCT_BEGIN #pragma pack(1)
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #pragma pack()
#define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_USE_INCLUDES #define PACK_STRUCT_USE_INCLUDES
#elif defined(__GNUC__) /* GNU GCC Compiler */ #elif defined(__GNUC__) /* GNU GCC Compiler */
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#define S32_F "ld" #define S32_F "ld"
#define X32_F "lx" #define X32_F "lx"
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__) #if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#include <sys/time.h> #include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0 #define LWIP_TIMEVAL_PRIVATE 0
#else #else
...@@ -57,10 +57,15 @@ ...@@ -57,10 +57,15 @@
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__)) #define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ #elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
#define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__((packed))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
#define PACK_STRUCT_BEGIN #pragma pack(1)
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #pragma pack()
#define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_USE_INCLUDES #define PACK_STRUCT_USE_INCLUDES
#elif defined(__GNUC__) /* GNU GCC Compiler */ #elif defined(__GNUC__) /* GNU GCC Compiler */
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */ #endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
#endif /* RT_USING_LIBC */ #endif /* RT_USING_LIBC */
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__) #if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#include <sys/time.h> #include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0 #define LWIP_TIMEVAL_PRIVATE 0
#else #else
...@@ -71,10 +71,15 @@ ...@@ -71,10 +71,15 @@
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__)) #define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ #elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
#define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__((packed))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #define PACK_STRUCT_END
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
#define PACK_STRUCT_BEGIN #pragma pack(1)
#define PACK_STRUCT_STRUCT
#define PACK_STRUCT_END #pragma pack()
#define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_USE_INCLUDES #define PACK_STRUCT_USE_INCLUDES
#elif defined(__GNUC__) /* GNU GCC Compiler */ #elif defined(__GNUC__) /* GNU GCC Compiler */
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <rtconfig.h> #include <rtconfig.h>
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ ) #if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
/* use errno.h file in toolchains */ /* use errno.h file in toolchains */
#include <errno.h> #include <errno.h>
#endif #endif
...@@ -45,7 +45,7 @@ defined in armcc/errno.h ...@@ -45,7 +45,7 @@ defined in armcc/errno.h
#define ERROR_BASE_NO 0 #define ERROR_BASE_NO 0
#endif #endif
#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !defined(__GNUC__ ) #if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !(defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#define EPERM (ERROR_BASE_NO + 1) #define EPERM (ERROR_BASE_NO + 1)
#define ENOENT (ERROR_BASE_NO + 2) #define ENOENT (ERROR_BASE_NO + 2)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef LIBC_FCNTL_H__ #ifndef LIBC_FCNTL_H__
#define LIBC_FCNTL_H__ #define LIBC_FCNTL_H__
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ ) #if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#include <fcntl.h> #include <fcntl.h>
#ifndef O_NONBLOCK #ifndef O_NONBLOCK
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <rtconfig.h> #include <rtconfig.h>
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ ) #if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#include <sys/types.h> #include <sys/types.h>
#if defined(HAVE_SYS_SELECT_H) #if defined(HAVE_SYS_SELECT_H)
#include <sys/select.h> #include <sys/select.h>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <rtconfig.h> #include <rtconfig.h>
#if defined(RT_USING_NEWLIB) || defined( __GNUC__ ) #if defined(RT_USING_NEWLIB) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
/* use header file of newlib */ /* use header file of newlib */
#include <sys/stat.h> #include <sys/stat.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册