update include hierarchy

CMakeLists.txt

@@ -122,6 +122,9 @@ endif()
 
 add_library(fxlibc ${SOURCES})
 target_include_directories(fxlibc PRIVATE include/)
+foreach(FOLDER IN LISTS TARGET_FOLDERS)
+  target_include_directories(fxlibc PRIVATE include/target/${FOLDER}/)
+endforeach()
 
 set_target_properties(fxlibc PROPERTIES
   OUTPUT_NAME "c") # libc.a
@@ -132,5 +135,7 @@ install(TARGETS fxlibc DESTINATION lib/)
 install(DIRECTORY include/ DESTINATION include/ PATTERN "target" EXCLUDE)
 
 foreach(FOLDER IN LISTS TARGET_FOLDERS)
-  install(DIRECTORY include/target/${FOLDER}/ DESTINATION include/)
+  if(EXISTS include/target/${FOLDER}/)
+    install(DIRECTORY include/target/${FOLDER}/ DESTINATION include/)
+  endif()
 endforeach()

include/fxlibc/sys/signal.h

@@ -1 +0,0 @@
-#include <fxlibc/signal.h>

include/sys/signal.h

@@ -0,0 +1 @@
+#include <signal.h>

include/sys/syscall.h

@@ -6,13 +6,13 @@
 ** But instead of duplicating this we use the information available
 ** from the kernel sources.
 */
-#include <fxlibc/asm/unistd.h>
+#include <bits/unistd.h>
 
 /*
 ** The Linux kernel header file defines macros __NR_*, but some
 ** programs expect the traditional form SYS_*.  <bits/syscall.h>
 ** defines SYS_* macros for __NR_* macros of known names.
 */
-#include <fxlibc/bits/syscall.h>
+#include <bits/syscall.h>
 
 #endif

include/sys/wait.h

@@ -9,10 +9,10 @@
 ** This will define the `W*' macros for the flag bits to `waitpid', `wait3',
 ** and `wait4'.
 */
-#include <fxlibc/bits/waitflags.h>
+#include <bits/waitflags.h>
 
 /* This will define all the `__W*' macros.*/
-#include <fxlibc/bits/waitstatus.h>
+#include <bits/waitstatus.h>
 
 /* Macros for the `waitpid`'s wstatus argument. */
 #define WEXITSTATUS(status)	__WEXITSTATUS(status)

include/target/casiowin-cg/bits/confname.h

@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/

include/target/casiowin-fx/bits/confname.h

@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/

include/target/gint/bits/confname.h

@@ -0,0 +1,7 @@
+#ifndef __BITS_CONFNAME_H__
+# define __BITS_CONFNAME_H__
+
+#define _SC_PAGE_SIZE	0
+#define _SC_PAGESIZE	_SC_PAGE_SIZE
+
+#endif /*__BITS_CONFNAME_H__*/

include/target/vhex-generic/bits/types/struct_FILE.h

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <fxlibc/sys/types.h>
+#include <sys/types.h>
 
 //---
 // TODO: VFS abstraction ? or ABI-spesific abstraction ?

src/libc/signal/target/vhex-sh/kill.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_kill
 .type	_kill, @function

src/libc/signal/target/vhex-sh/signal.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_signal
 .type	_signal, @function

src/libc/stdio/dprintf.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** The function dprintf() is the same as fprintf() except that it outputs to a

src/libc/stdio/internal/printf_actions.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"

src/libc/stdio/internal/printf_common.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"

src/libc/stdio/internal/printf_options.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "printf.h"

src/libc/stdio/printf.c

