Merge pull request #5244 from mysterywolf/libccc

[libc][posix] move libc.c/.h to posix folder

Author: Guozhanxin

components/libc/compilers/armlibc/SConscript

@@ -1,18 +1,12 @@
 from building import *
 Import('rtconfig')
 
-src   = Glob('*.c') + Glob('*.cpp')
-cwd   = GetCurrentDir()
+src   = Glob('*.c')
 group = []
 
-CPPPATH = [cwd]
 CPPDEFINES = ['RT_USING_ARM_LIBC']
 
-if GetDepend('RT_USING_MODULE') == False:
-    SrcRemove(src, ['libc_syms.c'])
-
 if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang':
-    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
-        CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPDEFINES = CPPDEFINES)
 
 Return('group')

components/libc/compilers/armlibc/libc.c

@@ -14,15 +14,16 @@
  * 2020-02-13     Meco Man     re-implement exit() and abort()
  * 2020-02-14     Meco Man     implement _sys_tmpnam()
  */
-#include <string.h>
-#include <rt_sys.h>
 
+#include <rt_sys.h>
 #include <rtthread.h>
-#include "libc.h"
-
+#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#ifdef RT_USING_POSIX
+#include "libc.h"
+#endif
 
 #define DBG_TAG    "armlibc.syscalls"
 #define DBG_LVL    DBG_INFO

components/libc/compilers/armlibc/stdio.c

@@ -8,14 +8,14 @@ group = []
 CPPPATH = [cwd]
 CPPDEFINES = []
 
+if rtconfig.CROSS_TOOL == 'keil':
+    CPPDEFINES += ['__CLK_TCK=RT_TICK_PER_SECOND']
+
 if GetDepend('RT_USING_LIBC'):
     src += Glob('*.c')
 elif GetDepend('RT_LIBC_USING_TIME'):
     src += ['time.c']
 
-if rtconfig.CROSS_TOOL == 'keil':
-    CPPDEFINES += ['__CLK_TCK=RT_TICK_PER_SECOND']
-
 group = DefineGroup('libc', src, depend = [], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 list = os.listdir(cwd)

components/libc/compilers/armlibc/syscalls.c

@@ -1,25 +1,20 @@
 from building import *
-
 Import('rtconfig')
 
 src   = Glob('*.c')
-cwd   = GetCurrentDir()
 group = []
 
-CPPPATH    = [cwd]
 CPPDEFINES = ['RT_USING_DLIBC']
 
 if rtconfig.PLATFORM == 'iar':
-
     if GetDepend('RT_USING_POSIX'):
         from distutils.version import LooseVersion
         from iar import IARVersion
 
         CPPDEFINES = CPPDEFINES + ['_DLIB_FILE_DESCRIPTOR']
-
         if LooseVersion(IARVersion()) < LooseVersion("8.20.1"):
             CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT']
 
-    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPDEFINES = CPPDEFINES)
 
 Return('group')

components/libc/compilers/common/SConscript

@@ -11,7 +11,9 @@
 #include <rtthread.h>
 #include <yfuns.h>
 #include <unistd.h>
+#ifdef RT_USING_POSIX
 #include "libc.h"
+#endif
 
 #define DBG_TAG    "dlib.syscall_read"
 #define DBG_LVL    DBG_INFO