diff --git a/libc/Android.mk b/libc/Android.mk index f1bfd715c..73b8acbbf 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -8,68 +8,14 @@ libc_common_src_files := \ $(syscall_src) \ unistd/abort.c \ unistd/alarm.c \ - unistd/brk.c \ - unistd/daemon.c \ - unistd/eventfd.c \ unistd/exec.c \ - unistd/fcntl.c \ unistd/fnmatch.c \ - unistd/fstatfs.c \ - unistd/ftime.c \ - unistd/ftok.c \ - unistd/getdtablesize.c \ - unistd/gethostname.c \ unistd/getopt_long.c \ - unistd/getpgrp.c \ - unistd/getpriority.c \ - unistd/getpt.c \ - unistd/initgroups.c \ - unistd/isatty.c \ - unistd/issetugid.c \ unistd/killpg.c \ - unistd/lseek64.c \ - unistd/mmap.c \ - unistd/open.c \ - unistd/openat.c \ - unistd/opendir.c \ - unistd/pathconf.c \ - unistd/perror.c \ unistd/popen.c \ - unistd/pread.c \ - unistd/pselect.c \ - unistd/ptsname.c \ - unistd/ptsname_r.c \ - unistd/pwrite.c \ - unistd/raise.c \ - unistd/reboot.c \ - unistd/recv.c \ - unistd/sbrk.c \ - unistd/send.c \ - unistd/setegid.c \ - unistd/setuid.c \ - unistd/seteuid.c \ - unistd/setreuid.c \ - unistd/setresuid.c \ - unistd/setpgrp.c \ - unistd/sigblock.c \ - unistd/siginterrupt.c \ - unistd/siglist.c \ - unistd/signal.c \ - unistd/signame.c \ - unistd/sigsetmask.c \ - unistd/sigsuspend.c \ - unistd/sigwait.c \ - unistd/sleep.c \ - unistd/statfs.c \ unistd/syslog.c \ unistd/system.c \ - unistd/tcgetpgrp.c \ - unistd/tcsetpgrp.c \ unistd/time.c \ - unistd/umount.c \ - unistd/unlockpt.c \ - unistd/usleep.c \ - unistd/wait.c \ stdio/asprintf.c \ stdio/clrerr.c \ stdio/fclose.c \ @@ -84,7 +30,6 @@ libc_common_src_files := \ stdio/fileno.c \ stdio/findfp.c \ stdio/flags.c \ - stdio/flockfile.c \ stdio/fopen.c \ stdio/fprintf.c \ stdio/fpurge.c \ @@ -135,16 +80,8 @@ libc_common_src_files := \ stdio/vsscanf.c \ stdio/wbuf.c \ stdio/wsetup.c \ - stdio/__fgets_chk.c \ - stdio/__snprintf_chk.c \ - stdio/__sprintf_chk.c \ - stdio/__vsnprintf_chk.c \ - stdio/__vsprintf_chk.c \ stdlib/assert.c \ stdlib/atexit.c \ - stdlib/atoi.c \ - stdlib/atol.c \ - stdlib/atoll.c \ stdlib/bsearch.c \ stdlib/ctype_.c \ stdlib/div.c \ @@ -152,13 +89,10 @@ libc_common_src_files := \ stdlib/getenv.c \ stdlib/ldiv.c \ stdlib/lldiv.c \ - stdlib/locale.c \ stdlib/putenv.c \ stdlib/qsort.c \ stdlib/setenv.c \ stdlib/setjmperr.c \ - stdlib/strntoimax.c \ - stdlib/strntoumax.c \ stdlib/strtod.c \ stdlib/strtoimax.c \ stdlib/strtol.c \ @@ -168,50 +102,29 @@ libc_common_src_files := \ stdlib/strtoumax.c \ stdlib/tolower_.c \ stdlib/toupper_.c \ - stdlib/wchar.c \ string/index.c \ - string/memccpy.c \ - string/memchr.c \ - string/memmem.c \ - string/memrchr.c \ - string/memswap.c \ string/strcasecmp.c \ string/strcasestr.c \ string/strcat.c \ string/strchr.c \ - string/strcoll.c \ string/strcspn.c \ string/strdup.c \ string/strlcat.c \ string/strlcpy.c \ string/strncat.c \ string/strncpy.c \ - string/strndup.c \ - string/strnlen.c \ string/strpbrk.c \ string/strrchr.c \ string/strsep.c \ string/strspn.c \ string/strstr.c \ string/strtok.c \ - string/strtotimeval.c \ - string/__memcpy_chk.c \ - string/__memmove_chk.c \ - string/__memset_chk.c \ - string/__strcat_chk.c \ - string/__strcpy_chk.c \ - string/__strlcat_chk.c \ - string/__strlcpy_chk.c \ - string/__strlen_chk.c \ - string/__strncat_chk.c \ - string/__strncpy_chk.c \ wchar/wcpcpy.c \ wchar/wcpncpy.c \ wchar/wcscasecmp.c \ wchar/wcscat.c \ wchar/wcschr.c \ wchar/wcscmp.c \ - wchar/wcscoll.c \ wchar/wcscpy.c \ wchar/wcscspn.c \ wchar/wcsdup.c \ @@ -235,61 +148,148 @@ libc_common_src_files := \ wchar/wmemcpy.c \ wchar/wmemmove.c \ wchar/wmemset.c \ - inet/bindresvport.c \ inet/inet_addr.c \ inet/inet_aton.c \ inet/inet_ntoa.c \ inet/inet_ntop.c \ inet/inet_pton.c \ - inet/ether_aton.c \ - inet/ether_ntoa.c \ tzcode/asctime.c \ tzcode/difftime.c \ tzcode/localtime.c \ tzcode/strftime.c \ tzcode/strptime.c \ - bionic/__set_errno.c \ - bionic/__umask_chk.c \ - bionic/bionic_clone.c \ - bionic/cpuacct.c \ bionic/arc4random.c \ + bionic/atoi.c \ + bionic/atol.c \ + bionic/atoll.c \ bionic/basename.c \ bionic/basename_r.c \ + bionic/bindresvport.c \ + bionic/bionic_clone.c \ + bionic/brk.c \ bionic/clearenv.c \ + bionic/cpuacct.c \ + bionic/daemon.c \ bionic/dirname.c \ bionic/dirname_r.c \ bionic/err.c \ + bionic/ether_aton.c \ + bionic/ether_ntoa.c \ + bionic/eventfd.c \ + bionic/fcntl.c \ bionic/fdprintf.c \ + bionic/__fgets_chk.c \ + bionic/flockfile.c \ bionic/fork.c \ + bionic/fstatfs.c \ + bionic/ftime.c \ + bionic/ftok.c \ bionic/fts.c \ bionic/getcwd.cpp \ - bionic/if_nametoindex.c \ + bionic/getdtablesize.c \ + bionic/gethostname.c \ + bionic/getpgrp.c \ + bionic/getpriority.c \ + bionic/getpt.c \ bionic/if_indextoname.c \ + bionic/if_nametoindex.c \ + bionic/initgroups.c \ bionic/ioctl.c \ + bionic/isatty.c \ + bionic/issetugid.c \ bionic/ldexp.c \ bionic/libc_init_common.c \ + bionic/locale.c \ bionic/logd_write.c \ + bionic/lseek64.c \ bionic/md5.c \ + bionic/memccpy.c \ + bionic/memchr.c \ + bionic/__memcpy_chk.c \ + bionic/memmem.c \ + bionic/__memmove_chk.c \ bionic/memmove_words.c \ + bionic/memrchr.c \ + bionic/__memset_chk.c \ + bionic/memswap.c \ + bionic/mmap.c \ + bionic/openat.c \ + bionic/open.c \ + bionic/opendir.c \ + bionic/pathconf.c \ + bionic/perror.c \ + bionic/pread.c \ + bionic/pselect.c \ + bionic/ptsname.c \ + bionic/ptsname_r.c \ bionic/pututline.c \ + bionic/pwrite.c \ + bionic/raise.c \ bionic/realpath.c \ - bionic/sched_getaffinity.c \ - bionic/sched_getcpu.c \ + bionic/reboot.c \ + bionic/recv.c \ + bionic/sbrk.c \ bionic/sched_cpualloc.c \ bionic/sched_cpucount.c \ + bionic/sched_getaffinity.c \ + bionic/sched_getcpu.c \ bionic/semaphore.c \ + bionic/send.c \ + bionic/setegid.c \ + bionic/__set_errno.c \ + bionic/seteuid.c \ + bionic/setpgrp.c \ + bionic/setresuid.c \ + bionic/setreuid.c \ + bionic/setuid.c \ bionic/sha1.c \ + bionic/sigblock.c \ + bionic/siginterrupt.c \ + bionic/siglist.c \ + bionic/signal.c \ + bionic/signame.c \ + bionic/sigsetmask.c \ + bionic/sigsuspend.c \ + bionic/sigwait.c \ + bionic/sleep.c \ + bionic/__snprintf_chk.c \ + bionic/__sprintf_chk.c \ + bionic/statfs.c \ + bionic/__strcat_chk.c \ + bionic/strcoll.c \ + bionic/__strcpy_chk.c \ bionic/strerror.cpp \ bionic/strerror_r.cpp \ + bionic/__strlcat_chk.c \ + bionic/__strlcpy_chk.c \ + bionic/__strlen_chk.c \ + bionic/__strncat_chk.c \ + bionic/__strncpy_chk.c \ + bionic/strndup.c \ + bionic/strnlen.c \ + bionic/strntoimax.c \ + bionic/strntoumax.c \ bionic/strsignal.cpp \ + bionic/strtotimeval.c \ bionic/stubs.cpp \ bionic/system_properties.c \ + bionic/tcgetpgrp.c \ + bionic/tcsetpgrp.c \ bionic/tdestroy.c \ - bionic/time64.c \ bionic/thread_atexit.c \ + bionic/time64.c \ bionic/tmpfile.cpp \ + bionic/__umask_chk.c \ + bionic/umount.c \ + bionic/unlockpt.c \ + bionic/usleep.c \ bionic/utime.c \ bionic/utmp.c \ + bionic/__vsnprintf_chk.c \ + bionic/__vsprintf_chk.c \ + bionic/wait.c \ + bionic/wchar.c \ + bionic/wcscoll.c \ netbsd/gethnamaddr.c \ netbsd/isc/ev_timers.c \ netbsd/isc/ev_streams.c \ @@ -361,40 +361,40 @@ libc_upstream_netbsd_src_files := \ # below. # libc_static_common_src_files := \ - unistd/sysconf.c \ bionic/__errno.c \ + bionic/sysconf.c \ # Architecture specific source files go here # ========================================================= ifeq ($(TARGET_ARCH),arm) libc_common_src_files += \ - arch-arm/bionic/__get_sp.S \ - arch-arm/bionic/_exit_with_stack_teardown.S \ - arch-arm/bionic/_setjmp.S \ arch-arm/bionic/abort_arm.S \ arch-arm/bionic/atomics_arm.c \ arch-arm/bionic/clone.S \ arch-arm/bionic/eabi.c \ + arch-arm/bionic/_exit_with_stack_teardown.S \ arch-arm/bionic/ffs.S \ arch-arm/bionic/futex_arm.S \ + arch-arm/bionic/__get_sp.S \ arch-arm/bionic/kill.S \ arch-arm/bionic/libgcc_compat.c \ - arch-arm/bionic/tkill.S \ - arch-arm/bionic/tgkill.S \ - arch-arm/bionic/memcmp.S \ arch-arm/bionic/memcmp16.S \ + arch-arm/bionic/memcmp.S \ arch-arm/bionic/memcpy.S \ arch-arm/bionic/memset.S \ + arch-arm/bionic/_setjmp.S \ arch-arm/bionic/setjmp.S \ arch-arm/bionic/sigsetjmp.S \ - arch-arm/bionic/strlen.c.arm \ - arch-arm/bionic/strcpy.S \ arch-arm/bionic/strcmp.S \ + arch-arm/bionic/strcpy.S \ + arch-arm/bionic/strlen.c.arm \ arch-arm/bionic/syscall.S \ - string/memmove.c.arm \ + arch-arm/bionic/tgkill.S \ + arch-arm/bionic/tkill.S \ + bionic/memmove.c.arm \ + bionic/socketcalls.c \ string/bcopy.c \ string/strncmp.c \ - unistd/socketcalls.c # These files need to be arm so that gdbserver # can set breakpoints in them without messing diff --git a/libc/stdio/__fgets_chk.c b/libc/bionic/__fgets_chk.c similarity index 100% rename from libc/stdio/__fgets_chk.c rename to libc/bionic/__fgets_chk.c diff --git a/libc/string/__memcpy_chk.c b/libc/bionic/__memcpy_chk.c similarity index 100% rename from libc/string/__memcpy_chk.c rename to libc/bionic/__memcpy_chk.c diff --git a/libc/string/__memmove_chk.c b/libc/bionic/__memmove_chk.c similarity index 100% rename from libc/string/__memmove_chk.c rename to libc/bionic/__memmove_chk.c diff --git a/libc/string/__memset_chk.c b/libc/bionic/__memset_chk.c similarity index 100% rename from libc/string/__memset_chk.c rename to libc/bionic/__memset_chk.c diff --git a/libc/stdio/__snprintf_chk.c b/libc/bionic/__snprintf_chk.c similarity index 100% rename from libc/stdio/__snprintf_chk.c rename to libc/bionic/__snprintf_chk.c diff --git a/libc/stdio/__sprintf_chk.c b/libc/bionic/__sprintf_chk.c similarity index 100% rename from libc/stdio/__sprintf_chk.c rename to libc/bionic/__sprintf_chk.c diff --git a/libc/string/__strcat_chk.c b/libc/bionic/__strcat_chk.c similarity index 100% rename from libc/string/__strcat_chk.c rename to libc/bionic/__strcat_chk.c diff --git a/libc/string/__strcpy_chk.c b/libc/bionic/__strcpy_chk.c similarity index 100% rename from libc/string/__strcpy_chk.c rename to libc/bionic/__strcpy_chk.c diff --git a/libc/string/__strlcat_chk.c b/libc/bionic/__strlcat_chk.c similarity index 100% rename from libc/string/__strlcat_chk.c rename to libc/bionic/__strlcat_chk.c diff --git a/libc/string/__strlcpy_chk.c b/libc/bionic/__strlcpy_chk.c similarity index 100% rename from libc/string/__strlcpy_chk.c rename to libc/bionic/__strlcpy_chk.c diff --git a/libc/string/__strlen_chk.c b/libc/bionic/__strlen_chk.c similarity index 100% rename from libc/string/__strlen_chk.c rename to libc/bionic/__strlen_chk.c diff --git a/libc/string/__strncat_chk.c b/libc/bionic/__strncat_chk.c similarity index 100% rename from libc/string/__strncat_chk.c rename to libc/bionic/__strncat_chk.c diff --git a/libc/string/__strncpy_chk.c b/libc/bionic/__strncpy_chk.c similarity index 100% rename from libc/string/__strncpy_chk.c rename to libc/bionic/__strncpy_chk.c diff --git a/libc/stdio/__vsnprintf_chk.c b/libc/bionic/__vsnprintf_chk.c similarity index 100% rename from libc/stdio/__vsnprintf_chk.c rename to libc/bionic/__vsnprintf_chk.c diff --git a/libc/stdio/__vsprintf_chk.c b/libc/bionic/__vsprintf_chk.c similarity index 100% rename from libc/stdio/__vsprintf_chk.c rename to libc/bionic/__vsprintf_chk.c diff --git a/libc/stdlib/atoi.c b/libc/bionic/atoi.c similarity index 100% rename from libc/stdlib/atoi.c rename to libc/bionic/atoi.c diff --git a/libc/stdlib/atol.c b/libc/bionic/atol.c similarity index 100% rename from libc/stdlib/atol.c rename to libc/bionic/atol.c diff --git a/libc/stdlib/atoll.c b/libc/bionic/atoll.c similarity index 100% rename from libc/stdlib/atoll.c rename to libc/bionic/atoll.c diff --git a/libc/inet/bindresvport.c b/libc/bionic/bindresvport.c similarity index 100% rename from libc/inet/bindresvport.c rename to libc/bionic/bindresvport.c diff --git a/libc/unistd/brk.c b/libc/bionic/brk.c similarity index 100% rename from libc/unistd/brk.c rename to libc/bionic/brk.c diff --git a/libc/unistd/daemon.c b/libc/bionic/daemon.c similarity index 100% rename from libc/unistd/daemon.c rename to libc/bionic/daemon.c diff --git a/libc/inet/ether_aton.c b/libc/bionic/ether_aton.c similarity index 100% rename from libc/inet/ether_aton.c rename to libc/bionic/ether_aton.c diff --git a/libc/inet/ether_ntoa.c b/libc/bionic/ether_ntoa.c similarity index 100% rename from libc/inet/ether_ntoa.c rename to libc/bionic/ether_ntoa.c diff --git a/libc/unistd/eventfd.c b/libc/bionic/eventfd.c similarity index 100% rename from libc/unistd/eventfd.c rename to libc/bionic/eventfd.c diff --git a/libc/unistd/fcntl.c b/libc/bionic/fcntl.c similarity index 100% rename from libc/unistd/fcntl.c rename to libc/bionic/fcntl.c diff --git a/libc/stdio/flockfile.c b/libc/bionic/flockfile.c similarity index 100% rename from libc/stdio/flockfile.c rename to libc/bionic/flockfile.c diff --git a/libc/unistd/fstatfs.c b/libc/bionic/fstatfs.c similarity index 100% rename from libc/unistd/fstatfs.c rename to libc/bionic/fstatfs.c diff --git a/libc/unistd/ftime.c b/libc/bionic/ftime.c similarity index 100% rename from libc/unistd/ftime.c rename to libc/bionic/ftime.c diff --git a/libc/unistd/ftok.c b/libc/bionic/ftok.c similarity index 100% rename from libc/unistd/ftok.c rename to libc/bionic/ftok.c diff --git a/libc/unistd/getdtablesize.c b/libc/bionic/getdtablesize.c similarity index 100% rename from libc/unistd/getdtablesize.c rename to libc/bionic/getdtablesize.c diff --git a/libc/unistd/gethostname.c b/libc/bionic/gethostname.c similarity index 100% rename from libc/unistd/gethostname.c rename to libc/bionic/gethostname.c diff --git a/libc/unistd/getpgrp.c b/libc/bionic/getpgrp.c similarity index 100% rename from libc/unistd/getpgrp.c rename to libc/bionic/getpgrp.c diff --git a/libc/unistd/getpriority.c b/libc/bionic/getpriority.c similarity index 100% rename from libc/unistd/getpriority.c rename to libc/bionic/getpriority.c diff --git a/libc/unistd/getpt.c b/libc/bionic/getpt.c similarity index 100% rename from libc/unistd/getpt.c rename to libc/bionic/getpt.c diff --git a/libc/unistd/initgroups.c b/libc/bionic/initgroups.c similarity index 100% rename from libc/unistd/initgroups.c rename to libc/bionic/initgroups.c diff --git a/libc/unistd/isatty.c b/libc/bionic/isatty.c similarity index 100% rename from libc/unistd/isatty.c rename to libc/bionic/isatty.c diff --git a/libc/unistd/issetugid.c b/libc/bionic/issetugid.c similarity index 100% rename from libc/unistd/issetugid.c rename to libc/bionic/issetugid.c diff --git a/libc/stdlib/locale.c b/libc/bionic/locale.c similarity index 100% rename from libc/stdlib/locale.c rename to libc/bionic/locale.c diff --git a/libc/unistd/lseek64.c b/libc/bionic/lseek64.c similarity index 100% rename from libc/unistd/lseek64.c rename to libc/bionic/lseek64.c diff --git a/libc/string/memccpy.c b/libc/bionic/memccpy.c similarity index 100% rename from libc/string/memccpy.c rename to libc/bionic/memccpy.c diff --git a/libc/string/memchr.c b/libc/bionic/memchr.c similarity index 100% rename from libc/string/memchr.c rename to libc/bionic/memchr.c diff --git a/libc/string/memcmp.c b/libc/bionic/memcmp.c similarity index 100% rename from libc/string/memcmp.c rename to libc/bionic/memcmp.c diff --git a/libc/string/memcpy.c b/libc/bionic/memcpy.c similarity index 100% rename from libc/string/memcpy.c rename to libc/bionic/memcpy.c diff --git a/libc/string/memmem.c b/libc/bionic/memmem.c similarity index 100% rename from libc/string/memmem.c rename to libc/bionic/memmem.c diff --git a/libc/string/memmove.c b/libc/bionic/memmove.c similarity index 100% rename from libc/string/memmove.c rename to libc/bionic/memmove.c diff --git a/libc/string/memrchr.c b/libc/bionic/memrchr.c similarity index 100% rename from libc/string/memrchr.c rename to libc/bionic/memrchr.c diff --git a/libc/string/memset.c b/libc/bionic/memset.c similarity index 100% rename from libc/string/memset.c rename to libc/bionic/memset.c diff --git a/libc/string/memswap.c b/libc/bionic/memswap.c similarity index 100% rename from libc/string/memswap.c rename to libc/bionic/memswap.c diff --git a/libc/unistd/mmap.c b/libc/bionic/mmap.c similarity index 100% rename from libc/unistd/mmap.c rename to libc/bionic/mmap.c diff --git a/libc/unistd/open.c b/libc/bionic/open.c similarity index 100% rename from libc/unistd/open.c rename to libc/bionic/open.c diff --git a/libc/unistd/openat.c b/libc/bionic/openat.c similarity index 100% rename from libc/unistd/openat.c rename to libc/bionic/openat.c diff --git a/libc/unistd/opendir.c b/libc/bionic/opendir.c similarity index 100% rename from libc/unistd/opendir.c rename to libc/bionic/opendir.c diff --git a/libc/unistd/pathconf.c b/libc/bionic/pathconf.c similarity index 100% rename from libc/unistd/pathconf.c rename to libc/bionic/pathconf.c diff --git a/libc/unistd/perror.c b/libc/bionic/perror.c similarity index 100% rename from libc/unistd/perror.c rename to libc/bionic/perror.c diff --git a/libc/unistd/pread.c b/libc/bionic/pread.c similarity index 100% rename from libc/unistd/pread.c rename to libc/bionic/pread.c diff --git a/libc/unistd/pselect.c b/libc/bionic/pselect.c similarity index 100% rename from libc/unistd/pselect.c rename to libc/bionic/pselect.c diff --git a/libc/unistd/ptsname.c b/libc/bionic/ptsname.c similarity index 100% rename from libc/unistd/ptsname.c rename to libc/bionic/ptsname.c diff --git a/libc/unistd/ptsname_r.c b/libc/bionic/ptsname_r.c similarity index 100% rename from libc/unistd/ptsname_r.c rename to libc/bionic/ptsname_r.c diff --git a/libc/unistd/pwrite.c b/libc/bionic/pwrite.c similarity index 100% rename from libc/unistd/pwrite.c rename to libc/bionic/pwrite.c diff --git a/libc/unistd/raise.c b/libc/bionic/raise.c similarity index 100% rename from libc/unistd/raise.c rename to libc/bionic/raise.c diff --git a/libc/unistd/reboot.c b/libc/bionic/reboot.c similarity index 100% rename from libc/unistd/reboot.c rename to libc/bionic/reboot.c diff --git a/libc/unistd/recv.c b/libc/bionic/recv.c similarity index 100% rename from libc/unistd/recv.c rename to libc/bionic/recv.c diff --git a/libc/unistd/sbrk.c b/libc/bionic/sbrk.c similarity index 100% rename from libc/unistd/sbrk.c rename to libc/bionic/sbrk.c diff --git a/libc/unistd/send.c b/libc/bionic/send.c similarity index 100% rename from libc/unistd/send.c rename to libc/bionic/send.c diff --git a/libc/unistd/setegid.c b/libc/bionic/setegid.c similarity index 100% rename from libc/unistd/setegid.c rename to libc/bionic/setegid.c diff --git a/libc/unistd/seteuid.c b/libc/bionic/seteuid.c similarity index 100% rename from libc/unistd/seteuid.c rename to libc/bionic/seteuid.c diff --git a/libc/unistd/setpgrp.c b/libc/bionic/setpgrp.c similarity index 100% rename from libc/unistd/setpgrp.c rename to libc/bionic/setpgrp.c diff --git a/libc/unistd/setresuid.c b/libc/bionic/setresuid.c similarity index 100% rename from libc/unistd/setresuid.c rename to libc/bionic/setresuid.c diff --git a/libc/unistd/setreuid.c b/libc/bionic/setreuid.c similarity index 100% rename from libc/unistd/setreuid.c rename to libc/bionic/setreuid.c diff --git a/libc/unistd/setuid.c b/libc/bionic/setuid.c similarity index 100% rename from libc/unistd/setuid.c rename to libc/bionic/setuid.c diff --git a/libc/unistd/sigblock.c b/libc/bionic/sigblock.c similarity index 100% rename from libc/unistd/sigblock.c rename to libc/bionic/sigblock.c diff --git a/libc/unistd/siginterrupt.c b/libc/bionic/siginterrupt.c similarity index 100% rename from libc/unistd/siginterrupt.c rename to libc/bionic/siginterrupt.c diff --git a/libc/unistd/siglist.c b/libc/bionic/siglist.c similarity index 100% rename from libc/unistd/siglist.c rename to libc/bionic/siglist.c diff --git a/libc/unistd/signal.c b/libc/bionic/signal.c similarity index 100% rename from libc/unistd/signal.c rename to libc/bionic/signal.c diff --git a/libc/unistd/signame.c b/libc/bionic/signame.c similarity index 100% rename from libc/unistd/signame.c rename to libc/bionic/signame.c diff --git a/libc/unistd/sigsetmask.c b/libc/bionic/sigsetmask.c similarity index 100% rename from libc/unistd/sigsetmask.c rename to libc/bionic/sigsetmask.c diff --git a/libc/unistd/sigsuspend.c b/libc/bionic/sigsuspend.c similarity index 100% rename from libc/unistd/sigsuspend.c rename to libc/bionic/sigsuspend.c diff --git a/libc/unistd/sigwait.c b/libc/bionic/sigwait.c similarity index 100% rename from libc/unistd/sigwait.c rename to libc/bionic/sigwait.c diff --git a/libc/unistd/sleep.c b/libc/bionic/sleep.c similarity index 100% rename from libc/unistd/sleep.c rename to libc/bionic/sleep.c diff --git a/libc/unistd/socketcalls.c b/libc/bionic/socketcalls.c similarity index 100% rename from libc/unistd/socketcalls.c rename to libc/bionic/socketcalls.c diff --git a/libc/unistd/statfs.c b/libc/bionic/statfs.c similarity index 100% rename from libc/unistd/statfs.c rename to libc/bionic/statfs.c diff --git a/libc/string/strcoll.c b/libc/bionic/strcoll.c similarity index 100% rename from libc/string/strcoll.c rename to libc/bionic/strcoll.c diff --git a/libc/string/strndup.c b/libc/bionic/strndup.c similarity index 100% rename from libc/string/strndup.c rename to libc/bionic/strndup.c diff --git a/libc/string/strnlen.c b/libc/bionic/strnlen.c similarity index 100% rename from libc/string/strnlen.c rename to libc/bionic/strnlen.c diff --git a/libc/stdlib/strntoimax.c b/libc/bionic/strntoimax.c similarity index 100% rename from libc/stdlib/strntoimax.c rename to libc/bionic/strntoimax.c diff --git a/libc/stdlib/strntoumax.c b/libc/bionic/strntoumax.c similarity index 100% rename from libc/stdlib/strntoumax.c rename to libc/bionic/strntoumax.c diff --git a/libc/string/strtotimeval.c b/libc/bionic/strtotimeval.c similarity index 100% rename from libc/string/strtotimeval.c rename to libc/bionic/strtotimeval.c diff --git a/libc/unistd/sysconf.c b/libc/bionic/sysconf.c similarity index 100% rename from libc/unistd/sysconf.c rename to libc/bionic/sysconf.c diff --git a/libc/unistd/tcgetpgrp.c b/libc/bionic/tcgetpgrp.c similarity index 100% rename from libc/unistd/tcgetpgrp.c rename to libc/bionic/tcgetpgrp.c diff --git a/libc/unistd/tcsetpgrp.c b/libc/bionic/tcsetpgrp.c similarity index 100% rename from libc/unistd/tcsetpgrp.c rename to libc/bionic/tcsetpgrp.c diff --git a/libc/unistd/umount.c b/libc/bionic/umount.c similarity index 100% rename from libc/unistd/umount.c rename to libc/bionic/umount.c diff --git a/libc/unistd/unlockpt.c b/libc/bionic/unlockpt.c similarity index 100% rename from libc/unistd/unlockpt.c rename to libc/bionic/unlockpt.c diff --git a/libc/unistd/usleep.c b/libc/bionic/usleep.c similarity index 100% rename from libc/unistd/usleep.c rename to libc/bionic/usleep.c diff --git a/libc/unistd/wait.c b/libc/bionic/wait.c similarity index 100% rename from libc/unistd/wait.c rename to libc/bionic/wait.c diff --git a/libc/stdlib/wchar.c b/libc/bionic/wchar.c similarity index 100% rename from libc/stdlib/wchar.c rename to libc/bionic/wchar.c diff --git a/libc/wchar/wcscoll.c b/libc/bionic/wcscoll.c similarity index 100% rename from libc/wchar/wcscoll.c rename to libc/bionic/wcscoll.c