@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 /*
 ** printf() write the output under the control of a format string that specifies

src/libc/stdio/putc.c

@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 int putchar(int c)
 {

src/libc/stdio/puts.c

@@ -1,6 +1,6 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
-#include <fxlibc/string.h>
+#include <string.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 /*
 ** puts() writes the string s and a trailing newline to stdout.

src/libc/stdio/snprintf.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** sprintf(),  snprintf(), vsprintf() and vsnprintf() write the output under the

src/libc/stdio/sprintf.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** sprintf(),  snprintf(), vsprintf() and vsnprintf() write the output under the

src/libc/stdio/vdprintf.c

@@ -1,5 +1,5 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 // internal depency
 #include "internal/printf.h"

src/libc/stdio/vsnprintf.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 // internal depency
 #include "internal/printf.h"

src/libc/stdio/vsprintf.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdio.h>
+#include <stdio.h>
 
 /*
 ** The functions vsprintf() are equivalent to the sprintf() except that  they

src/libc/stdlib/calloc.c

@@ -1,6 +1,6 @@
-#include <fxlibc/stdlib.h>
+#include <stdlib.h>
-#include <fxlibc/string.h>
+#include <string.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 /*
 ** The calloc() function allocates memory for an array of nmemb elements of size

src/libc/stdlib/reallocarray.c

@@ -1,4 +1,4 @@
-#include <fxlibc/stdlib.h>
+#include <stdlib.h>
 
 /*
 ** The reallocarray() function changes the size of the memory block pointed to

src/libc/stdlib/target/vhex-sh/free.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_free
 .type	_free, @function

src/libc/stdlib/target/vhex-sh/malloc.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_malloc
 .type	_malloc, @function

src/libc/stdlib/target/vhex-sh/realloc.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_realloc
 .type	_realloc, @function

src/libc/string/memcpy.c

@@ -1,4 +1,5 @@
-#include <fxlibc/string.h>
+#include <string.h>
+#include <stdint.h>
 
 /*
 ** The memcpy() function copies n bytes from memory area src to memory area dest.

src/libc/string/memset.c

@@ -1,4 +1,5 @@
-#include <fxlibc/string.h>
+#include <string.h>
+#include <stdint.h>
 
 /*
 ** The  memset()  function fills the first n bytes of the memory area pointed to

src/libc/string/strcat.c

@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strcat()  function  appends  the src string to the dest string,

src/libc/string/strchr.c

@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The strchr() function returns a pointer to the first occurrence of the

src/libc/string/strcmp.c

@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The strcmp() function compares the two strings s1 and s2. The locale is not

src/libc/string/strcpy.c

@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strcpy() function copies the string pointed to by src, including the

src/libc/string/strdup.c

@@ -1,5 +1,5 @@
-#include <fxlibc/string.h>
+#include <string.h>
-#include <fxlibc/stdlib.h>
+#include <stdlib.h>
 
 /*
 ** The  strdup()  function  returns a pointer to a new string which is a

src/libc/string/strlen.c

@@ -1,4 +1,4 @@
-#include <fxlibc/string.h>
+#include <string.h>
 
 /*
 ** The  strlen() function calculates the length of the string pointed to by s,

src/libc/threads/mutex.c

@@ -1,5 +1,5 @@
-#include <fxlibc/threads.h>
+#include <threads.h>
-#include <fxlibc/unistd.h>
+#include <unistd.h>
 
 // Creates a new mutex object with type __TYPE.
 // @note: If successful the new object is pointed by __MUTEX.

src/posix/fcntl/target/vhex-sh/open.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_open
 .type	_open, @function

src/posix/sys/wait/target/vhex-sh/wait.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_wait
 .type	_wait, @function

src/posix/sys/wait/target/vhex-sh/waitpid.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_waitpid
 .type	_waitpid, @function

src/posix/unistd/target/casiowin-fx/close.S

@@ -1,6 +1,6 @@
 #ifdef __SUPPORT_CASIO_ABI_FX9860G
-#include <fxlibc/asm/unistd_32.h>
+#include <bits/unistd_32.h>
-#include <fxlibc/asm-casio/__trapa.h>
+#include <bits/__trapa.h>
 .text
 .global	_close
 .type	_close, @function

src/posix/unistd/target/vhex-sh/close.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_close
 .type	_close, @function

src/posix/unistd/target/vhex-sh/fork_execve.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_fork_execve
 .type	_fork_execve, @function

src/posix/unistd/target/vhex-sh/getpgid.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getpgid
 .type	_getpgid, @function

src/posix/unistd/target/vhex-sh/getpid.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getpid
 .type	_getpid, @function

src/posix/unistd/target/vhex-sh/getppid.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_getppid
 .type	_getppid, @function

src/posix/unistd/target/vhex-sh/lseek.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_lseek
 .type	_lseek, @function

src/posix/unistd/target/vhex-sh/read.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_read
 .type	_read, @function

src/posix/unistd/target/vhex-sh/setpgid.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_setpgid
 .type	_setpgid, @function

src/posix/unistd/target/vhex-sh/write.S

@@ -1,5 +1,5 @@
 #ifdef __SUPPORT_VHEX_KERNEL
-#include <fxlibc/asm/unistd.h>
+#include <bits/asm/unistd_32.h>
 .text
 .global	_write
 .type	_write, @function