From db88c0b6a23fa6d56094b6d6f5e9c3e577e9a88d Mon Sep 17 00:00:00 2001 From: bernard Date: Tue, 10 Oct 2017 17:12:03 +0800 Subject: [PATCH] [libc] Change libc stubs to compiler folder. --- components/libc/{ => compilers}/armlibc/SConscript | 0 components/libc/{ => compilers}/armlibc/fcntl.h | 2 ++ components/libc/{ => compilers}/armlibc/libc_syms.c | 0 components/libc/{ => compilers}/armlibc/mem_std.c | 0 components/libc/{ => compilers}/armlibc/stubs.c | 0 components/libc/{ => compilers}/armlibc/sys/README.md | 0 components/libc/{ => compilers}/armlibc/sys/errno.h | 0 components/libc/{ => compilers}/armlibc/sys/stat.h | 0 components/libc/{ => compilers}/armlibc/sys/time.h | 0 components/libc/{ => compilers}/armlibc/sys/types.h | 0 components/libc/{ => compilers}/armlibc/sys/unistd.h | 0 components/libc/{ => compilers}/armlibc/unistd.h | 0 components/libc/{ => compilers}/dlib/README.md | 0 components/libc/{ => compilers}/dlib/SConscript | 0 components/libc/{ => compilers}/dlib/environ.c | 0 components/libc/{ => compilers}/dlib/rmtx.c | 0 components/libc/{ => compilers}/dlib/sys/README.md | 0 components/libc/{ => compilers}/dlib/sys/errno.h | 0 components/libc/{ => compilers}/dlib/sys/time.h | 0 components/libc/{ => compilers}/dlib/sys/types.h | 0 components/libc/{ => compilers}/dlib/sys/unistd.h | 0 components/libc/{ => compilers}/dlib/syscall_close.c | 0 components/libc/{ => compilers}/dlib/syscall_lseek.c | 0 components/libc/{ => compilers}/dlib/syscall_mem.c | 0 components/libc/{ => compilers}/dlib/syscall_open.c | 0 components/libc/{ => compilers}/dlib/syscall_read.c | 0 components/libc/{ => compilers}/dlib/syscall_remove.c | 0 components/libc/{ => compilers}/dlib/syscall_write.c | 0 components/libc/{ => compilers}/dlib/syscalls.h | 0 components/libc/{ => compilers}/minilibc/SConscript | 0 components/libc/{ => compilers}/minilibc/ctype.c | 0 components/libc/{ => compilers}/minilibc/ctype.h | 0 components/libc/{ => compilers}/minilibc/errno.h | 0 components/libc/{ => compilers}/minilibc/inttypes.h | 0 components/libc/{ => compilers}/minilibc/math.c | 0 components/libc/{ => compilers}/minilibc/math.h | 0 components/libc/{ => compilers}/minilibc/qsort.c | 0 components/libc/{ => compilers}/minilibc/rand.c | 0 components/libc/{ => compilers}/minilibc/stddef.h | 0 components/libc/{ => compilers}/minilibc/stdint.h | 0 components/libc/{ => compilers}/minilibc/stdio.h | 0 components/libc/{ => compilers}/minilibc/stdlib.c | 0 components/libc/{ => compilers}/minilibc/stdlib.h | 0 components/libc/{ => compilers}/minilibc/string.c | 0 components/libc/{ => compilers}/minilibc/string.h | 0 components/libc/{ => compilers}/minilibc/sys/stat.h | 0 components/libc/{ => compilers}/minilibc/sys/time.h | 0 components/libc/{ => compilers}/minilibc/sys/types.h | 0 components/libc/{ => compilers}/minilibc/time.c | 0 components/libc/{ => compilers}/minilibc/time.h | 0 components/libc/{ => compilers}/newlib/SConscript | 0 components/libc/{ => compilers}/newlib/libc.c | 0 components/libc/{ => compilers}/newlib/libc.h | 0 components/libc/{ => compilers}/newlib/libc_sym.c | 0 components/libc/{ => compilers}/newlib/sys/dirent.h | 0 components/libc/{ => compilers}/newlib/sys/fcntl.h | 2 ++ components/libc/{ => compilers}/newlib/sys/statfs.h | 0 components/libc/{ => compilers}/newlib/syscalls.c | 0 58 files changed, 4 insertions(+) rename components/libc/{ => compilers}/armlibc/SConscript (100%) rename components/libc/{ => compilers}/armlibc/fcntl.h (71%) rename components/libc/{ => compilers}/armlibc/libc_syms.c (100%) rename components/libc/{ => compilers}/armlibc/mem_std.c (100%) rename components/libc/{ => compilers}/armlibc/stubs.c (100%) rename components/libc/{ => compilers}/armlibc/sys/README.md (100%) rename components/libc/{ => compilers}/armlibc/sys/errno.h (100%) rename components/libc/{ => compilers}/armlibc/sys/stat.h (100%) rename components/libc/{ => compilers}/armlibc/sys/time.h (100%) rename components/libc/{ => compilers}/armlibc/sys/types.h (100%) rename components/libc/{ => compilers}/armlibc/sys/unistd.h (100%) rename components/libc/{ => compilers}/armlibc/unistd.h (100%) rename components/libc/{ => compilers}/dlib/README.md (100%) rename components/libc/{ => compilers}/dlib/SConscript (100%) rename components/libc/{ => compilers}/dlib/environ.c (100%) rename components/libc/{ => compilers}/dlib/rmtx.c (100%) rename components/libc/{ => compilers}/dlib/sys/README.md (100%) rename components/libc/{ => compilers}/dlib/sys/errno.h (100%) rename components/libc/{ => compilers}/dlib/sys/time.h (100%) rename components/libc/{ => compilers}/dlib/sys/types.h (100%) rename components/libc/{ => compilers}/dlib/sys/unistd.h (100%) rename components/libc/{ => compilers}/dlib/syscall_close.c (100%) rename components/libc/{ => compilers}/dlib/syscall_lseek.c (100%) rename components/libc/{ => compilers}/dlib/syscall_mem.c (100%) rename components/libc/{ => compilers}/dlib/syscall_open.c (100%) rename components/libc/{ => compilers}/dlib/syscall_read.c (100%) rename components/libc/{ => compilers}/dlib/syscall_remove.c (100%) rename components/libc/{ => compilers}/dlib/syscall_write.c (100%) rename components/libc/{ => compilers}/dlib/syscalls.h (100%) rename components/libc/{ => compilers}/minilibc/SConscript (100%) rename components/libc/{ => compilers}/minilibc/ctype.c (100%) rename components/libc/{ => compilers}/minilibc/ctype.h (100%) rename components/libc/{ => compilers}/minilibc/errno.h (100%) rename components/libc/{ => compilers}/minilibc/inttypes.h (100%) rename components/libc/{ => compilers}/minilibc/math.c (100%) rename components/libc/{ => compilers}/minilibc/math.h (100%) rename components/libc/{ => compilers}/minilibc/qsort.c (100%) rename components/libc/{ => compilers}/minilibc/rand.c (100%) rename components/libc/{ => compilers}/minilibc/stddef.h (100%) rename components/libc/{ => compilers}/minilibc/stdint.h (100%) rename components/libc/{ => compilers}/minilibc/stdio.h (100%) rename components/libc/{ => compilers}/minilibc/stdlib.c (100%) rename components/libc/{ => compilers}/minilibc/stdlib.h (100%) rename components/libc/{ => compilers}/minilibc/string.c (100%) rename components/libc/{ => compilers}/minilibc/string.h (100%) rename components/libc/{ => compilers}/minilibc/sys/stat.h (100%) rename components/libc/{ => compilers}/minilibc/sys/time.h (100%) rename components/libc/{ => compilers}/minilibc/sys/types.h (100%) rename components/libc/{ => compilers}/minilibc/time.c (100%) rename components/libc/{ => compilers}/minilibc/time.h (100%) rename components/libc/{ => compilers}/newlib/SConscript (100%) rename components/libc/{ => compilers}/newlib/libc.c (100%) rename components/libc/{ => compilers}/newlib/libc.h (100%) rename components/libc/{ => compilers}/newlib/libc_sym.c (100%) rename components/libc/{ => compilers}/newlib/sys/dirent.h (100%) rename components/libc/{ => compilers}/newlib/sys/fcntl.h (95%) rename components/libc/{ => compilers}/newlib/sys/statfs.h (100%) rename components/libc/{ => compilers}/newlib/syscalls.c (100%) diff --git a/components/libc/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript similarity index 100% rename from components/libc/armlibc/SConscript rename to components/libc/compilers/armlibc/SConscript diff --git a/components/libc/armlibc/fcntl.h b/components/libc/compilers/armlibc/fcntl.h similarity index 71% rename from components/libc/armlibc/fcntl.h rename to components/libc/compilers/armlibc/fcntl.h index 36c06bbb1d..324b73f218 100644 --- a/components/libc/armlibc/fcntl.h +++ b/components/libc/compilers/armlibc/fcntl.h @@ -1,6 +1,8 @@ #ifndef FCNTL_H__ #define FCNTL_H__ +#ifdef RT_USING_DFS #include +#endif #endif diff --git a/components/libc/armlibc/libc_syms.c b/components/libc/compilers/armlibc/libc_syms.c similarity index 100% rename from components/libc/armlibc/libc_syms.c rename to components/libc/compilers/armlibc/libc_syms.c diff --git a/components/libc/armlibc/mem_std.c b/components/libc/compilers/armlibc/mem_std.c similarity index 100% rename from components/libc/armlibc/mem_std.c rename to components/libc/compilers/armlibc/mem_std.c diff --git a/components/libc/armlibc/stubs.c b/components/libc/compilers/armlibc/stubs.c similarity index 100% rename from components/libc/armlibc/stubs.c rename to components/libc/compilers/armlibc/stubs.c diff --git a/components/libc/armlibc/sys/README.md b/components/libc/compilers/armlibc/sys/README.md similarity index 100% rename from components/libc/armlibc/sys/README.md rename to components/libc/compilers/armlibc/sys/README.md diff --git a/components/libc/armlibc/sys/errno.h b/components/libc/compilers/armlibc/sys/errno.h similarity index 100% rename from components/libc/armlibc/sys/errno.h rename to components/libc/compilers/armlibc/sys/errno.h diff --git a/components/libc/armlibc/sys/stat.h b/components/libc/compilers/armlibc/sys/stat.h similarity index 100% rename from components/libc/armlibc/sys/stat.h rename to components/libc/compilers/armlibc/sys/stat.h diff --git a/components/libc/armlibc/sys/time.h b/components/libc/compilers/armlibc/sys/time.h similarity index 100% rename from components/libc/armlibc/sys/time.h rename to components/libc/compilers/armlibc/sys/time.h diff --git a/components/libc/armlibc/sys/types.h b/components/libc/compilers/armlibc/sys/types.h similarity index 100% rename from components/libc/armlibc/sys/types.h rename to components/libc/compilers/armlibc/sys/types.h diff --git a/components/libc/armlibc/sys/unistd.h b/components/libc/compilers/armlibc/sys/unistd.h similarity index 100% rename from components/libc/armlibc/sys/unistd.h rename to components/libc/compilers/armlibc/sys/unistd.h diff --git a/components/libc/armlibc/unistd.h b/components/libc/compilers/armlibc/unistd.h similarity index 100% rename from components/libc/armlibc/unistd.h rename to components/libc/compilers/armlibc/unistd.h diff --git a/components/libc/dlib/README.md b/components/libc/compilers/dlib/README.md similarity index 100% rename from components/libc/dlib/README.md rename to components/libc/compilers/dlib/README.md diff --git a/components/libc/dlib/SConscript b/components/libc/compilers/dlib/SConscript similarity index 100% rename from components/libc/dlib/SConscript rename to components/libc/compilers/dlib/SConscript diff --git a/components/libc/dlib/environ.c b/components/libc/compilers/dlib/environ.c similarity index 100% rename from components/libc/dlib/environ.c rename to components/libc/compilers/dlib/environ.c diff --git a/components/libc/dlib/rmtx.c b/components/libc/compilers/dlib/rmtx.c similarity index 100% rename from components/libc/dlib/rmtx.c rename to components/libc/compilers/dlib/rmtx.c diff --git a/components/libc/dlib/sys/README.md b/components/libc/compilers/dlib/sys/README.md similarity index 100% rename from components/libc/dlib/sys/README.md rename to components/libc/compilers/dlib/sys/README.md diff --git a/components/libc/dlib/sys/errno.h b/components/libc/compilers/dlib/sys/errno.h similarity index 100% rename from components/libc/dlib/sys/errno.h rename to components/libc/compilers/dlib/sys/errno.h diff --git a/components/libc/dlib/sys/time.h b/components/libc/compilers/dlib/sys/time.h similarity index 100% rename from components/libc/dlib/sys/time.h rename to components/libc/compilers/dlib/sys/time.h diff --git a/components/libc/dlib/sys/types.h b/components/libc/compilers/dlib/sys/types.h similarity index 100% rename from components/libc/dlib/sys/types.h rename to components/libc/compilers/dlib/sys/types.h diff --git a/components/libc/dlib/sys/unistd.h b/components/libc/compilers/dlib/sys/unistd.h similarity index 100% rename from components/libc/dlib/sys/unistd.h rename to components/libc/compilers/dlib/sys/unistd.h diff --git a/components/libc/dlib/syscall_close.c b/components/libc/compilers/dlib/syscall_close.c similarity index 100% rename from components/libc/dlib/syscall_close.c rename to components/libc/compilers/dlib/syscall_close.c diff --git a/components/libc/dlib/syscall_lseek.c b/components/libc/compilers/dlib/syscall_lseek.c similarity index 100% rename from components/libc/dlib/syscall_lseek.c rename to components/libc/compilers/dlib/syscall_lseek.c diff --git a/components/libc/dlib/syscall_mem.c b/components/libc/compilers/dlib/syscall_mem.c similarity index 100% rename from components/libc/dlib/syscall_mem.c rename to components/libc/compilers/dlib/syscall_mem.c diff --git a/components/libc/dlib/syscall_open.c b/components/libc/compilers/dlib/syscall_open.c similarity index 100% rename from components/libc/dlib/syscall_open.c rename to components/libc/compilers/dlib/syscall_open.c diff --git a/components/libc/dlib/syscall_read.c b/components/libc/compilers/dlib/syscall_read.c similarity index 100% rename from components/libc/dlib/syscall_read.c rename to components/libc/compilers/dlib/syscall_read.c diff --git a/components/libc/dlib/syscall_remove.c b/components/libc/compilers/dlib/syscall_remove.c similarity index 100% rename from components/libc/dlib/syscall_remove.c rename to components/libc/compilers/dlib/syscall_remove.c diff --git a/components/libc/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c similarity index 100% rename from components/libc/dlib/syscall_write.c rename to components/libc/compilers/dlib/syscall_write.c diff --git a/components/libc/dlib/syscalls.h b/components/libc/compilers/dlib/syscalls.h similarity index 100% rename from components/libc/dlib/syscalls.h rename to components/libc/compilers/dlib/syscalls.h diff --git a/components/libc/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript similarity index 100% rename from components/libc/minilibc/SConscript rename to components/libc/compilers/minilibc/SConscript diff --git a/components/libc/minilibc/ctype.c b/components/libc/compilers/minilibc/ctype.c similarity index 100% rename from components/libc/minilibc/ctype.c rename to components/libc/compilers/minilibc/ctype.c diff --git a/components/libc/minilibc/ctype.h b/components/libc/compilers/minilibc/ctype.h similarity index 100% rename from components/libc/minilibc/ctype.h rename to components/libc/compilers/minilibc/ctype.h diff --git a/components/libc/minilibc/errno.h b/components/libc/compilers/minilibc/errno.h similarity index 100% rename from components/libc/minilibc/errno.h rename to components/libc/compilers/minilibc/errno.h diff --git a/components/libc/minilibc/inttypes.h b/components/libc/compilers/minilibc/inttypes.h similarity index 100% rename from components/libc/minilibc/inttypes.h rename to components/libc/compilers/minilibc/inttypes.h diff --git a/components/libc/minilibc/math.c b/components/libc/compilers/minilibc/math.c similarity index 100% rename from components/libc/minilibc/math.c rename to components/libc/compilers/minilibc/math.c diff --git a/components/libc/minilibc/math.h b/components/libc/compilers/minilibc/math.h similarity index 100% rename from components/libc/minilibc/math.h rename to components/libc/compilers/minilibc/math.h diff --git a/components/libc/minilibc/qsort.c b/components/libc/compilers/minilibc/qsort.c similarity index 100% rename from components/libc/minilibc/qsort.c rename to components/libc/compilers/minilibc/qsort.c diff --git a/components/libc/minilibc/rand.c b/components/libc/compilers/minilibc/rand.c similarity index 100% rename from components/libc/minilibc/rand.c rename to components/libc/compilers/minilibc/rand.c diff --git a/components/libc/minilibc/stddef.h b/components/libc/compilers/minilibc/stddef.h similarity index 100% rename from components/libc/minilibc/stddef.h rename to components/libc/compilers/minilibc/stddef.h diff --git a/components/libc/minilibc/stdint.h b/components/libc/compilers/minilibc/stdint.h similarity index 100% rename from components/libc/minilibc/stdint.h rename to components/libc/compilers/minilibc/stdint.h diff --git a/components/libc/minilibc/stdio.h b/components/libc/compilers/minilibc/stdio.h similarity index 100% rename from components/libc/minilibc/stdio.h rename to components/libc/compilers/minilibc/stdio.h diff --git a/components/libc/minilibc/stdlib.c b/components/libc/compilers/minilibc/stdlib.c similarity index 100% rename from components/libc/minilibc/stdlib.c rename to components/libc/compilers/minilibc/stdlib.c diff --git a/components/libc/minilibc/stdlib.h b/components/libc/compilers/minilibc/stdlib.h similarity index 100% rename from components/libc/minilibc/stdlib.h rename to components/libc/compilers/minilibc/stdlib.h diff --git a/components/libc/minilibc/string.c b/components/libc/compilers/minilibc/string.c similarity index 100% rename from components/libc/minilibc/string.c rename to components/libc/compilers/minilibc/string.c diff --git a/components/libc/minilibc/string.h b/components/libc/compilers/minilibc/string.h similarity index 100% rename from components/libc/minilibc/string.h rename to components/libc/compilers/minilibc/string.h diff --git a/components/libc/minilibc/sys/stat.h b/components/libc/compilers/minilibc/sys/stat.h similarity index 100% rename from components/libc/minilibc/sys/stat.h rename to components/libc/compilers/minilibc/sys/stat.h diff --git a/components/libc/minilibc/sys/time.h b/components/libc/compilers/minilibc/sys/time.h similarity index 100% rename from components/libc/minilibc/sys/time.h rename to components/libc/compilers/minilibc/sys/time.h diff --git a/components/libc/minilibc/sys/types.h b/components/libc/compilers/minilibc/sys/types.h similarity index 100% rename from components/libc/minilibc/sys/types.h rename to components/libc/compilers/minilibc/sys/types.h diff --git a/components/libc/minilibc/time.c b/components/libc/compilers/minilibc/time.c similarity index 100% rename from components/libc/minilibc/time.c rename to components/libc/compilers/minilibc/time.c diff --git a/components/libc/minilibc/time.h b/components/libc/compilers/minilibc/time.h similarity index 100% rename from components/libc/minilibc/time.h rename to components/libc/compilers/minilibc/time.h diff --git a/components/libc/newlib/SConscript b/components/libc/compilers/newlib/SConscript similarity index 100% rename from components/libc/newlib/SConscript rename to components/libc/compilers/newlib/SConscript diff --git a/components/libc/newlib/libc.c b/components/libc/compilers/newlib/libc.c similarity index 100% rename from components/libc/newlib/libc.c rename to components/libc/compilers/newlib/libc.c diff --git a/components/libc/newlib/libc.h b/components/libc/compilers/newlib/libc.h similarity index 100% rename from components/libc/newlib/libc.h rename to components/libc/compilers/newlib/libc.h diff --git a/components/libc/newlib/libc_sym.c b/components/libc/compilers/newlib/libc_sym.c similarity index 100% rename from components/libc/newlib/libc_sym.c rename to components/libc/compilers/newlib/libc_sym.c diff --git a/components/libc/newlib/sys/dirent.h b/components/libc/compilers/newlib/sys/dirent.h similarity index 100% rename from components/libc/newlib/sys/dirent.h rename to components/libc/compilers/newlib/sys/dirent.h diff --git a/components/libc/newlib/sys/fcntl.h b/components/libc/compilers/newlib/sys/fcntl.h similarity index 95% rename from components/libc/newlib/sys/fcntl.h rename to components/libc/compilers/newlib/sys/fcntl.h index 499c67260e..a53ca808b2 100644 --- a/components/libc/newlib/sys/fcntl.h +++ b/components/libc/compilers/newlib/sys/fcntl.h @@ -13,4 +13,6 @@ #define O_DIRECTORY 0x0200000 #define O_BINARY 0x0008000 +#include + #endif diff --git a/components/libc/newlib/sys/statfs.h b/components/libc/compilers/newlib/sys/statfs.h similarity index 100% rename from components/libc/newlib/sys/statfs.h rename to components/libc/compilers/newlib/sys/statfs.h diff --git a/components/libc/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c similarity index 100% rename from components/libc/newlib/syscalls.c rename to components/libc/compilers/newlib/syscalls.c