Merge pull request #4371 from mysterywolf/fixold

[libc] 去除RT_USING_NOLIBC 历史遗留
This commit is contained in:
Bernard Xiong 2021-02-24 16:45:29 +08:00 committed by GitHub
commit b7a71b8552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 10 deletions

View File

@ -211,7 +211,6 @@
#endif #endif
/* SECTION: Runtime library */ /* SECTION: Runtime library */
// #define RT_USING_NOLIBC
// #define RT_USING_NEWLIB // #define RT_USING_NEWLIB
#define RT_LIBC_USING_TIME #define RT_LIBC_USING_TIME

View File

@ -17,9 +17,6 @@
#pragma warning(disable:4267) /* to ignore: warning C4267: conversion from 'size_t' to 'rt_size_t', possible loss of data */ #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:4244) /* to ignore: warning C4244: '=' : conversion from '__w64 int' to 'rt_size_t', possible loss of data */
#elif defined(__GNUC__)
#define RT_USING_NOLIBC
#endif /* end of _MSC_VER */ #endif /* end of _MSC_VER */
#endif #endif

View File

@ -53,7 +53,6 @@
/* Using Small MM*/ /* Using Small MM*/
#define RT_USING_SMALL_MEM #define RT_USING_SMALL_MEM
// #define RT_USING_NOLIBC
#define RT_TINY_SIZE #define RT_TINY_SIZE
/* SECTION: Device System */ /* SECTION: Device System */

View File

@ -1,8 +1,8 @@
## Attentions ## Attentions
1. This folder is "common" for armlibc newlibc and dlib. It's not "common" for minilibc. 1. This folder is "common" for armlibc newlibc and dlib.
2. If you want to add new .c files, please do not forget to fix SConscript file too. eg: 2. If you want to add new `.c` files, please do not forget to fix SConscript file too. eg:
```python ```python
if GetDepend('RT_USING_POSIX') == False: if GetDepend('RT_USING_POSIX') == False:

View File

@ -276,9 +276,6 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
except KeyError: except KeyError:
print ('Unknow target: '+ tgt_name+'. Avaible targets: ' +', '.join(tgt_dict.keys())) print ('Unknow target: '+ tgt_name+'. Avaible targets: ' +', '.join(tgt_dict.keys()))
sys.exit(1) sys.exit(1)
elif (GetDepend('RT_USING_NEWLIB') == False and GetDepend('RT_USING_NOLIBC') == False) \
and rtconfig.PLATFORM == 'gcc':
AddDepend('RT_USING_MINILIBC')
# auto change the 'RTT_EXEC_PATH' when 'rtconfig.EXEC_PATH' get failed # auto change the 'RTT_EXEC_PATH' when 'rtconfig.EXEC_PATH' get failed
if not os.path.exists(rtconfig.EXEC_PATH): if not os.path.exists(rtconfig.EXEC_PATH):