Skip to content

Commit c7aa6f0

Browse files
mysterywolfmysterywolf
committed
[fix bug] #3902 
1 parent aeff91b commit c7aa6f0

File tree

8 files changed

+39
-15
lines changed

8 files changed

+39
-15
lines changed

‎components/libc/compilers/common/readme.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
This folder is "common" for armlibc newlibc and dlib. It's not "common" for minilibc.
1+
# Attention :
2+
3+
1. This folder is "common" for armlibc newlibc and dlib. It's not "common" for minilibc.
4+
5+
2. If you want to add new .c files, please do not forget to fix SConscript file too. eg:
6+
7+
```python
8+
if GetDepend('RT_USING_POSIX') == False:
9+
SrcRemove(src, ['unistd.c'])
10+
```

‎components/net/lwip-1.4.1/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ typedef uintptr_t mem_ptr_t;
6666
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
6767
#endif
6868

69-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__)
69+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
7070
#include <sys/time.h>
7171
#define LWIP_TIMEVAL_PRIVATE 0
7272
#else
@@ -78,10 +78,15 @@ typedef uintptr_t mem_ptr_t;
7878
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
7979
#define PACK_STRUCT_BEGIN
8080
#define PACK_STRUCT_END
81-
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
81+
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
82+
#define PACK_STRUCT_FIELD(x) x
83+
#define PACK_STRUCT_STRUCT __attribute__((packed))
8284
#define PACK_STRUCT_BEGIN
83-
#define PACK_STRUCT_STRUCT
8485
#define PACK_STRUCT_END
86+
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
87+
#define PACK_STRUCT_BEGIN #pragma pack(1)
88+
#define PACK_STRUCT_STRUCT
89+
#define PACK_STRUCT_END #pragma pack()
8590
#define PACK_STRUCT_FIELD(x) x
8691
#define PACK_STRUCT_USE_INCLUDES
8792
#elif defined(__GNUC__) /* GNU GCC Compiler */

‎components/net/lwip-2.0.2/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define S32_F "ld"
4646
#define X32_F "lx"
4747

48-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__)
48+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
4949
#include <sys/time.h>
5050
#define LWIP_TIMEVAL_PRIVATE 0
5151
#else
@@ -57,10 +57,15 @@
5757
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
5858
#define PACK_STRUCT_BEGIN
5959
#define PACK_STRUCT_END
60-
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
60+
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
61+
#define PACK_STRUCT_FIELD(x) x
62+
#define PACK_STRUCT_STRUCT __attribute__((packed))
6163
#define PACK_STRUCT_BEGIN
62-
#define PACK_STRUCT_STRUCT
6364
#define PACK_STRUCT_END
65+
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
66+
#define PACK_STRUCT_BEGIN #pragma pack(1)
67+
#define PACK_STRUCT_STRUCT
68+
#define PACK_STRUCT_END #pragma pack()
6469
#define PACK_STRUCT_FIELD(x) x
6570
#define PACK_STRUCT_USE_INCLUDES
6671
#elif defined(__GNUC__) /* GNU GCC Compiler */

‎components/net/lwip-2.1.2/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
6060
#endif /* RT_USING_LIBC */
6161

62-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || defined ( __GNUC__)
62+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
6363
#include <sys/time.h>
6464
#define LWIP_TIMEVAL_PRIVATE 0
6565
#else
@@ -71,10 +71,15 @@
7171
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
7272
#define PACK_STRUCT_BEGIN
7373
#define PACK_STRUCT_END
74-
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
74+
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) /*Arm Compiler 6*/
75+
#define PACK_STRUCT_FIELD(x) x
76+
#define PACK_STRUCT_STRUCT __attribute__((packed))
7577
#define PACK_STRUCT_BEGIN
76-
#define PACK_STRUCT_STRUCT
7778
#define PACK_STRUCT_END
79+
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
80+
#define PACK_STRUCT_BEGIN #pragma pack(1)
81+
#define PACK_STRUCT_STRUCT
82+
#define PACK_STRUCT_END #pragma pack()
7883
#define PACK_STRUCT_FIELD(x) x
7984
#define PACK_STRUCT_USE_INCLUDES
8085
#elif defined(__GNUC__) /* GNU GCC Compiler */

‎include/libc/libc_errno.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <rtconfig.h>
1515

16-
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ )
16+
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
1717
/* use errno.h file in toolchains */
1818
#include <errno.h>
1919
#endif
@@ -45,7 +45,7 @@ defined in armcc/errno.h
4545
#define ERROR_BASE_NO 0
4646
#endif
4747

48-
#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !defined(__GNUC__ )
48+
#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !(defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
4949

5050
#define EPERM (ERROR_BASE_NO + 1)
5151
#define ENOENT (ERROR_BASE_NO + 2)

‎include/libc/libc_fcntl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef LIBC_FCNTL_H__
1313
#define LIBC_FCNTL_H__
1414

15-
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ )
15+
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
1616
#include <fcntl.h>
1717

1818
#ifndef O_NONBLOCK

‎include/libc/libc_fdset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <rtconfig.h>
1515

16-
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ )
16+
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
1717
#include <sys/types.h>
1818
#if defined(HAVE_SYS_SELECT_H)
1919
#include <sys/select.h>

‎include/libc/libc_stat.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <rtconfig.h>
1111

12-
#if defined(RT_USING_NEWLIB) || defined( __GNUC__ )
12+
#if defined(RT_USING_NEWLIB) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
1313
/* use header file of newlib */
1414
#include <sys/stat.h>
1515

0 commit comments

Comments
 (0)