更改libc目录为common 以及 none-gcc

20 files changed, 23 insertions, 38 deletions

diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript
index 4c815c49b8..319e1a3555 100644
--- a/components/libc/compilers/common/SConscript
+++ b/components/libc/compilers/common/SConscript
@@ -1,15 +1,27 @@
-# RT-Thread building script for bridge
-
-import os
 from building import *
 
-cwd = GetCurrentDir()
-objs = []
-list = os.listdir(cwd)
+Import('rtconfig')
+
+src   = []
+cwd   = GetCurrentDir()
+group = []
+CPPPATH = [cwd]
+
+if GetDepend('RT_USING_LIBC'):
+    src += Glob('*.c')
+else:
+    if GetDepend('RT_LIBC_USING_TIME'):
+        src += ['time.c']
+
+if GetDepend('RT_USING_POSIX') == False:
+    SrcRemove(src, ['unistd.c'])
+
+if rtconfig.CROSS_TOOL == 'keil':
+    CPPDEFINES = ['__CLK_TCK=RT_TICK_PER_SECOND']
+else:
+    CPPDEFINES = []
 
-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'))
+if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
+    group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
-Return('objs')
+Return('group')
diff --git a/components/libc/compilers/common/all/SConscript b/components/libc/compilers/common/all/SConscript
deleted file mode 100644
index 319e1a3555..0000000000
--- a/components/libc/compilers/common/all/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-from building import *
-
-Import('rtconfig')
-
-src   = []
-cwd   = GetCurrentDir()
-group = []
-CPPPATH = [cwd]
-
-if GetDepend('RT_USING_LIBC'):
-    src += Glob('*.c')
-else:
-    if GetDepend('RT_LIBC_USING_TIME'):
-        src += ['time.c']
-
-if GetDepend('RT_USING_POSIX') == False:
-    SrcRemove(src, ['unistd.c'])
-
-if rtconfig.CROSS_TOOL == 'keil':
-    CPPDEFINES = ['__CLK_TCK=RT_TICK_PER_SECOND']
-else:
-    CPPDEFINES = []
-
-if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
-    group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
-
-Return('group')
diff --git a/components/libc/compilers/common/all/dirent.h b/components/libc/compilers/common/dirent.h
index bfba586093..bfba586093 100644
--- a/components/libc/compilers/common/all/dirent.h
+++ b/components/libc/compilers/common/dirent.h
diff --git a/components/libc/compilers/common/excgcc/SConscript b/components/libc/compilers/common/none-gcc/SConscript
index 346e69b478..346e69b478 100644
--- a/components/libc/compilers/common/excgcc/SConscript
+++ b/components/libc/compilers/common/none-gcc/SConscript
diff --git a/components/libc/compilers/common/excgcc/fcntl.h b/components/libc/compilers/common/none-gcc/fcntl.h
index f247b926e9..f247b926e9 100644
--- a/components/libc/compilers/common/excgcc/fcntl.h
+++ b/components/libc/compilers/common/none-gcc/fcntl.h
diff --git a/components/libc/compilers/common/excgcc/readme.md b/components/libc/compilers/common/none-gcc/readme.md
index b10940d003..b10940d003 100644
--- a/components/libc/compilers/common/excgcc/readme.md
+++ b/components/libc/compilers/common/none-gcc/readme.md
diff --git a/components/libc/compilers/common/excgcc/sys/stat.h b/components/libc/compilers/common/none-gcc/sys/stat.h
index c4b42083c4..c4b42083c4 100644
--- a/components/libc/compilers/common/excgcc/sys/stat.h
+++ b/components/libc/compilers/common/none-gcc/sys/stat.h
diff --git a/components/libc/compilers/common/excgcc/sys/types.h b/components/libc/compilers/common/none-gcc/sys/types.h
index 7222326a2a..7222326a2a 100644
--- a/components/libc/compilers/common/excgcc/sys/types.h
+++ b/components/libc/compilers/common/none-gcc/sys/types.h
diff --git a/components/libc/compilers/common/excgcc/sys/unistd.h b/components/libc/compilers/common/none-gcc/sys/unistd.h
index 7752a1caf7..7752a1caf7 100644
--- a/components/libc/compilers/common/excgcc/sys/unistd.h
+++ b/components/libc/compilers/common/none-gcc/sys/unistd.h
diff --git a/components/libc/compilers/common/excgcc/unistd.h b/components/libc/compilers/common/none-gcc/unistd.h
index cd77a12e3b..cd77a12e3b 100644
--- a/components/libc/compilers/common/excgcc/unistd.h
+++ b/components/libc/compilers/common/none-gcc/unistd.h
diff --git a/components/libc/compilers/common/all/readme.md b/components/libc/compilers/common/readme.md
index 856ddeb045..856ddeb045 100644
--- a/components/libc/compilers/common/all/readme.md
+++ b/components/libc/compilers/common/readme.md
diff --git a/components/libc/compilers/common/all/stdlib.c b/components/libc/compilers/common/stdlib.c
index 9d8952e99e..9d8952e99e 100644
--- a/components/libc/compilers/common/all/stdlib.c
+++ b/components/libc/compilers/common/stdlib.c
diff --git a/components/libc/compilers/common/all/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h
index 648d90230d..648d90230d 100644
--- a/components/libc/compilers/common/all/sys/ioctl.h
+++ b/components/libc/compilers/common/sys/ioctl.h
diff --git a/components/libc/compilers/common/all/sys/mman.h b/components/libc/compilers/common/sys/mman.h
index a9235d61f0..a9235d61f0 100644
--- a/components/libc/compilers/common/all/sys/mman.h
+++ b/components/libc/compilers/common/sys/mman.h
diff --git a/components/libc/compilers/common/all/sys/statfs.h b/components/libc/compilers/common/sys/statfs.h
index 0996af9a18..0996af9a18 100644
--- a/components/libc/compilers/common/all/sys/statfs.h
+++ b/components/libc/compilers/common/sys/statfs.h
diff --git a/components/libc/compilers/common/all/sys/termios.h b/components/libc/compilers/common/sys/termios.h
index c4b42083c4..c4b42083c4 100644
--- a/components/libc/compilers/common/all/sys/termios.h
+++ b/components/libc/compilers/common/sys/termios.h
diff --git a/components/libc/compilers/common/all/sys/time.h b/components/libc/compilers/common/sys/time.h
index ef1c810608..ef1c810608 100644
--- a/components/libc/compilers/common/all/sys/time.h
+++ b/components/libc/compilers/common/sys/time.h
diff --git a/components/libc/compilers/common/all/termios.h b/components/libc/compilers/common/termios.h
index 2960d52c58..2960d52c58 100644
--- a/components/libc/compilers/common/all/termios.h
+++ b/components/libc/compilers/common/termios.h
diff --git a/components/libc/compilers/common/all/time.c b/components/libc/compilers/common/time.c
index 33d8907165..33d8907165 100644
--- a/components/libc/compilers/common/all/time.c
+++ b/components/libc/compilers/common/time.c
diff --git a/components/libc/compilers/common/all/unistd.c b/components/libc/compilers/common/unistd.c
index 20130cbb8a..20130cbb8a 100644
--- a/components/libc/compilers/common/all/unistd.c
+++ b/components/libc/compilers/common/unistd.c