improve libc time and MSVC simulator (#5775)
- [libc] 解决由于类unix操作系统发展历史原因fcntl.h定义的标志位在不同编译器中定义不同的问题 - [simulator] 部分宏定义转为全局宏定义以确保vs内置文件可以正确配置 - [simulator] 取消自欺欺人式的警告消除处理方式 - [libc][time] 优化time相关结构体在不同编译器下的包含
This commit is contained in:
parent
e68f934ff8
commit
c318dfa964
|
@ -1,12 +1,29 @@
|
|||
import sys
|
||||
import os
|
||||
from building import *
|
||||
Import('rtconfig')
|
||||
|
||||
cwd = GetCurrentDir()
|
||||
src = Glob('*.c')
|
||||
LIBS = []
|
||||
LIBPATH = []
|
||||
CPPPATH = [cwd]
|
||||
CPPDEFINES = []
|
||||
|
||||
if rtconfig.CROSS_TOOL == 'msvc':
|
||||
CPPDEFINES += \
|
||||
[
|
||||
# avoid to conflict with the inherent STDC in VS
|
||||
'_CRT_DECLARE_NONSTDC_NAMES=0',
|
||||
# errno macro redefinition
|
||||
'_CRT_ERRNO_DEFINED',
|
||||
# time.h conflicts
|
||||
'_CRT_NO_TIME_T',
|
||||
# disable deprecation of unsafe functions, such as strncpy
|
||||
'_CRT_SECURE_NO_WARNINGS',
|
||||
# RT_VESRION conflicts in winuser.h
|
||||
'NORESOURCE',
|
||||
]
|
||||
|
||||
# remove no need file.
|
||||
if GetDepend('PKG_USING_GUIENGINE') == False:
|
||||
|
@ -30,7 +47,8 @@ if GetDepend('RT_USING_DFS') == False or GetDepend('RT_USING_MODULE') == False:
|
|||
if sys.platform[0:5]=="linux": #check whether under linux
|
||||
SrcRemove(src, ['module_win32.c', 'dfs_win32.c'])
|
||||
|
||||
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH)
|
||||
group = DefineGroup('Drivers', src, depend = [''],
|
||||
CPPPATH = CPPPATH, LIBS=LIBS, LIBPATH=LIBPATH, CPPDEFINES=CPPDEFINES)
|
||||
|
||||
list = os.listdir(cwd)
|
||||
for item in list:
|
||||
|
|
|
@ -12,21 +12,9 @@
|
|||
|
||||
#define RT_HEAP_SIZE (1024*1024*8)
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#define NORESOURCE /* RT_VESRION in winuser.h */
|
||||
#define _CRT_ERRNO_DEFINED /* errno macro redefinition */
|
||||
#define _INC_WTIME_INL /* dfs_elm.c time.h conflicts with wtime.inl */
|
||||
#define _INC_TIME_INL /* dfs_elm.c time.h conflicts with wtime.inl */
|
||||
#define _CRT_DECLARE_NONSTDC_NAMES 0 /* avoid to conflict with the inherent STDC in VS */
|
||||
|
||||
#ifdef _MSC_VER
|
||||
/* disable some warning in MSC */
|
||||
#pragma warning(disable:4273) /* to ignore: warning C4273: inconsistent dll linkage */
|
||||
#pragma warning(disable:4312) /* to ignore: warning C4312: 'type cast' : conversion from 'rt_uint32_t' to 'rt_uint32_t *' */
|
||||
#pragma warning(disable:4311) /* to ignore: warning C4311: 'type cast' : pointer truncation from 'short *__w64 ' to 'long' */
|
||||
#pragma warning(disable:4996) /* to ignore: warning C4996: The POSIX name for this item is deprecated. */
|
||||
#pragma warning(disable:4267) /* to ignore: warning C4267: conversion from 'size_t' to 'rt_size_t', possible loss of data */
|
||||
#pragma warning(disable:4244) /* to ignore: warning C4244: '=' : conversion from '__w64 int' to 'rt_size_t', possible loss of data */
|
||||
// #pragma warning(disable:4273) /* to ignore: warning C4273: inconsistent dll linkage */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#endif /* end of _MSC_VER */
|
||||
|
||||
#endif
|
||||
#endif /* RTCONFIG_PROJECT_H__ */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import os
|
||||
from building import *
|
||||
|
||||
Import('rtconfig')
|
||||
|
||||
src = []
|
||||
|
@ -9,6 +9,13 @@ group = []
|
|||
|
||||
src += Glob('*.c')
|
||||
|
||||
if rtconfig.PLATFORM != 'gcc' or rtconfig.ARCH == 'sim':
|
||||
if rtconfig.PLATFORM != 'gcc':
|
||||
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
|
||||
|
||||
list = os.listdir(cwd)
|
||||
for d in list:
|
||||
path = os.path.join(cwd, d)
|
||||
if os.path.isfile(os.path.join(path, 'SConscript')):
|
||||
group = group + SConscript(os.path.join(d, 'SConscript'))
|
||||
|
||||
Return('group')
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
Because of the history issue, flags in fcntl.h, such as O_CREAT, have difference types of value. Some OS use hex flags and others use octal flags.
|
||||
|
||||
In terms of RT-Thread, Keil, IAR and MSVC use octal flags, which is located in the `tcntl/octal` folder; newlib uses hex flags; musl uses octal flags.
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# RT-Thread building script for bridge
|
||||
|
||||
import os
|
||||
from building import *
|
||||
|
||||
cwd = GetCurrentDir()
|
||||
objs = []
|
||||
list = os.listdir(cwd)
|
||||
|
||||
for d in list:
|
||||
path = os.path.join(cwd, d)
|
||||
if os.path.isfile(os.path.join(path, 'SConscript')):
|
||||
objs = objs + SConscript(os.path.join(d, 'SConscript'))
|
||||
|
||||
Return('objs')
|
|
@ -0,0 +1,14 @@
|
|||
from building import *
|
||||
Import('rtconfig')
|
||||
|
||||
src = []
|
||||
cwd = GetCurrentDir()
|
||||
CPPPATH = [cwd]
|
||||
group = []
|
||||
|
||||
if rtconfig.PLATFORM == 'armcc' or\
|
||||
rtconfig.PLATFORM == 'armclang' or\
|
||||
rtconfig.PLATFORM == 'iar' or\
|
||||
rtconfig.CROSS_TOOL == 'msvc':
|
||||
group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH)
|
||||
Return('group')
|
|
@ -18,7 +18,9 @@
|
|||
#include <time.h>
|
||||
#ifdef _WIN32
|
||||
#include <winsock.h> /* for struct timeval */
|
||||
#endif
|
||||
#include <corecrt.h> /* for __time64_t */
|
||||
typedef __time64_t time_t;
|
||||
#endif /* _WIN32 */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -50,17 +52,17 @@ struct timeval
|
|||
time_t tv_sec; /* seconds */
|
||||
suseconds_t tv_usec; /* and microseconds */
|
||||
};
|
||||
#endif
|
||||
#endif /* !defined(_TIMEVAL_DEFINED) && !defined(_WIN32) */
|
||||
|
||||
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/) && \
|
||||
!(defined(__ICCARM__) && (__VER__ >= 8010001)) && \
|
||||
!defined(_WIN32)
|
||||
#if defined(__ARMCC_VERSION) || defined(_WIN32) || (defined(__ICCARM__) && (__VER__ >= 8010001))
|
||||
struct timespec
|
||||
{
|
||||
time_t tv_sec; /* seconds */
|
||||
long tv_nsec; /* and nanoseconds */
|
||||
};
|
||||
#endif /* defined(__ARMCC_VERSION) || defined(_WIN32) || (defined(__ICCARM__) && (__VER__ >= 8010001)) */
|
||||
|
||||
#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/)
|
||||
/*
|
||||
* Structure defined by POSIX.1b to be like a itimerval, but with
|
||||
* timespecs. Used in the timer_*() system calls.
|
||||
|
@ -70,7 +72,7 @@ struct itimerspec
|
|||
struct timespec it_interval;
|
||||
struct timespec it_value;
|
||||
};
|
||||
#endif
|
||||
#endif /* !(defined(__GNUC__) && !defined(__ARMCC_VERSION)) */
|
||||
|
||||
int stime(const time_t *t);
|
||||
time_t timegm(struct tm * const t);
|
||||
|
|
Loading…
Reference in New Issue