diff options
| author | Bernard Xiong <[email protected]> | 2019-03-17 09:33:47 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-17 09:33:47 +0800 |
| commit | d778c9df25cbbd8e202a0133453e4c8b8e179eff (patch) | |
| tree | 6dd97c1487eacf0a6d858b7541866f865b9203de /components/libc | |
| parent | 2d69172ad39a52e574a22b4374ee89848d832fe8 (diff) | |
| parent | 94e3f77f25249b52c6f72921a2d2564f68bcd6ff (diff) | |
Merge pull request #2455 from armink/lts-v3.1.x
Lts v3.1.x
Diffstat (limited to 'components/libc')
| -rw-r--r-- | components/libc/compilers/armlibc/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/compilers/armlibc/stubs.c | 2 | ||||
| -rw-r--r-- | components/libc/libdl/dlelf.c | 2 | ||||
| -rw-r--r-- | components/libc/libdl/dlmodule.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 081efa7358..52f7a6d93a 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/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) diff --git a/components/libc/compilers/armlibc/stubs.c b/components/libc/compilers/armlibc/stubs.c index 555108f712..b6ffb37b0f 100644 --- a/components/libc/compilers/armlibc/stubs.c +++ b/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); diff --git a/components/libc/libdl/dlelf.c b/components/libc/libdl/dlelf.c index 6d83424b80..4557ee3458 100644 --- a/components/libc/libdl/dlelf.c +++ b/components/libc/libdl/dlelf.c @@ -12,9 +12,7 @@ #include "dlelf.h" #define DBG_SECTION_NAME "DLMD" -#define DBG_ENABLE // enable debug macro #define DBG_LEVEL DBG_INFO -#define DBG_COLOR #include <rtdbg.h> // must after of DEBUG_ENABLE or some other options rt_err_t dlmodule_load_shared_object(struct rt_dlmodule* module, void *module_ptr) diff --git a/components/libc/libdl/dlmodule.c b/components/libc/libdl/dlmodule.c index 61ffbfc772..0029c01728 100644 --- a/components/libc/libdl/dlmodule.c +++ b/components/libc/libdl/dlmodule.c @@ -17,9 +17,7 @@ #include <dfs_posix.h> #define DBG_SECTION_NAME "DLMD" -#define DBG_ENABLE // enable debug macro #define DBG_LEVEL DBG_INFO -#define DBG_COLOR #include <rtdbg.h> // must after of DEBUG_ENABLE or some other options static struct rt_module_symtab *_rt_module_symtab_begin = RT_NULL; |