From 8269e7673cf033aba67dab8264fe719920c70f87 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 14 Nov 2023 17:54:03 +0000
Subject: [PATCH] libsys: relocate implementations and manpages

Remove core system call implementations and documentation to lib/libsys
and lib/libsys/<arch> from lib/libc/sys and lib/libc/<arch>/<sys>.
Update paths to allow libc to find them in their new home.

Reviewed by:	kib, emaste, imp
Pull Request:	https://github.com/freebsd/freebsd-src/pull/908
---
 lib/libc/Makefile                                     | 2 ++
 lib/libc/powerpcspe/sys/Makefile.inc                  | 1 +
 lib/libc/sys/Makefile.inc                             | 5 +++--
 lib/{libc/sys => libsys}/POSIX2x_Fork.c               | 0
 lib/{libc/sys/Symbol.map => libsys/Symbol.sys.map}    | 0
 lib/{libc/sys => libsys}/__error.c                    | 0
 lib/{libc/sys => libsys}/__vdso_gettimeofday.c        | 0
 lib/{libc/sys => libsys}/_exit.2                      | 0
 lib/{libc/sys => libsys}/_umtx_op.2                   | 0
 lib/{libc => libsys}/aarch64/SYS.h                    | 0
 lib/{libc/aarch64/sys => libsys/aarch64}/cerror.S     | 0
 lib/{libc/aarch64/sys => libsys/aarch64}/syscall.S    | 0
 lib/{libc/aarch64/sys => libsys/aarch64}/vfork.S      | 0
 lib/{libc/sys => libsys}/abort2.2                     | 0
 lib/{libc/sys => libsys}/accept.2                     | 0
 lib/{libc/sys => libsys}/accept.c                     | 0
 lib/{libc/sys => libsys}/accept4.c                    | 0
 lib/{libc/sys => libsys}/access.2                     | 0
 lib/{libc/sys => libsys}/acct.2                       | 0
 lib/{libc/sys => libsys}/adjtime.2                    | 0
 lib/{libc/sys => libsys}/aio_cancel.2                 | 0
 lib/{libc/sys => libsys}/aio_error.2                  | 0
 lib/{libc/sys => libsys}/aio_fsync.2                  | 0
 lib/{libc/sys => libsys}/aio_mlock.2                  | 0
 lib/{libc/sys => libsys}/aio_read.2                   | 0
 lib/{libc/sys => libsys}/aio_return.2                 | 0
 lib/{libc/sys => libsys}/aio_suspend.2                | 0
 lib/{libc/sys => libsys}/aio_suspend.c                | 0
 lib/{libc/sys => libsys}/aio_waitcomplete.2           | 0
 lib/{libc/sys => libsys}/aio_write.2                  | 0
 lib/{libc => libsys}/amd64/SYS.h                      | 0
 lib/{libc/amd64/sys => libsys/amd64}/cerror.S         | 0
 lib/{libc/amd64/sys => libsys/amd64}/getcontext.S     | 0
 lib/{libc/amd64/sys => libsys/amd64}/vfork.S          | 0
 lib/{libc => libsys}/arm/SYS.h                        | 0
 lib/{libc/arm/sys => libsys/arm}/cerror.S             | 0
 lib/{libc/arm/sys => libsys/arm}/syscall.S            | 0
 lib/{libc/arm/sys => libsys/arm}/vfork.S              | 0
 lib/{libc/sys => libsys}/bind.2                       | 0
 lib/{libc/sys => libsys}/bindat.2                     | 0
 lib/{libc/sys => libsys}/brk.2                        | 0
 lib/{libc/sys => libsys}/brk.c                        | 0
 lib/{libc/sys => libsys}/cap_enter.2                  | 0
 lib/{libc/sys => libsys}/cap_fcntls_limit.2           | 0
 lib/{libc/sys => libsys}/cap_ioctls_limit.2           | 0
 lib/{libc/sys => libsys}/cap_rights_limit.2           | 0
 lib/{libc/sys => libsys}/chdir.2                      | 0
 lib/{libc/sys => libsys}/chflags.2                    | 0
 lib/{libc/sys => libsys}/chmod.2                      | 0
 lib/{libc/sys => libsys}/chown.2                      | 0
 lib/{libc/sys => libsys}/chroot.2                     | 0
 lib/{libc/sys => libsys}/clock_gettime.2              | 0
 lib/{libc/sys => libsys}/clock_gettime.c              | 0
 lib/{libc/sys => libsys}/clock_nanosleep.c            | 0
 lib/{libc/sys => libsys}/close.2                      | 0
 lib/{libc/sys => libsys}/close.c                      | 0
 lib/{libc/sys => libsys}/closefrom.2                  | 0
 lib/{libc/sys => libsys}/closefrom.c                  | 0
 lib/{libc/sys => libsys}/compat-stub.c                | 0
 lib/{libc/sys => libsys}/connect.2                    | 0
 lib/{libc/sys => libsys}/connect.c                    | 0
 lib/{libc/sys => libsys}/connectat.2                  | 0
 lib/{libc/sys => libsys}/copy_file_range.2            | 0
 lib/{libc/sys => libsys}/cpuset.2                     | 0
 lib/{libc/sys => libsys}/cpuset_getaffinity.2         | 0
 lib/{libc/sys => libsys}/cpuset_getdomain.2           | 0
 lib/{libc/sys => libsys}/dup.2                        | 0
 lib/{libc/sys => libsys}/eventfd.2                    | 0
 lib/{libc/sys => libsys}/execve.2                     | 0
 lib/{libc/sys => libsys}/extattr_get_file.2           | 0
 lib/{libc/sys => libsys}/fcntl.2                      | 0
 lib/{libc/sys => libsys}/fcntl.c                      | 0
 lib/{libc/sys => libsys}/fdatasync.c                  | 0
 lib/{libc/sys => libsys}/ffclock.2                    | 0
 lib/{libc/sys => libsys}/fhlink.2                     | 0
 lib/{libc/sys => libsys}/fhopen.2                     | 0
 lib/{libc/sys => libsys}/fhreadlink.2                 | 0
 lib/{libc/sys => libsys}/flock.2                      | 0
 lib/{libc/sys => libsys}/fork.2                       | 0
 lib/{libc/sys => libsys}/fork.c                       | 0
 lib/{libc/sys => libsys}/fspacectl.2                  | 0
 lib/{libc/sys => libsys}/fsync.2                      | 0
 lib/{libc/sys => libsys}/fsync.c                      | 0
 lib/{libc/sys => libsys}/getdents.c                   | 0
 lib/{libc/sys => libsys}/getdirentries.2              | 0
 lib/{libc/sys => libsys}/getdtablesize.2              | 0
 lib/{libc/sys => libsys}/getfh.2                      | 0
 lib/{libc/sys => libsys}/getfsstat.2                  | 0
 lib/{libc/sys => libsys}/getgid.2                     | 0
 lib/{libc/sys => libsys}/getgroups.2                  | 0
 lib/{libc/sys => libsys}/getitimer.2                  | 0
 lib/{libc/sys => libsys}/getlogin.2                   | 0
 lib/{libc/sys => libsys}/getloginclass.2              | 0
 lib/{libc/sys => libsys}/getpeername.2                | 0
 lib/{libc/sys => libsys}/getpgrp.2                    | 0
 lib/{libc/sys => libsys}/getpid.2                     | 0
 lib/{libc/sys => libsys}/getpriority.2                | 0
 lib/{libc/sys => libsys}/getrandom.2                  | 0
 lib/{libc/sys => libsys}/getrlimit.2                  | 0
 lib/{libc/sys => libsys}/getrusage.2                  | 0
 lib/{libc/sys => libsys}/getsid.2                     | 0
 lib/{libc/sys => libsys}/getsockname.2                | 0
 lib/{libc/sys => libsys}/getsockopt.2                 | 0
 lib/{libc/sys => libsys}/gettimeofday.2               | 0
 lib/{libc/sys => libsys}/gettimeofday.c               | 0
 lib/{libc/sys => libsys}/getuid.2                     | 0
 lib/{libc => libsys}/i386/SYS.h                       | 0
 lib/{libc/i386/sys => libsys/i386}/cerror.S           | 0
 lib/{libc/i386/sys => libsys/i386}/getcontext.S       | 0
 lib/{libc/i386/sys => libsys/i386}/syscall.S          | 0
 lib/{libc/i386/sys => libsys/i386}/vfork.S            | 0
 lib/{libc/sys => libsys}/interposing_table.c          | 0
 lib/{libc/sys => libsys}/intro.2                      | 0
 lib/{libc/sys => libsys}/ioctl.2                      | 0
 lib/{libc/sys => libsys}/issetugid.2                  | 0
 lib/{libc/sys => libsys}/jail.2                       | 0
 lib/{libc/sys => libsys}/kcmp.2                       | 0
 lib/{libc/sys => libsys}/kenv.2                       | 0
 lib/{libc/sys => libsys}/kevent.c                     | 0
 lib/{libc/sys => libsys}/kill.2                       | 0
 lib/{libc/sys => libsys}/kldfind.2                    | 0
 lib/{libc/sys => libsys}/kldfirstmod.2                | 0
 lib/{libc/sys => libsys}/kldload.2                    | 0
 lib/{libc/sys => libsys}/kldnext.2                    | 0
 lib/{libc/sys => libsys}/kldstat.2                    | 0
 lib/{libc/sys => libsys}/kldsym.2                     | 0
 lib/{libc/sys => libsys}/kldunload.2                  | 0
 lib/{libc/sys => libsys}/kqueue.2                     | 0
 lib/{libc/sys => libsys}/ktrace.2                     | 0
 lib/{libc/sys => libsys}/link.2                       | 0
 lib/{libc/sys => libsys}/lio_listio.2                 | 0
 lib/{libc/sys => libsys}/listen.2                     | 0
 lib/{libc/sys => libsys}/lseek.2                      | 0
 lib/{libc/sys => libsys}/lstat.c                      | 0
 lib/{libc/sys => libsys}/madvise.2                    | 0
 lib/{libc/sys => libsys}/mincore.2                    | 0
 lib/{libc/sys => libsys}/minherit.2                   | 0
 lib/{libc/sys => libsys}/mkdir.2                      | 0
 lib/{libc/sys => libsys}/mkfifo.2                     | 0
 lib/{libc/sys => libsys}/mknod.2                      | 0
 lib/{libc/sys => libsys}/mknod.c                      | 0
 lib/{libc/sys => libsys}/mlock.2                      | 0
 lib/{libc/sys => libsys}/mlockall.2                   | 0
 lib/{libc/sys => libsys}/mmap.2                       | 0
 lib/{libc/sys => libsys}/modfind.2                    | 0
 lib/{libc/sys => libsys}/modnext.2                    | 0
 lib/{libc/sys => libsys}/modstat.2                    | 0
 lib/{libc/sys => libsys}/mount.2                      | 0
 lib/{libc/sys => libsys}/mprotect.2                   | 0
 lib/{libc/sys => libsys}/mq_close.2                   | 0
 lib/{libc/sys => libsys}/mq_getattr.2                 | 0
 lib/{libc/sys => libsys}/mq_notify.2                  | 0
 lib/{libc/sys => libsys}/mq_open.2                    | 0
 lib/{libc/sys => libsys}/mq_receive.2                 | 0
 lib/{libc/sys => libsys}/mq_send.2                    | 0
 lib/{libc/sys => libsys}/mq_setattr.2                 | 0
 lib/{libc/sys => libsys}/mq_unlink.2                  | 0
 lib/{libc/sys => libsys}/msgctl.2                     | 0
 lib/{libc/sys => libsys}/msgget.2                     | 0
 lib/{libc/sys => libsys}/msgrcv.2                     | 0
 lib/{libc/sys => libsys}/msgsnd.2                     | 0
 lib/{libc/sys => libsys}/msync.2                      | 0
 lib/{libc/sys => libsys}/msync.c                      | 0
 lib/{libc/sys => libsys}/munmap.2                     | 0
 lib/{libc/sys => libsys}/nanosleep.2                  | 0
 lib/{libc/sys => libsys}/nanosleep.c                  | 0
 lib/{libc/sys => libsys}/nfssvc.2                     | 0
 lib/{libc/sys => libsys}/ntp_adjtime.2                | 0
 lib/{libc/sys => libsys}/open.2                       | 0
 lib/{libc/sys => libsys}/open.c                       | 0
 lib/{libc/sys => libsys}/openat.c                     | 0
 lib/{libc/sys => libsys}/pathconf.2                   | 0
 lib/{libc/sys => libsys}/pdfork.2                     | 0
 lib/{libc/sys => libsys}/pdfork.c                     | 0
 lib/{libc/sys => libsys}/pipe.2                       | 0
 lib/{libc/sys => libsys}/pipe.c                       | 0
 lib/{libc/sys => libsys}/poll.2                       | 0
 lib/{libc/sys => libsys}/poll.c                       | 0
 lib/{libc/sys => libsys}/posix_fadvise.2              | 0
 lib/{libc/sys => libsys}/posix_fallocate.2            | 0
 lib/{libc/sys => libsys}/posix_openpt.2               | 0
 lib/{libc => libsys}/powerpc/SYS.h                    | 0
 lib/{libc/powerpc/sys => libsys/powerpc}/cerror.S     | 0
 lib/{libc => libsys}/powerpc64/SYS.h                  | 0
 lib/{libc/powerpc64/sys => libsys/powerpc64}/cerror.S | 0
 lib/{libc/sys => libsys}/ppoll.c                      | 0
 lib/{libc/sys => libsys}/procctl.2                    | 0
 lib/{libc/sys => libsys}/profil.2                     | 0
 lib/{libc/sys => libsys}/pselect.2                    | 0
 lib/{libc/sys => libsys}/pselect.c                    | 0
 lib/{libc/sys => libsys}/ptrace.2                     | 0
 lib/{libc/sys => libsys}/ptrace.c                     | 0
 lib/{libc/sys => libsys}/quotactl.2                   | 0
 lib/{libc/sys => libsys}/rctl_add_rule.2              | 0
 lib/{libc/sys => libsys}/read.2                       | 0
 lib/{libc/sys => libsys}/read.c                       | 0
 lib/{libc/sys => libsys}/readlink.2                   | 0
 lib/{libc/sys => libsys}/readv.c                      | 0
 lib/{libc/sys => libsys}/reboot.2                     | 0
 lib/{libc/sys => libsys}/recv.2                       | 0
 lib/{libc/sys => libsys}/recvfrom.c                   | 0
 lib/{libc/sys => libsys}/recvmsg.c                    | 0
 lib/{libc/sys => libsys}/rename.2                     | 0
 lib/{libc/sys => libsys}/revoke.2                     | 0
 lib/{libc/sys => libsys}/rfork.2                      | 0
 lib/{libc => libsys}/riscv/SYS.h                      | 0
 lib/{libc/riscv/sys => libsys/riscv}/cerror.S         | 0
 lib/{libc/riscv/sys => libsys/riscv}/syscall.S        | 0
 lib/{libc/riscv/sys => libsys/riscv}/vfork.S          | 0
 lib/{libc/sys => libsys}/rmdir.2                      | 0
 lib/{libc/sys => libsys}/rtprio.2                     | 0
 lib/{libc/sys => libsys}/sched_get_priority_max.2     | 0
 lib/{libc/sys => libsys}/sched_setparam.2             | 0
 lib/{libc/sys => libsys}/sched_setscheduler.2         | 0
 lib/{libc/sys => libsys}/sched_yield.2                | 0
 lib/{libc/sys => libsys}/sctp_generic_recvmsg.2       | 0
 lib/{libc/sys => libsys}/sctp_generic_sendmsg.2       | 0
 lib/{libc/sys => libsys}/sctp_peeloff.2               | 0
 lib/{libc/sys => libsys}/select.2                     | 0
 lib/{libc/sys => libsys}/select.c                     | 0
 lib/{libc/sys => libsys}/semctl.2                     | 0
 lib/{libc/sys => libsys}/semget.2                     | 0
 lib/{libc/sys => libsys}/semop.2                      | 0
 lib/{libc/sys => libsys}/send.2                       | 0
 lib/{libc/sys => libsys}/sendfile.2                   | 0
 lib/{libc/sys => libsys}/sendmsg.c                    | 0
 lib/{libc/sys => libsys}/sendto.c                     | 0
 lib/{libc/sys => libsys}/setcontext.c                 | 0
 lib/{libc/sys => libsys}/setfib.2                     | 0
 lib/{libc/sys => libsys}/setgroups.2                  | 0
 lib/{libc/sys => libsys}/setpgid.2                    | 0
 lib/{libc/sys => libsys}/setregid.2                   | 0
 lib/{libc/sys => libsys}/setresuid.2                  | 0
 lib/{libc/sys => libsys}/setreuid.2                   | 0
 lib/{libc/sys => libsys}/setsid.2                     | 0
 lib/{libc/sys => libsys}/setuid.2                     | 0
 lib/{libc/sys => libsys}/shm_open.2                   | 0
 lib/{libc/sys => libsys}/shm_open.c                   | 0
 lib/{libc/sys => libsys}/shmat.2                      | 0
 lib/{libc/sys => libsys}/shmctl.2                     | 0
 lib/{libc/sys => libsys}/shmget.2                     | 0
 lib/{libc/sys => libsys}/shutdown.2                   | 0
 lib/{libc/sys => libsys}/sigaction.2                  | 0
 lib/{libc/sys => libsys}/sigaction.c                  | 0
 lib/{libc/sys => libsys}/sigaltstack.2                | 0
 lib/{libc/sys => libsys}/sigfastblock.2               | 0
 lib/{libc/sys => libsys}/sigpending.2                 | 0
 lib/{libc/sys => libsys}/sigprocmask.2                | 0
 lib/{libc/sys => libsys}/sigprocmask.c                | 0
 lib/{libc/sys => libsys}/sigqueue.2                   | 0
 lib/{libc/sys => libsys}/sigreturn.2                  | 0
 lib/{libc/sys => libsys}/sigstack.2                   | 0
 lib/{libc/sys => libsys}/sigsuspend.2                 | 0
 lib/{libc/sys => libsys}/sigsuspend.c                 | 0
 lib/{libc/sys => libsys}/sigtimedwait.c               | 0
 lib/{libc/sys => libsys}/sigwait.2                    | 0
 lib/{libc/sys => libsys}/sigwait.c                    | 0
 lib/{libc/sys => libsys}/sigwaitinfo.2                | 0
 lib/{libc/sys => libsys}/sigwaitinfo.c                | 0
 lib/{libc/sys => libsys}/socket.2                     | 0
 lib/{libc/sys => libsys}/socketpair.2                 | 0
 lib/{libc/sys => libsys}/stat.2                       | 0
 lib/{libc/sys => libsys}/stat.c                       | 0
 lib/{libc/sys => libsys}/statfs.2                     | 0
 lib/{libc/sys => libsys}/swapcontext.c                | 0
 lib/{libc/sys => libsys}/swapon.2                     | 0
 lib/{libc/sys => libsys}/symlink.2                    | 0
 lib/{libc/sys => libsys}/sync.2                       | 0
 lib/{libc/sys => libsys}/sysarch.2                    | 0
 lib/{libc/sys => libsys}/syscall.2                    | 0
 lib/{libc/sys => libsys}/thr_exit.2                   | 0
 lib/{libc/sys => libsys}/thr_kill.2                   | 0
 lib/{libc/sys => libsys}/thr_new.2                    | 0
 lib/{libc/sys => libsys}/thr_self.2                   | 0
 lib/{libc/sys => libsys}/thr_set_name.2               | 0
 lib/{libc/sys => libsys}/thr_suspend.2                | 0
 lib/{libc/sys => libsys}/thr_wake.2                   | 0
 lib/{libc/sys => libsys}/timer_create.2               | 0
 lib/{libc/sys => libsys}/timer_delete.2               | 0
 lib/{libc/sys => libsys}/timer_settime.2              | 0
 lib/{libc/sys => libsys}/timerfd.2                    | 0
 lib/{libc/sys => libsys}/truncate.2                   | 0
 lib/{libc/sys => libsys}/umask.2                      | 0
 lib/{libc/sys => libsys}/undelete.2                   | 0
 lib/{libc/sys => libsys}/unlink.2                     | 0
 lib/{libc/sys => libsys}/utimensat.2                  | 0
 lib/{libc/sys => libsys}/utimes.2                     | 0
 lib/{libc/sys => libsys}/utrace.2                     | 0
 lib/{libc/sys => libsys}/uuidgen.2                    | 0
 lib/{libc/sys => libsys}/vadvise.c                    | 0
 lib/{libc/sys => libsys}/vfork.2                      | 0
 lib/{libc/sys => libsys}/wait.2                       | 0
 lib/{libc/sys => libsys}/wait4.c                      | 0
 lib/{libc/sys => libsys}/wait6.c                      | 0
 lib/{libc/sys => libsys}/write.2                      | 0
 lib/{libc/sys => libsys}/write.c                      | 0
 lib/{libc/sys => libsys}/writev.c                     | 0
 297 files changed, 6 insertions(+), 2 deletions(-)
 rename lib/{libc/sys => libsys}/POSIX2x_Fork.c (100%)
 rename lib/{libc/sys/Symbol.map => libsys/Symbol.sys.map} (100%)
 rename lib/{libc/sys => libsys}/__error.c (100%)
 rename lib/{libc/sys => libsys}/__vdso_gettimeofday.c (100%)
 rename lib/{libc/sys => libsys}/_exit.2 (100%)
 rename lib/{libc/sys => libsys}/_umtx_op.2 (100%)
 rename lib/{libc => libsys}/aarch64/SYS.h (100%)
 rename lib/{libc/aarch64/sys => libsys/aarch64}/cerror.S (100%)
 rename lib/{libc/aarch64/sys => libsys/aarch64}/syscall.S (100%)
 rename lib/{libc/aarch64/sys => libsys/aarch64}/vfork.S (100%)
 rename lib/{libc/sys => libsys}/abort2.2 (100%)
 rename lib/{libc/sys => libsys}/accept.2 (100%)
 rename lib/{libc/sys => libsys}/accept.c (100%)
 rename lib/{libc/sys => libsys}/accept4.c (100%)
 rename lib/{libc/sys => libsys}/access.2 (100%)
 rename lib/{libc/sys => libsys}/acct.2 (100%)
 rename lib/{libc/sys => libsys}/adjtime.2 (100%)
 rename lib/{libc/sys => libsys}/aio_cancel.2 (100%)
 rename lib/{libc/sys => libsys}/aio_error.2 (100%)
 rename lib/{libc/sys => libsys}/aio_fsync.2 (100%)
 rename lib/{libc/sys => libsys}/aio_mlock.2 (100%)
 rename lib/{libc/sys => libsys}/aio_read.2 (100%)
 rename lib/{libc/sys => libsys}/aio_return.2 (100%)
 rename lib/{libc/sys => libsys}/aio_suspend.2 (100%)
 rename lib/{libc/sys => libsys}/aio_suspend.c (100%)
 rename lib/{libc/sys => libsys}/aio_waitcomplete.2 (100%)
 rename lib/{libc/sys => libsys}/aio_write.2 (100%)
 rename lib/{libc => libsys}/amd64/SYS.h (100%)
 rename lib/{libc/amd64/sys => libsys/amd64}/cerror.S (100%)
 rename lib/{libc/amd64/sys => libsys/amd64}/getcontext.S (100%)
 rename lib/{libc/amd64/sys => libsys/amd64}/vfork.S (100%)
 rename lib/{libc => libsys}/arm/SYS.h (100%)
 rename lib/{libc/arm/sys => libsys/arm}/cerror.S (100%)
 rename lib/{libc/arm/sys => libsys/arm}/syscall.S (100%)
 rename lib/{libc/arm/sys => libsys/arm}/vfork.S (100%)
 rename lib/{libc/sys => libsys}/bind.2 (100%)
 rename lib/{libc/sys => libsys}/bindat.2 (100%)
 rename lib/{libc/sys => libsys}/brk.2 (100%)
 rename lib/{libc/sys => libsys}/brk.c (100%)
 rename lib/{libc/sys => libsys}/cap_enter.2 (100%)
 rename lib/{libc/sys => libsys}/cap_fcntls_limit.2 (100%)
 rename lib/{libc/sys => libsys}/cap_ioctls_limit.2 (100%)
 rename lib/{libc/sys => libsys}/cap_rights_limit.2 (100%)
 rename lib/{libc/sys => libsys}/chdir.2 (100%)
 rename lib/{libc/sys => libsys}/chflags.2 (100%)
 rename lib/{libc/sys => libsys}/chmod.2 (100%)
 rename lib/{libc/sys => libsys}/chown.2 (100%)
 rename lib/{libc/sys => libsys}/chroot.2 (100%)
 rename lib/{libc/sys => libsys}/clock_gettime.2 (100%)
 rename lib/{libc/sys => libsys}/clock_gettime.c (100%)
 rename lib/{libc/sys => libsys}/clock_nanosleep.c (100%)
 rename lib/{libc/sys => libsys}/close.2 (100%)
 rename lib/{libc/sys => libsys}/close.c (100%)
 rename lib/{libc/sys => libsys}/closefrom.2 (100%)
 rename lib/{libc/sys => libsys}/closefrom.c (100%)
 rename lib/{libc/sys => libsys}/compat-stub.c (100%)
 rename lib/{libc/sys => libsys}/connect.2 (100%)
 rename lib/{libc/sys => libsys}/connect.c (100%)
 rename lib/{libc/sys => libsys}/connectat.2 (100%)
 rename lib/{libc/sys => libsys}/copy_file_range.2 (100%)
 rename lib/{libc/sys => libsys}/cpuset.2 (100%)
 rename lib/{libc/sys => libsys}/cpuset_getaffinity.2 (100%)
 rename lib/{libc/sys => libsys}/cpuset_getdomain.2 (100%)
 rename lib/{libc/sys => libsys}/dup.2 (100%)
 rename lib/{libc/sys => libsys}/eventfd.2 (100%)
 rename lib/{libc/sys => libsys}/execve.2 (100%)
 rename lib/{libc/sys => libsys}/extattr_get_file.2 (100%)
 rename lib/{libc/sys => libsys}/fcntl.2 (100%)
 rename lib/{libc/sys => libsys}/fcntl.c (100%)
 rename lib/{libc/sys => libsys}/fdatasync.c (100%)
 rename lib/{libc/sys => libsys}/ffclock.2 (100%)
 rename lib/{libc/sys => libsys}/fhlink.2 (100%)
 rename lib/{libc/sys => libsys}/fhopen.2 (100%)
 rename lib/{libc/sys => libsys}/fhreadlink.2 (100%)
 rename lib/{libc/sys => libsys}/flock.2 (100%)
 rename lib/{libc/sys => libsys}/fork.2 (100%)
 rename lib/{libc/sys => libsys}/fork.c (100%)
 rename lib/{libc/sys => libsys}/fspacectl.2 (100%)
 rename lib/{libc/sys => libsys}/fsync.2 (100%)
 rename lib/{libc/sys => libsys}/fsync.c (100%)
 rename lib/{libc/sys => libsys}/getdents.c (100%)
 rename lib/{libc/sys => libsys}/getdirentries.2 (100%)
 rename lib/{libc/sys => libsys}/getdtablesize.2 (100%)
 rename lib/{libc/sys => libsys}/getfh.2 (100%)
 rename lib/{libc/sys => libsys}/getfsstat.2 (100%)
 rename lib/{libc/sys => libsys}/getgid.2 (100%)
 rename lib/{libc/sys => libsys}/getgroups.2 (100%)
 rename lib/{libc/sys => libsys}/getitimer.2 (100%)
 rename lib/{libc/sys => libsys}/getlogin.2 (100%)
 rename lib/{libc/sys => libsys}/getloginclass.2 (100%)
 rename lib/{libc/sys => libsys}/getpeername.2 (100%)
 rename lib/{libc/sys => libsys}/getpgrp.2 (100%)
 rename lib/{libc/sys => libsys}/getpid.2 (100%)
 rename lib/{libc/sys => libsys}/getpriority.2 (100%)
 rename lib/{libc/sys => libsys}/getrandom.2 (100%)
 rename lib/{libc/sys => libsys}/getrlimit.2 (100%)
 rename lib/{libc/sys => libsys}/getrusage.2 (100%)
 rename lib/{libc/sys => libsys}/getsid.2 (100%)
 rename lib/{libc/sys => libsys}/getsockname.2 (100%)
 rename lib/{libc/sys => libsys}/getsockopt.2 (100%)
 rename lib/{libc/sys => libsys}/gettimeofday.2 (100%)
 rename lib/{libc/sys => libsys}/gettimeofday.c (100%)
 rename lib/{libc/sys => libsys}/getuid.2 (100%)
 rename lib/{libc => libsys}/i386/SYS.h (100%)
 rename lib/{libc/i386/sys => libsys/i386}/cerror.S (100%)
 rename lib/{libc/i386/sys => libsys/i386}/getcontext.S (100%)
 rename lib/{libc/i386/sys => libsys/i386}/syscall.S (100%)
 rename lib/{libc/i386/sys => libsys/i386}/vfork.S (100%)
 rename lib/{libc/sys => libsys}/interposing_table.c (100%)
 rename lib/{libc/sys => libsys}/intro.2 (100%)
 rename lib/{libc/sys => libsys}/ioctl.2 (100%)
 rename lib/{libc/sys => libsys}/issetugid.2 (100%)
 rename lib/{libc/sys => libsys}/jail.2 (100%)
 rename lib/{libc/sys => libsys}/kcmp.2 (100%)
 rename lib/{libc/sys => libsys}/kenv.2 (100%)
 rename lib/{libc/sys => libsys}/kevent.c (100%)
 rename lib/{libc/sys => libsys}/kill.2 (100%)
 rename lib/{libc/sys => libsys}/kldfind.2 (100%)
 rename lib/{libc/sys => libsys}/kldfirstmod.2 (100%)
 rename lib/{libc/sys => libsys}/kldload.2 (100%)
 rename lib/{libc/sys => libsys}/kldnext.2 (100%)
 rename lib/{libc/sys => libsys}/kldstat.2 (100%)
 rename lib/{libc/sys => libsys}/kldsym.2 (100%)
 rename lib/{libc/sys => libsys}/kldunload.2 (100%)
 rename lib/{libc/sys => libsys}/kqueue.2 (100%)
 rename lib/{libc/sys => libsys}/ktrace.2 (100%)
 rename lib/{libc/sys => libsys}/link.2 (100%)
 rename lib/{libc/sys => libsys}/lio_listio.2 (100%)
 rename lib/{libc/sys => libsys}/listen.2 (100%)
 rename lib/{libc/sys => libsys}/lseek.2 (100%)
 rename lib/{libc/sys => libsys}/lstat.c (100%)
 rename lib/{libc/sys => libsys}/madvise.2 (100%)
 rename lib/{libc/sys => libsys}/mincore.2 (100%)
 rename lib/{libc/sys => libsys}/minherit.2 (100%)
 rename lib/{libc/sys => libsys}/mkdir.2 (100%)
 rename lib/{libc/sys => libsys}/mkfifo.2 (100%)
 rename lib/{libc/sys => libsys}/mknod.2 (100%)
 rename lib/{libc/sys => libsys}/mknod.c (100%)
 rename lib/{libc/sys => libsys}/mlock.2 (100%)
 rename lib/{libc/sys => libsys}/mlockall.2 (100%)
 rename lib/{libc/sys => libsys}/mmap.2 (100%)
 rename lib/{libc/sys => libsys}/modfind.2 (100%)
 rename lib/{libc/sys => libsys}/modnext.2 (100%)
 rename lib/{libc/sys => libsys}/modstat.2 (100%)
 rename lib/{libc/sys => libsys}/mount.2 (100%)
 rename lib/{libc/sys => libsys}/mprotect.2 (100%)
 rename lib/{libc/sys => libsys}/mq_close.2 (100%)
 rename lib/{libc/sys => libsys}/mq_getattr.2 (100%)
 rename lib/{libc/sys => libsys}/mq_notify.2 (100%)
 rename lib/{libc/sys => libsys}/mq_open.2 (100%)
 rename lib/{libc/sys => libsys}/mq_receive.2 (100%)
 rename lib/{libc/sys => libsys}/mq_send.2 (100%)
 rename lib/{libc/sys => libsys}/mq_setattr.2 (100%)
 rename lib/{libc/sys => libsys}/mq_unlink.2 (100%)
 rename lib/{libc/sys => libsys}/msgctl.2 (100%)
 rename lib/{libc/sys => libsys}/msgget.2 (100%)
 rename lib/{libc/sys => libsys}/msgrcv.2 (100%)
 rename lib/{libc/sys => libsys}/msgsnd.2 (100%)
 rename lib/{libc/sys => libsys}/msync.2 (100%)
 rename lib/{libc/sys => libsys}/msync.c (100%)
 rename lib/{libc/sys => libsys}/munmap.2 (100%)
 rename lib/{libc/sys => libsys}/nanosleep.2 (100%)
 rename lib/{libc/sys => libsys}/nanosleep.c (100%)
 rename lib/{libc/sys => libsys}/nfssvc.2 (100%)
 rename lib/{libc/sys => libsys}/ntp_adjtime.2 (100%)
 rename lib/{libc/sys => libsys}/open.2 (100%)
 rename lib/{libc/sys => libsys}/open.c (100%)
 rename lib/{libc/sys => libsys}/openat.c (100%)
 rename lib/{libc/sys => libsys}/pathconf.2 (100%)
 rename lib/{libc/sys => libsys}/pdfork.2 (100%)
 rename lib/{libc/sys => libsys}/pdfork.c (100%)
 rename lib/{libc/sys => libsys}/pipe.2 (100%)
 rename lib/{libc/sys => libsys}/pipe.c (100%)
 rename lib/{libc/sys => libsys}/poll.2 (100%)
 rename lib/{libc/sys => libsys}/poll.c (100%)
 rename lib/{libc/sys => libsys}/posix_fadvise.2 (100%)
 rename lib/{libc/sys => libsys}/posix_fallocate.2 (100%)
 rename lib/{libc/sys => libsys}/posix_openpt.2 (100%)
 rename lib/{libc => libsys}/powerpc/SYS.h (100%)
 rename lib/{libc/powerpc/sys => libsys/powerpc}/cerror.S (100%)
 rename lib/{libc => libsys}/powerpc64/SYS.h (100%)
 rename lib/{libc/powerpc64/sys => libsys/powerpc64}/cerror.S (100%)
 rename lib/{libc/sys => libsys}/ppoll.c (100%)
 rename lib/{libc/sys => libsys}/procctl.2 (100%)
 rename lib/{libc/sys => libsys}/profil.2 (100%)
 rename lib/{libc/sys => libsys}/pselect.2 (100%)
 rename lib/{libc/sys => libsys}/pselect.c (100%)
 rename lib/{libc/sys => libsys}/ptrace.2 (100%)
 rename lib/{libc/sys => libsys}/ptrace.c (100%)
 rename lib/{libc/sys => libsys}/quotactl.2 (100%)
 rename lib/{libc/sys => libsys}/rctl_add_rule.2 (100%)
 rename lib/{libc/sys => libsys}/read.2 (100%)
 rename lib/{libc/sys => libsys}/read.c (100%)
 rename lib/{libc/sys => libsys}/readlink.2 (100%)
 rename lib/{libc/sys => libsys}/readv.c (100%)
 rename lib/{libc/sys => libsys}/reboot.2 (100%)
 rename lib/{libc/sys => libsys}/recv.2 (100%)
 rename lib/{libc/sys => libsys}/recvfrom.c (100%)
 rename lib/{libc/sys => libsys}/recvmsg.c (100%)
 rename lib/{libc/sys => libsys}/rename.2 (100%)
 rename lib/{libc/sys => libsys}/revoke.2 (100%)
 rename lib/{libc/sys => libsys}/rfork.2 (100%)
 rename lib/{libc => libsys}/riscv/SYS.h (100%)
 rename lib/{libc/riscv/sys => libsys/riscv}/cerror.S (100%)
 rename lib/{libc/riscv/sys => libsys/riscv}/syscall.S (100%)
 rename lib/{libc/riscv/sys => libsys/riscv}/vfork.S (100%)
 rename lib/{libc/sys => libsys}/rmdir.2 (100%)
 rename lib/{libc/sys => libsys}/rtprio.2 (100%)
 rename lib/{libc/sys => libsys}/sched_get_priority_max.2 (100%)
 rename lib/{libc/sys => libsys}/sched_setparam.2 (100%)
 rename lib/{libc/sys => libsys}/sched_setscheduler.2 (100%)
 rename lib/{libc/sys => libsys}/sched_yield.2 (100%)
 rename lib/{libc/sys => libsys}/sctp_generic_recvmsg.2 (100%)
 rename lib/{libc/sys => libsys}/sctp_generic_sendmsg.2 (100%)
 rename lib/{libc/sys => libsys}/sctp_peeloff.2 (100%)
 rename lib/{libc/sys => libsys}/select.2 (100%)
 rename lib/{libc/sys => libsys}/select.c (100%)
 rename lib/{libc/sys => libsys}/semctl.2 (100%)
 rename lib/{libc/sys => libsys}/semget.2 (100%)
 rename lib/{libc/sys => libsys}/semop.2 (100%)
 rename lib/{libc/sys => libsys}/send.2 (100%)
 rename lib/{libc/sys => libsys}/sendfile.2 (100%)
 rename lib/{libc/sys => libsys}/sendmsg.c (100%)
 rename lib/{libc/sys => libsys}/sendto.c (100%)
 rename lib/{libc/sys => libsys}/setcontext.c (100%)
 rename lib/{libc/sys => libsys}/setfib.2 (100%)
 rename lib/{libc/sys => libsys}/setgroups.2 (100%)
 rename lib/{libc/sys => libsys}/setpgid.2 (100%)
 rename lib/{libc/sys => libsys}/setregid.2 (100%)
 rename lib/{libc/sys => libsys}/setresuid.2 (100%)
 rename lib/{libc/sys => libsys}/setreuid.2 (100%)
 rename lib/{libc/sys => libsys}/setsid.2 (100%)
 rename lib/{libc/sys => libsys}/setuid.2 (100%)
 rename lib/{libc/sys => libsys}/shm_open.2 (100%)
 rename lib/{libc/sys => libsys}/shm_open.c (100%)
 rename lib/{libc/sys => libsys}/shmat.2 (100%)
 rename lib/{libc/sys => libsys}/shmctl.2 (100%)
 rename lib/{libc/sys => libsys}/shmget.2 (100%)
 rename lib/{libc/sys => libsys}/shutdown.2 (100%)
 rename lib/{libc/sys => libsys}/sigaction.2 (100%)
 rename lib/{libc/sys => libsys}/sigaction.c (100%)
 rename lib/{libc/sys => libsys}/sigaltstack.2 (100%)
 rename lib/{libc/sys => libsys}/sigfastblock.2 (100%)
 rename lib/{libc/sys => libsys}/sigpending.2 (100%)
 rename lib/{libc/sys => libsys}/sigprocmask.2 (100%)
 rename lib/{libc/sys => libsys}/sigprocmask.c (100%)
 rename lib/{libc/sys => libsys}/sigqueue.2 (100%)
 rename lib/{libc/sys => libsys}/sigreturn.2 (100%)
 rename lib/{libc/sys => libsys}/sigstack.2 (100%)
 rename lib/{libc/sys => libsys}/sigsuspend.2 (100%)
 rename lib/{libc/sys => libsys}/sigsuspend.c (100%)
 rename lib/{libc/sys => libsys}/sigtimedwait.c (100%)
 rename lib/{libc/sys => libsys}/sigwait.2 (100%)
 rename lib/{libc/sys => libsys}/sigwait.c (100%)
 rename lib/{libc/sys => libsys}/sigwaitinfo.2 (100%)
 rename lib/{libc/sys => libsys}/sigwaitinfo.c (100%)
 rename lib/{libc/sys => libsys}/socket.2 (100%)
 rename lib/{libc/sys => libsys}/socketpair.2 (100%)
 rename lib/{libc/sys => libsys}/stat.2 (100%)
 rename lib/{libc/sys => libsys}/stat.c (100%)
 rename lib/{libc/sys => libsys}/statfs.2 (100%)
 rename lib/{libc/sys => libsys}/swapcontext.c (100%)
 rename lib/{libc/sys => libsys}/swapon.2 (100%)
 rename lib/{libc/sys => libsys}/symlink.2 (100%)
 rename lib/{libc/sys => libsys}/sync.2 (100%)
 rename lib/{libc/sys => libsys}/sysarch.2 (100%)
 rename lib/{libc/sys => libsys}/syscall.2 (100%)
 rename lib/{libc/sys => libsys}/thr_exit.2 (100%)
 rename lib/{libc/sys => libsys}/thr_kill.2 (100%)
 rename lib/{libc/sys => libsys}/thr_new.2 (100%)
 rename lib/{libc/sys => libsys}/thr_self.2 (100%)
 rename lib/{libc/sys => libsys}/thr_set_name.2 (100%)
 rename lib/{libc/sys => libsys}/thr_suspend.2 (100%)
 rename lib/{libc/sys => libsys}/thr_wake.2 (100%)
 rename lib/{libc/sys => libsys}/timer_create.2 (100%)
 rename lib/{libc/sys => libsys}/timer_delete.2 (100%)
 rename lib/{libc/sys => libsys}/timer_settime.2 (100%)
 rename lib/{libc/sys => libsys}/timerfd.2 (100%)
 rename lib/{libc/sys => libsys}/truncate.2 (100%)
 rename lib/{libc/sys => libsys}/umask.2 (100%)
 rename lib/{libc/sys => libsys}/undelete.2 (100%)
 rename lib/{libc/sys => libsys}/unlink.2 (100%)
 rename lib/{libc/sys => libsys}/utimensat.2 (100%)
 rename lib/{libc/sys => libsys}/utimes.2 (100%)
 rename lib/{libc/sys => libsys}/utrace.2 (100%)
 rename lib/{libc/sys => libsys}/uuidgen.2 (100%)
 rename lib/{libc/sys => libsys}/vadvise.c (100%)
 rename lib/{libc/sys => libsys}/vfork.2 (100%)
 rename lib/{libc/sys => libsys}/wait.2 (100%)
 rename lib/{libc/sys => libsys}/wait4.c (100%)
 rename lib/{libc/sys => libsys}/wait6.c (100%)
 rename lib/{libc/sys => libsys}/write.2 (100%)
 rename lib/{libc/sys => libsys}/write.c (100%)
 rename lib/{libc/sys => libsys}/writev.c (100%)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 1f256449ffce..f96dddbf99f6 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -5,6 +5,7 @@ SHLIBDIR?= /lib
 .include <src.opts.mk>
 
 LIBC_SRCTOP?= ${.CURDIR}
+LIBSYS_SRCTOP?=	${.CURDIR:H}/libsys
 
 # Pick the current architecture directory for libc. In general, this is named
 # MACHINE_CPUARCH, but some ABIs are different enough to require their own libc,
@@ -38,6 +39,7 @@ SHLIB_LDSCRIPT_LINKS=libxnet.so
 WARNS?=	2
 CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
 CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
+CFLAGS+=-I${LIBSYS_SRCTOP}/${LIBC_ARCH}
 .if ${MK_NLS} != "no"
 CFLAGS+=-DNLS
 .endif
diff --git a/lib/libc/powerpcspe/sys/Makefile.inc b/lib/libc/powerpcspe/sys/Makefile.inc
index 328c43d2b1ca..70662c94db0b 100644
--- a/lib/libc/powerpcspe/sys/Makefile.inc
+++ b/lib/libc/powerpcspe/sys/Makefile.inc
@@ -1,2 +1,3 @@
 .PATH: ${LIBC_SRCTOP}/powerpc/sys
+.PATH: ${LIBSYS_SRCTOP}/powerpc
 .sinclude "${LIBC_SRCTOP}/powerpc/sys/Makefile.inc"
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index b533443f96b2..2c7472ebad06 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,6 +1,7 @@
 
 # sys sources
-.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys ${LIBC_SRCTOP}/sys
+.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/sys
+.PATH: ${LIBSYS_SRCTOP}/${LIBC_ARCH} ${LIBSYS_SRCTOP}
 
 # Include the generated makefile containing the *complete* list
 # of syscall names in MIASM.
@@ -109,7 +110,7 @@ SPSEUDO= ${PSEUDO:S/.o/.S/}
 
 SRCS+=	${SASM} ${SPSEUDO}
 
-SYM_MAPS+=	${LIBC_SRCTOP}/sys/Symbol.map
+SYM_MAPS+=	${LIBSYS_SRCTOP}/Symbol.sys.map
 
 # Generated files
 CLEANFILES+=	${SASM} ${SPSEUDO}
diff --git a/lib/libc/sys/POSIX2x_Fork.c b/lib/libsys/POSIX2x_Fork.c
similarity index 100%
rename from lib/libc/sys/POSIX2x_Fork.c
rename to lib/libsys/POSIX2x_Fork.c
diff --git a/lib/libc/sys/Symbol.map b/lib/libsys/Symbol.sys.map
similarity index 100%
rename from lib/libc/sys/Symbol.map
rename to lib/libsys/Symbol.sys.map
diff --git a/lib/libc/sys/__error.c b/lib/libsys/__error.c
similarity index 100%
rename from lib/libc/sys/__error.c
rename to lib/libsys/__error.c
diff --git a/lib/libc/sys/__vdso_gettimeofday.c b/lib/libsys/__vdso_gettimeofday.c
similarity index 100%
rename from lib/libc/sys/__vdso_gettimeofday.c
rename to lib/libsys/__vdso_gettimeofday.c
diff --git a/lib/libc/sys/_exit.2 b/lib/libsys/_exit.2
similarity index 100%
rename from lib/libc/sys/_exit.2
rename to lib/libsys/_exit.2
diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libsys/_umtx_op.2
similarity index 100%
rename from lib/libc/sys/_umtx_op.2
rename to lib/libsys/_umtx_op.2
diff --git a/lib/libc/aarch64/SYS.h b/lib/libsys/aarch64/SYS.h
similarity index 100%
rename from lib/libc/aarch64/SYS.h
rename to lib/libsys/aarch64/SYS.h
diff --git a/lib/libc/aarch64/sys/cerror.S b/lib/libsys/aarch64/cerror.S
similarity index 100%
rename from lib/libc/aarch64/sys/cerror.S
rename to lib/libsys/aarch64/cerror.S
diff --git a/lib/libc/aarch64/sys/syscall.S b/lib/libsys/aarch64/syscall.S
similarity index 100%
rename from lib/libc/aarch64/sys/syscall.S
rename to lib/libsys/aarch64/syscall.S
diff --git a/lib/libc/aarch64/sys/vfork.S b/lib/libsys/aarch64/vfork.S
similarity index 100%
rename from lib/libc/aarch64/sys/vfork.S
rename to lib/libsys/aarch64/vfork.S
diff --git a/lib/libc/sys/abort2.2 b/lib/libsys/abort2.2
similarity index 100%
rename from lib/libc/sys/abort2.2
rename to lib/libsys/abort2.2
diff --git a/lib/libc/sys/accept.2 b/lib/libsys/accept.2
similarity index 100%
rename from lib/libc/sys/accept.2
rename to lib/libsys/accept.2
diff --git a/lib/libc/sys/accept.c b/lib/libsys/accept.c
similarity index 100%
rename from lib/libc/sys/accept.c
rename to lib/libsys/accept.c
diff --git a/lib/libc/sys/accept4.c b/lib/libsys/accept4.c
similarity index 100%
rename from lib/libc/sys/accept4.c
rename to lib/libsys/accept4.c
diff --git a/lib/libc/sys/access.2 b/lib/libsys/access.2
similarity index 100%
rename from lib/libc/sys/access.2
rename to lib/libsys/access.2
diff --git a/lib/libc/sys/acct.2 b/lib/libsys/acct.2
similarity index 100%
rename from lib/libc/sys/acct.2
rename to lib/libsys/acct.2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libsys/adjtime.2
similarity index 100%
rename from lib/libc/sys/adjtime.2
rename to lib/libsys/adjtime.2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libsys/aio_cancel.2
similarity index 100%
rename from lib/libc/sys/aio_cancel.2
rename to lib/libsys/aio_cancel.2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libsys/aio_error.2
similarity index 100%
rename from lib/libc/sys/aio_error.2
rename to lib/libsys/aio_error.2
diff --git a/lib/libc/sys/aio_fsync.2 b/lib/libsys/aio_fsync.2
similarity index 100%
rename from lib/libc/sys/aio_fsync.2
rename to lib/libsys/aio_fsync.2
diff --git a/lib/libc/sys/aio_mlock.2 b/lib/libsys/aio_mlock.2
similarity index 100%
rename from lib/libc/sys/aio_mlock.2
rename to lib/libsys/aio_mlock.2
diff --git a/lib/libc/sys/aio_read.2 b/lib/libsys/aio_read.2
similarity index 100%
rename from lib/libc/sys/aio_read.2
rename to lib/libsys/aio_read.2
diff --git a/lib/libc/sys/aio_return.2 b/lib/libsys/aio_return.2
similarity index 100%
rename from lib/libc/sys/aio_return.2
rename to lib/libsys/aio_return.2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libsys/aio_suspend.2
similarity index 100%
rename from lib/libc/sys/aio_suspend.2
rename to lib/libsys/aio_suspend.2
diff --git a/lib/libc/sys/aio_suspend.c b/lib/libsys/aio_suspend.c
similarity index 100%
rename from lib/libc/sys/aio_suspend.c
rename to lib/libsys/aio_suspend.c
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libsys/aio_waitcomplete.2
similarity index 100%
rename from lib/libc/sys/aio_waitcomplete.2
rename to lib/libsys/aio_waitcomplete.2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libsys/aio_write.2
similarity index 100%
rename from lib/libc/sys/aio_write.2
rename to lib/libsys/aio_write.2
diff --git a/lib/libc/amd64/SYS.h b/lib/libsys/amd64/SYS.h
similarity index 100%
rename from lib/libc/amd64/SYS.h
rename to lib/libsys/amd64/SYS.h
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libsys/amd64/cerror.S
similarity index 100%
rename from lib/libc/amd64/sys/cerror.S
rename to lib/libsys/amd64/cerror.S
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libsys/amd64/getcontext.S
similarity index 100%
rename from lib/libc/amd64/sys/getcontext.S
rename to lib/libsys/amd64/getcontext.S
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libsys/amd64/vfork.S
similarity index 100%
rename from lib/libc/amd64/sys/vfork.S
rename to lib/libsys/amd64/vfork.S
diff --git a/lib/libc/arm/SYS.h b/lib/libsys/arm/SYS.h
similarity index 100%
rename from lib/libc/arm/SYS.h
rename to lib/libsys/arm/SYS.h
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libsys/arm/cerror.S
similarity index 100%
rename from lib/libc/arm/sys/cerror.S
rename to lib/libsys/arm/cerror.S
diff --git a/lib/libc/arm/sys/syscall.S b/lib/libsys/arm/syscall.S
similarity index 100%
rename from lib/libc/arm/sys/syscall.S
rename to lib/libsys/arm/syscall.S
diff --git a/lib/libc/arm/sys/vfork.S b/lib/libsys/arm/vfork.S
similarity index 100%
rename from lib/libc/arm/sys/vfork.S
rename to lib/libsys/arm/vfork.S
diff --git a/lib/libc/sys/bind.2 b/lib/libsys/bind.2
similarity index 100%
rename from lib/libc/sys/bind.2
rename to lib/libsys/bind.2
diff --git a/lib/libc/sys/bindat.2 b/lib/libsys/bindat.2
similarity index 100%
rename from lib/libc/sys/bindat.2
rename to lib/libsys/bindat.2
diff --git a/lib/libc/sys/brk.2 b/lib/libsys/brk.2
similarity index 100%
rename from lib/libc/sys/brk.2
rename to lib/libsys/brk.2
diff --git a/lib/libc/sys/brk.c b/lib/libsys/brk.c
similarity index 100%
rename from lib/libc/sys/brk.c
rename to lib/libsys/brk.c
diff --git a/lib/libc/sys/cap_enter.2 b/lib/libsys/cap_enter.2
similarity index 100%
rename from lib/libc/sys/cap_enter.2
rename to lib/libsys/cap_enter.2
diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libsys/cap_fcntls_limit.2
similarity index 100%
rename from lib/libc/sys/cap_fcntls_limit.2
rename to lib/libsys/cap_fcntls_limit.2
diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libsys/cap_ioctls_limit.2
similarity index 100%
rename from lib/libc/sys/cap_ioctls_limit.2
rename to lib/libsys/cap_ioctls_limit.2
diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libsys/cap_rights_limit.2
similarity index 100%
rename from lib/libc/sys/cap_rights_limit.2
rename to lib/libsys/cap_rights_limit.2
diff --git a/lib/libc/sys/chdir.2 b/lib/libsys/chdir.2
similarity index 100%
rename from lib/libc/sys/chdir.2
rename to lib/libsys/chdir.2
diff --git a/lib/libc/sys/chflags.2 b/lib/libsys/chflags.2
similarity index 100%
rename from lib/libc/sys/chflags.2
rename to lib/libsys/chflags.2
diff --git a/lib/libc/sys/chmod.2 b/lib/libsys/chmod.2
similarity index 100%
rename from lib/libc/sys/chmod.2
rename to lib/libsys/chmod.2
diff --git a/lib/libc/sys/chown.2 b/lib/libsys/chown.2
similarity index 100%
rename from lib/libc/sys/chown.2
rename to lib/libsys/chown.2
diff --git a/lib/libc/sys/chroot.2 b/lib/libsys/chroot.2
similarity index 100%
rename from lib/libc/sys/chroot.2
rename to lib/libsys/chroot.2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libsys/clock_gettime.2
similarity index 100%
rename from lib/libc/sys/clock_gettime.2
rename to lib/libsys/clock_gettime.2
diff --git a/lib/libc/sys/clock_gettime.c b/lib/libsys/clock_gettime.c
similarity index 100%
rename from lib/libc/sys/clock_gettime.c
rename to lib/libsys/clock_gettime.c
diff --git a/lib/libc/sys/clock_nanosleep.c b/lib/libsys/clock_nanosleep.c
similarity index 100%
rename from lib/libc/sys/clock_nanosleep.c
rename to lib/libsys/clock_nanosleep.c
diff --git a/lib/libc/sys/close.2 b/lib/libsys/close.2
similarity index 100%
rename from lib/libc/sys/close.2
rename to lib/libsys/close.2
diff --git a/lib/libc/sys/close.c b/lib/libsys/close.c
similarity index 100%
rename from lib/libc/sys/close.c
rename to lib/libsys/close.c
diff --git a/lib/libc/sys/closefrom.2 b/lib/libsys/closefrom.2
similarity index 100%
rename from lib/libc/sys/closefrom.2
rename to lib/libsys/closefrom.2
diff --git a/lib/libc/sys/closefrom.c b/lib/libsys/closefrom.c
similarity index 100%
rename from lib/libc/sys/closefrom.c
rename to lib/libsys/closefrom.c
diff --git a/lib/libc/sys/compat-stub.c b/lib/libsys/compat-stub.c
similarity index 100%
rename from lib/libc/sys/compat-stub.c
rename to lib/libsys/compat-stub.c
diff --git a/lib/libc/sys/connect.2 b/lib/libsys/connect.2
similarity index 100%
rename from lib/libc/sys/connect.2
rename to lib/libsys/connect.2
diff --git a/lib/libc/sys/connect.c b/lib/libsys/connect.c
similarity index 100%
rename from lib/libc/sys/connect.c
rename to lib/libsys/connect.c
diff --git a/lib/libc/sys/connectat.2 b/lib/libsys/connectat.2
similarity index 100%
rename from lib/libc/sys/connectat.2
rename to lib/libsys/connectat.2
diff --git a/lib/libc/sys/copy_file_range.2 b/lib/libsys/copy_file_range.2
similarity index 100%
rename from lib/libc/sys/copy_file_range.2
rename to lib/libsys/copy_file_range.2
diff --git a/lib/libc/sys/cpuset.2 b/lib/libsys/cpuset.2
similarity index 100%
rename from lib/libc/sys/cpuset.2
rename to lib/libsys/cpuset.2
diff --git a/lib/libc/sys/cpuset_getaffinity.2 b/lib/libsys/cpuset_getaffinity.2
similarity index 100%
rename from lib/libc/sys/cpuset_getaffinity.2
rename to lib/libsys/cpuset_getaffinity.2
diff --git a/lib/libc/sys/cpuset_getdomain.2 b/lib/libsys/cpuset_getdomain.2
similarity index 100%
rename from lib/libc/sys/cpuset_getdomain.2
rename to lib/libsys/cpuset_getdomain.2
diff --git a/lib/libc/sys/dup.2 b/lib/libsys/dup.2
similarity index 100%
rename from lib/libc/sys/dup.2
rename to lib/libsys/dup.2
diff --git a/lib/libc/sys/eventfd.2 b/lib/libsys/eventfd.2
similarity index 100%
rename from lib/libc/sys/eventfd.2
rename to lib/libsys/eventfd.2
diff --git a/lib/libc/sys/execve.2 b/lib/libsys/execve.2
similarity index 100%
rename from lib/libc/sys/execve.2
rename to lib/libsys/execve.2
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libsys/extattr_get_file.2
similarity index 100%
rename from lib/libc/sys/extattr_get_file.2
rename to lib/libsys/extattr_get_file.2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libsys/fcntl.2
similarity index 100%
rename from lib/libc/sys/fcntl.2
rename to lib/libsys/fcntl.2
diff --git a/lib/libc/sys/fcntl.c b/lib/libsys/fcntl.c
similarity index 100%
rename from lib/libc/sys/fcntl.c
rename to lib/libsys/fcntl.c
diff --git a/lib/libc/sys/fdatasync.c b/lib/libsys/fdatasync.c
similarity index 100%
rename from lib/libc/sys/fdatasync.c
rename to lib/libsys/fdatasync.c
diff --git a/lib/libc/sys/ffclock.2 b/lib/libsys/ffclock.2
similarity index 100%
rename from lib/libc/sys/ffclock.2
rename to lib/libsys/ffclock.2
diff --git a/lib/libc/sys/fhlink.2 b/lib/libsys/fhlink.2
similarity index 100%
rename from lib/libc/sys/fhlink.2
rename to lib/libsys/fhlink.2
diff --git a/lib/libc/sys/fhopen.2 b/lib/libsys/fhopen.2
similarity index 100%
rename from lib/libc/sys/fhopen.2
rename to lib/libsys/fhopen.2
diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libsys/fhreadlink.2
similarity index 100%
rename from lib/libc/sys/fhreadlink.2
rename to lib/libsys/fhreadlink.2
diff --git a/lib/libc/sys/flock.2 b/lib/libsys/flock.2
similarity index 100%
rename from lib/libc/sys/flock.2
rename to lib/libsys/flock.2
diff --git a/lib/libc/sys/fork.2 b/lib/libsys/fork.2
similarity index 100%
rename from lib/libc/sys/fork.2
rename to lib/libsys/fork.2
diff --git a/lib/libc/sys/fork.c b/lib/libsys/fork.c
similarity index 100%
rename from lib/libc/sys/fork.c
rename to lib/libsys/fork.c
diff --git a/lib/libc/sys/fspacectl.2 b/lib/libsys/fspacectl.2
similarity index 100%
rename from lib/libc/sys/fspacectl.2
rename to lib/libsys/fspacectl.2
diff --git a/lib/libc/sys/fsync.2 b/lib/libsys/fsync.2
similarity index 100%
rename from lib/libc/sys/fsync.2
rename to lib/libsys/fsync.2
diff --git a/lib/libc/sys/fsync.c b/lib/libsys/fsync.c
similarity index 100%
rename from lib/libc/sys/fsync.c
rename to lib/libsys/fsync.c
diff --git a/lib/libc/sys/getdents.c b/lib/libsys/getdents.c
similarity index 100%
rename from lib/libc/sys/getdents.c
rename to lib/libsys/getdents.c
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libsys/getdirentries.2
similarity index 100%
rename from lib/libc/sys/getdirentries.2
rename to lib/libsys/getdirentries.2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libsys/getdtablesize.2
similarity index 100%
rename from lib/libc/sys/getdtablesize.2
rename to lib/libsys/getdtablesize.2
diff --git a/lib/libc/sys/getfh.2 b/lib/libsys/getfh.2
similarity index 100%
rename from lib/libc/sys/getfh.2
rename to lib/libsys/getfh.2
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libsys/getfsstat.2
similarity index 100%
rename from lib/libc/sys/getfsstat.2
rename to lib/libsys/getfsstat.2
diff --git a/lib/libc/sys/getgid.2 b/lib/libsys/getgid.2
similarity index 100%
rename from lib/libc/sys/getgid.2
rename to lib/libsys/getgid.2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libsys/getgroups.2
similarity index 100%
rename from lib/libc/sys/getgroups.2
rename to lib/libsys/getgroups.2
diff --git a/lib/libc/sys/getitimer.2 b/lib/libsys/getitimer.2
similarity index 100%
rename from lib/libc/sys/getitimer.2
rename to lib/libsys/getitimer.2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libsys/getlogin.2
similarity index 100%
rename from lib/libc/sys/getlogin.2
rename to lib/libsys/getlogin.2
diff --git a/lib/libc/sys/getloginclass.2 b/lib/libsys/getloginclass.2
similarity index 100%
rename from lib/libc/sys/getloginclass.2
rename to lib/libsys/getloginclass.2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libsys/getpeername.2
similarity index 100%
rename from lib/libc/sys/getpeername.2
rename to lib/libsys/getpeername.2
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libsys/getpgrp.2
similarity index 100%
rename from lib/libc/sys/getpgrp.2
rename to lib/libsys/getpgrp.2
diff --git a/lib/libc/sys/getpid.2 b/lib/libsys/getpid.2
similarity index 100%
rename from lib/libc/sys/getpid.2
rename to lib/libsys/getpid.2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libsys/getpriority.2
similarity index 100%
rename from lib/libc/sys/getpriority.2
rename to lib/libsys/getpriority.2
diff --git a/lib/libc/sys/getrandom.2 b/lib/libsys/getrandom.2
similarity index 100%
rename from lib/libc/sys/getrandom.2
rename to lib/libsys/getrandom.2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libsys/getrlimit.2
similarity index 100%
rename from lib/libc/sys/getrlimit.2
rename to lib/libsys/getrlimit.2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libsys/getrusage.2
similarity index 100%
rename from lib/libc/sys/getrusage.2
rename to lib/libsys/getrusage.2
diff --git a/lib/libc/sys/getsid.2 b/lib/libsys/getsid.2
similarity index 100%
rename from lib/libc/sys/getsid.2
rename to lib/libsys/getsid.2
diff --git a/lib/libc/sys/getsockname.2 b/lib/libsys/getsockname.2
similarity index 100%
rename from lib/libc/sys/getsockname.2
rename to lib/libsys/getsockname.2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libsys/getsockopt.2
similarity index 100%
rename from lib/libc/sys/getsockopt.2
rename to lib/libsys/getsockopt.2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libsys/gettimeofday.2
similarity index 100%
rename from lib/libc/sys/gettimeofday.2
rename to lib/libsys/gettimeofday.2
diff --git a/lib/libc/sys/gettimeofday.c b/lib/libsys/gettimeofday.c
similarity index 100%
rename from lib/libc/sys/gettimeofday.c
rename to lib/libsys/gettimeofday.c
diff --git a/lib/libc/sys/getuid.2 b/lib/libsys/getuid.2
similarity index 100%
rename from lib/libc/sys/getuid.2
rename to lib/libsys/getuid.2
diff --git a/lib/libc/i386/SYS.h b/lib/libsys/i386/SYS.h
similarity index 100%
rename from lib/libc/i386/SYS.h
rename to lib/libsys/i386/SYS.h
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libsys/i386/cerror.S
similarity index 100%
rename from lib/libc/i386/sys/cerror.S
rename to lib/libsys/i386/cerror.S
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libsys/i386/getcontext.S
similarity index 100%
rename from lib/libc/i386/sys/getcontext.S
rename to lib/libsys/i386/getcontext.S
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libsys/i386/syscall.S
similarity index 100%
rename from lib/libc/i386/sys/syscall.S
rename to lib/libsys/i386/syscall.S
diff --git a/lib/libc/i386/sys/vfork.S b/lib/libsys/i386/vfork.S
similarity index 100%
rename from lib/libc/i386/sys/vfork.S
rename to lib/libsys/i386/vfork.S
diff --git a/lib/libc/sys/interposing_table.c b/lib/libsys/interposing_table.c
similarity index 100%
rename from lib/libc/sys/interposing_table.c
rename to lib/libsys/interposing_table.c
diff --git a/lib/libc/sys/intro.2 b/lib/libsys/intro.2
similarity index 100%
rename from lib/libc/sys/intro.2
rename to lib/libsys/intro.2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libsys/ioctl.2
similarity index 100%
rename from lib/libc/sys/ioctl.2
rename to lib/libsys/ioctl.2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libsys/issetugid.2
similarity index 100%
rename from lib/libc/sys/issetugid.2
rename to lib/libsys/issetugid.2
diff --git a/lib/libc/sys/jail.2 b/lib/libsys/jail.2
similarity index 100%
rename from lib/libc/sys/jail.2
rename to lib/libsys/jail.2
diff --git a/lib/libc/sys/kcmp.2 b/lib/libsys/kcmp.2
similarity index 100%
rename from lib/libc/sys/kcmp.2
rename to lib/libsys/kcmp.2
diff --git a/lib/libc/sys/kenv.2 b/lib/libsys/kenv.2
similarity index 100%
rename from lib/libc/sys/kenv.2
rename to lib/libsys/kenv.2
diff --git a/lib/libc/sys/kevent.c b/lib/libsys/kevent.c
similarity index 100%
rename from lib/libc/sys/kevent.c
rename to lib/libsys/kevent.c
diff --git a/lib/libc/sys/kill.2 b/lib/libsys/kill.2
similarity index 100%
rename from lib/libc/sys/kill.2
rename to lib/libsys/kill.2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libsys/kldfind.2
similarity index 100%
rename from lib/libc/sys/kldfind.2
rename to lib/libsys/kldfind.2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libsys/kldfirstmod.2
similarity index 100%
rename from lib/libc/sys/kldfirstmod.2
rename to lib/libsys/kldfirstmod.2
diff --git a/lib/libc/sys/kldload.2 b/lib/libsys/kldload.2
similarity index 100%
rename from lib/libc/sys/kldload.2
rename to lib/libsys/kldload.2
diff --git a/lib/libc/sys/kldnext.2 b/lib/libsys/kldnext.2
similarity index 100%
rename from lib/libc/sys/kldnext.2
rename to lib/libsys/kldnext.2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libsys/kldstat.2
similarity index 100%
rename from lib/libc/sys/kldstat.2
rename to lib/libsys/kldstat.2
diff --git a/lib/libc/sys/kldsym.2 b/lib/libsys/kldsym.2
similarity index 100%
rename from lib/libc/sys/kldsym.2
rename to lib/libsys/kldsym.2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libsys/kldunload.2
similarity index 100%
rename from lib/libc/sys/kldunload.2
rename to lib/libsys/kldunload.2
diff --git a/lib/libc/sys/kqueue.2 b/lib/libsys/kqueue.2
similarity index 100%
rename from lib/libc/sys/kqueue.2
rename to lib/libsys/kqueue.2
diff --git a/lib/libc/sys/ktrace.2 b/lib/libsys/ktrace.2
similarity index 100%
rename from lib/libc/sys/ktrace.2
rename to lib/libsys/ktrace.2
diff --git a/lib/libc/sys/link.2 b/lib/libsys/link.2
similarity index 100%
rename from lib/libc/sys/link.2
rename to lib/libsys/link.2
diff --git a/lib/libc/sys/lio_listio.2 b/lib/libsys/lio_listio.2
similarity index 100%
rename from lib/libc/sys/lio_listio.2
rename to lib/libsys/lio_listio.2
diff --git a/lib/libc/sys/listen.2 b/lib/libsys/listen.2
similarity index 100%
rename from lib/libc/sys/listen.2
rename to lib/libsys/listen.2
diff --git a/lib/libc/sys/lseek.2 b/lib/libsys/lseek.2
similarity index 100%
rename from lib/libc/sys/lseek.2
rename to lib/libsys/lseek.2
diff --git a/lib/libc/sys/lstat.c b/lib/libsys/lstat.c
similarity index 100%
rename from lib/libc/sys/lstat.c
rename to lib/libsys/lstat.c
diff --git a/lib/libc/sys/madvise.2 b/lib/libsys/madvise.2
similarity index 100%
rename from lib/libc/sys/madvise.2
rename to lib/libsys/madvise.2
diff --git a/lib/libc/sys/mincore.2 b/lib/libsys/mincore.2
similarity index 100%
rename from lib/libc/sys/mincore.2
rename to lib/libsys/mincore.2
diff --git a/lib/libc/sys/minherit.2 b/lib/libsys/minherit.2
similarity index 100%
rename from lib/libc/sys/minherit.2
rename to lib/libsys/minherit.2
diff --git a/lib/libc/sys/mkdir.2 b/lib/libsys/mkdir.2
similarity index 100%
rename from lib/libc/sys/mkdir.2
rename to lib/libsys/mkdir.2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libsys/mkfifo.2
similarity index 100%
rename from lib/libc/sys/mkfifo.2
rename to lib/libsys/mkfifo.2
diff --git a/lib/libc/sys/mknod.2 b/lib/libsys/mknod.2
similarity index 100%
rename from lib/libc/sys/mknod.2
rename to lib/libsys/mknod.2
diff --git a/lib/libc/sys/mknod.c b/lib/libsys/mknod.c
similarity index 100%
rename from lib/libc/sys/mknod.c
rename to lib/libsys/mknod.c
diff --git a/lib/libc/sys/mlock.2 b/lib/libsys/mlock.2
similarity index 100%
rename from lib/libc/sys/mlock.2
rename to lib/libsys/mlock.2
diff --git a/lib/libc/sys/mlockall.2 b/lib/libsys/mlockall.2
similarity index 100%
rename from lib/libc/sys/mlockall.2
rename to lib/libsys/mlockall.2
diff --git a/lib/libc/sys/mmap.2 b/lib/libsys/mmap.2
similarity index 100%
rename from lib/libc/sys/mmap.2
rename to lib/libsys/mmap.2
diff --git a/lib/libc/sys/modfind.2 b/lib/libsys/modfind.2
similarity index 100%
rename from lib/libc/sys/modfind.2
rename to lib/libsys/modfind.2
diff --git a/lib/libc/sys/modnext.2 b/lib/libsys/modnext.2
similarity index 100%
rename from lib/libc/sys/modnext.2
rename to lib/libsys/modnext.2
diff --git a/lib/libc/sys/modstat.2 b/lib/libsys/modstat.2
similarity index 100%
rename from lib/libc/sys/modstat.2
rename to lib/libsys/modstat.2
diff --git a/lib/libc/sys/mount.2 b/lib/libsys/mount.2
similarity index 100%
rename from lib/libc/sys/mount.2
rename to lib/libsys/mount.2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libsys/mprotect.2
similarity index 100%
rename from lib/libc/sys/mprotect.2
rename to lib/libsys/mprotect.2
diff --git a/lib/libc/sys/mq_close.2 b/lib/libsys/mq_close.2
similarity index 100%
rename from lib/libc/sys/mq_close.2
rename to lib/libsys/mq_close.2
diff --git a/lib/libc/sys/mq_getattr.2 b/lib/libsys/mq_getattr.2
similarity index 100%
rename from lib/libc/sys/mq_getattr.2
rename to lib/libsys/mq_getattr.2
diff --git a/lib/libc/sys/mq_notify.2 b/lib/libsys/mq_notify.2
similarity index 100%
rename from lib/libc/sys/mq_notify.2
rename to lib/libsys/mq_notify.2
diff --git a/lib/libc/sys/mq_open.2 b/lib/libsys/mq_open.2
similarity index 100%
rename from lib/libc/sys/mq_open.2
rename to lib/libsys/mq_open.2
diff --git a/lib/libc/sys/mq_receive.2 b/lib/libsys/mq_receive.2
similarity index 100%
rename from lib/libc/sys/mq_receive.2
rename to lib/libsys/mq_receive.2
diff --git a/lib/libc/sys/mq_send.2 b/lib/libsys/mq_send.2
similarity index 100%
rename from lib/libc/sys/mq_send.2
rename to lib/libsys/mq_send.2
diff --git a/lib/libc/sys/mq_setattr.2 b/lib/libsys/mq_setattr.2
similarity index 100%
rename from lib/libc/sys/mq_setattr.2
rename to lib/libsys/mq_setattr.2
diff --git a/lib/libc/sys/mq_unlink.2 b/lib/libsys/mq_unlink.2
similarity index 100%
rename from lib/libc/sys/mq_unlink.2
rename to lib/libsys/mq_unlink.2
diff --git a/lib/libc/sys/msgctl.2 b/lib/libsys/msgctl.2
similarity index 100%
rename from lib/libc/sys/msgctl.2
rename to lib/libsys/msgctl.2
diff --git a/lib/libc/sys/msgget.2 b/lib/libsys/msgget.2
similarity index 100%
rename from lib/libc/sys/msgget.2
rename to lib/libsys/msgget.2
diff --git a/lib/libc/sys/msgrcv.2 b/lib/libsys/msgrcv.2
similarity index 100%
rename from lib/libc/sys/msgrcv.2
rename to lib/libsys/msgrcv.2
diff --git a/lib/libc/sys/msgsnd.2 b/lib/libsys/msgsnd.2
similarity index 100%
rename from lib/libc/sys/msgsnd.2
rename to lib/libsys/msgsnd.2
diff --git a/lib/libc/sys/msync.2 b/lib/libsys/msync.2
similarity index 100%
rename from lib/libc/sys/msync.2
rename to lib/libsys/msync.2
diff --git a/lib/libc/sys/msync.c b/lib/libsys/msync.c
similarity index 100%
rename from lib/libc/sys/msync.c
rename to lib/libsys/msync.c
diff --git a/lib/libc/sys/munmap.2 b/lib/libsys/munmap.2
similarity index 100%
rename from lib/libc/sys/munmap.2
rename to lib/libsys/munmap.2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libsys/nanosleep.2
similarity index 100%
rename from lib/libc/sys/nanosleep.2
rename to lib/libsys/nanosleep.2
diff --git a/lib/libc/sys/nanosleep.c b/lib/libsys/nanosleep.c
similarity index 100%
rename from lib/libc/sys/nanosleep.c
rename to lib/libsys/nanosleep.c
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libsys/nfssvc.2
similarity index 100%
rename from lib/libc/sys/nfssvc.2
rename to lib/libsys/nfssvc.2
diff --git a/lib/libc/sys/ntp_adjtime.2 b/lib/libsys/ntp_adjtime.2
similarity index 100%
rename from lib/libc/sys/ntp_adjtime.2
rename to lib/libsys/ntp_adjtime.2
diff --git a/lib/libc/sys/open.2 b/lib/libsys/open.2
similarity index 100%
rename from lib/libc/sys/open.2
rename to lib/libsys/open.2
diff --git a/lib/libc/sys/open.c b/lib/libsys/open.c
similarity index 100%
rename from lib/libc/sys/open.c
rename to lib/libsys/open.c
diff --git a/lib/libc/sys/openat.c b/lib/libsys/openat.c
similarity index 100%
rename from lib/libc/sys/openat.c
rename to lib/libsys/openat.c
diff --git a/lib/libc/sys/pathconf.2 b/lib/libsys/pathconf.2
similarity index 100%
rename from lib/libc/sys/pathconf.2
rename to lib/libsys/pathconf.2
diff --git a/lib/libc/sys/pdfork.2 b/lib/libsys/pdfork.2
similarity index 100%
rename from lib/libc/sys/pdfork.2
rename to lib/libsys/pdfork.2
diff --git a/lib/libc/sys/pdfork.c b/lib/libsys/pdfork.c
similarity index 100%
rename from lib/libc/sys/pdfork.c
rename to lib/libsys/pdfork.c
diff --git a/lib/libc/sys/pipe.2 b/lib/libsys/pipe.2
similarity index 100%
rename from lib/libc/sys/pipe.2
rename to lib/libsys/pipe.2
diff --git a/lib/libc/sys/pipe.c b/lib/libsys/pipe.c
similarity index 100%
rename from lib/libc/sys/pipe.c
rename to lib/libsys/pipe.c
diff --git a/lib/libc/sys/poll.2 b/lib/libsys/poll.2
similarity index 100%
rename from lib/libc/sys/poll.2
rename to lib/libsys/poll.2
diff --git a/lib/libc/sys/poll.c b/lib/libsys/poll.c
similarity index 100%
rename from lib/libc/sys/poll.c
rename to lib/libsys/poll.c
diff --git a/lib/libc/sys/posix_fadvise.2 b/lib/libsys/posix_fadvise.2
similarity index 100%
rename from lib/libc/sys/posix_fadvise.2
rename to lib/libsys/posix_fadvise.2
diff --git a/lib/libc/sys/posix_fallocate.2 b/lib/libsys/posix_fallocate.2
similarity index 100%
rename from lib/libc/sys/posix_fallocate.2
rename to lib/libsys/posix_fallocate.2
diff --git a/lib/libc/sys/posix_openpt.2 b/lib/libsys/posix_openpt.2
similarity index 100%
rename from lib/libc/sys/posix_openpt.2
rename to lib/libsys/posix_openpt.2
diff --git a/lib/libc/powerpc/SYS.h b/lib/libsys/powerpc/SYS.h
similarity index 100%
rename from lib/libc/powerpc/SYS.h
rename to lib/libsys/powerpc/SYS.h
diff --git a/lib/libc/powerpc/sys/cerror.S b/lib/libsys/powerpc/cerror.S
similarity index 100%
rename from lib/libc/powerpc/sys/cerror.S
rename to lib/libsys/powerpc/cerror.S
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libsys/powerpc64/SYS.h
similarity index 100%
rename from lib/libc/powerpc64/SYS.h
rename to lib/libsys/powerpc64/SYS.h
diff --git a/lib/libc/powerpc64/sys/cerror.S b/lib/libsys/powerpc64/cerror.S
similarity index 100%
rename from lib/libc/powerpc64/sys/cerror.S
rename to lib/libsys/powerpc64/cerror.S
diff --git a/lib/libc/sys/ppoll.c b/lib/libsys/ppoll.c
similarity index 100%
rename from lib/libc/sys/ppoll.c
rename to lib/libsys/ppoll.c
diff --git a/lib/libc/sys/procctl.2 b/lib/libsys/procctl.2
similarity index 100%
rename from lib/libc/sys/procctl.2
rename to lib/libsys/procctl.2
diff --git a/lib/libc/sys/profil.2 b/lib/libsys/profil.2
similarity index 100%
rename from lib/libc/sys/profil.2
rename to lib/libsys/profil.2
diff --git a/lib/libc/sys/pselect.2 b/lib/libsys/pselect.2
similarity index 100%
rename from lib/libc/sys/pselect.2
rename to lib/libsys/pselect.2
diff --git a/lib/libc/sys/pselect.c b/lib/libsys/pselect.c
similarity index 100%
rename from lib/libc/sys/pselect.c
rename to lib/libsys/pselect.c
diff --git a/lib/libc/sys/ptrace.2 b/lib/libsys/ptrace.2
similarity index 100%
rename from lib/libc/sys/ptrace.2
rename to lib/libsys/ptrace.2
diff --git a/lib/libc/sys/ptrace.c b/lib/libsys/ptrace.c
similarity index 100%
rename from lib/libc/sys/ptrace.c
rename to lib/libsys/ptrace.c
diff --git a/lib/libc/sys/quotactl.2 b/lib/libsys/quotactl.2
similarity index 100%
rename from lib/libc/sys/quotactl.2
rename to lib/libsys/quotactl.2
diff --git a/lib/libc/sys/rctl_add_rule.2 b/lib/libsys/rctl_add_rule.2
similarity index 100%
rename from lib/libc/sys/rctl_add_rule.2
rename to lib/libsys/rctl_add_rule.2
diff --git a/lib/libc/sys/read.2 b/lib/libsys/read.2
similarity index 100%
rename from lib/libc/sys/read.2
rename to lib/libsys/read.2
diff --git a/lib/libc/sys/read.c b/lib/libsys/read.c
similarity index 100%
rename from lib/libc/sys/read.c
rename to lib/libsys/read.c
diff --git a/lib/libc/sys/readlink.2 b/lib/libsys/readlink.2
similarity index 100%
rename from lib/libc/sys/readlink.2
rename to lib/libsys/readlink.2
diff --git a/lib/libc/sys/readv.c b/lib/libsys/readv.c
similarity index 100%
rename from lib/libc/sys/readv.c
rename to lib/libsys/readv.c
diff --git a/lib/libc/sys/reboot.2 b/lib/libsys/reboot.2
similarity index 100%
rename from lib/libc/sys/reboot.2
rename to lib/libsys/reboot.2
diff --git a/lib/libc/sys/recv.2 b/lib/libsys/recv.2
similarity index 100%
rename from lib/libc/sys/recv.2
rename to lib/libsys/recv.2
diff --git a/lib/libc/sys/recvfrom.c b/lib/libsys/recvfrom.c
similarity index 100%
rename from lib/libc/sys/recvfrom.c
rename to lib/libsys/recvfrom.c
diff --git a/lib/libc/sys/recvmsg.c b/lib/libsys/recvmsg.c
similarity index 100%
rename from lib/libc/sys/recvmsg.c
rename to lib/libsys/recvmsg.c
diff --git a/lib/libc/sys/rename.2 b/lib/libsys/rename.2
similarity index 100%
rename from lib/libc/sys/rename.2
rename to lib/libsys/rename.2
diff --git a/lib/libc/sys/revoke.2 b/lib/libsys/revoke.2
similarity index 100%
rename from lib/libc/sys/revoke.2
rename to lib/libsys/revoke.2
diff --git a/lib/libc/sys/rfork.2 b/lib/libsys/rfork.2
similarity index 100%
rename from lib/libc/sys/rfork.2
rename to lib/libsys/rfork.2
diff --git a/lib/libc/riscv/SYS.h b/lib/libsys/riscv/SYS.h
similarity index 100%
rename from lib/libc/riscv/SYS.h
rename to lib/libsys/riscv/SYS.h
diff --git a/lib/libc/riscv/sys/cerror.S b/lib/libsys/riscv/cerror.S
similarity index 100%
rename from lib/libc/riscv/sys/cerror.S
rename to lib/libsys/riscv/cerror.S
diff --git a/lib/libc/riscv/sys/syscall.S b/lib/libsys/riscv/syscall.S
similarity index 100%
rename from lib/libc/riscv/sys/syscall.S
rename to lib/libsys/riscv/syscall.S
diff --git a/lib/libc/riscv/sys/vfork.S b/lib/libsys/riscv/vfork.S
similarity index 100%
rename from lib/libc/riscv/sys/vfork.S
rename to lib/libsys/riscv/vfork.S
diff --git a/lib/libc/sys/rmdir.2 b/lib/libsys/rmdir.2
similarity index 100%
rename from lib/libc/sys/rmdir.2
rename to lib/libsys/rmdir.2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libsys/rtprio.2
similarity index 100%
rename from lib/libc/sys/rtprio.2
rename to lib/libsys/rtprio.2
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libsys/sched_get_priority_max.2
similarity index 100%
rename from lib/libc/sys/sched_get_priority_max.2
rename to lib/libsys/sched_get_priority_max.2
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libsys/sched_setparam.2
similarity index 100%
rename from lib/libc/sys/sched_setparam.2
rename to lib/libsys/sched_setparam.2
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libsys/sched_setscheduler.2
similarity index 100%
rename from lib/libc/sys/sched_setscheduler.2
rename to lib/libsys/sched_setscheduler.2
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libsys/sched_yield.2
similarity index 100%
rename from lib/libc/sys/sched_yield.2
rename to lib/libsys/sched_yield.2
diff --git a/lib/libc/sys/sctp_generic_recvmsg.2 b/lib/libsys/sctp_generic_recvmsg.2
similarity index 100%
rename from lib/libc/sys/sctp_generic_recvmsg.2
rename to lib/libsys/sctp_generic_recvmsg.2
diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libsys/sctp_generic_sendmsg.2
similarity index 100%
rename from lib/libc/sys/sctp_generic_sendmsg.2
rename to lib/libsys/sctp_generic_sendmsg.2
diff --git a/lib/libc/sys/sctp_peeloff.2 b/lib/libsys/sctp_peeloff.2
similarity index 100%
rename from lib/libc/sys/sctp_peeloff.2
rename to lib/libsys/sctp_peeloff.2
diff --git a/lib/libc/sys/select.2 b/lib/libsys/select.2
similarity index 100%
rename from lib/libc/sys/select.2
rename to lib/libsys/select.2
diff --git a/lib/libc/sys/select.c b/lib/libsys/select.c
similarity index 100%
rename from lib/libc/sys/select.c
rename to lib/libsys/select.c
diff --git a/lib/libc/sys/semctl.2 b/lib/libsys/semctl.2
similarity index 100%
rename from lib/libc/sys/semctl.2
rename to lib/libsys/semctl.2
diff --git a/lib/libc/sys/semget.2 b/lib/libsys/semget.2
similarity index 100%
rename from lib/libc/sys/semget.2
rename to lib/libsys/semget.2
diff --git a/lib/libc/sys/semop.2 b/lib/libsys/semop.2
similarity index 100%
rename from lib/libc/sys/semop.2
rename to lib/libsys/semop.2
diff --git a/lib/libc/sys/send.2 b/lib/libsys/send.2
similarity index 100%
rename from lib/libc/sys/send.2
rename to lib/libsys/send.2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libsys/sendfile.2
similarity index 100%
rename from lib/libc/sys/sendfile.2
rename to lib/libsys/sendfile.2
diff --git a/lib/libc/sys/sendmsg.c b/lib/libsys/sendmsg.c
similarity index 100%
rename from lib/libc/sys/sendmsg.c
rename to lib/libsys/sendmsg.c
diff --git a/lib/libc/sys/sendto.c b/lib/libsys/sendto.c
similarity index 100%
rename from lib/libc/sys/sendto.c
rename to lib/libsys/sendto.c
diff --git a/lib/libc/sys/setcontext.c b/lib/libsys/setcontext.c
similarity index 100%
rename from lib/libc/sys/setcontext.c
rename to lib/libsys/setcontext.c
diff --git a/lib/libc/sys/setfib.2 b/lib/libsys/setfib.2
similarity index 100%
rename from lib/libc/sys/setfib.2
rename to lib/libsys/setfib.2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libsys/setgroups.2
similarity index 100%
rename from lib/libc/sys/setgroups.2
rename to lib/libsys/setgroups.2
diff --git a/lib/libc/sys/setpgid.2 b/lib/libsys/setpgid.2
similarity index 100%
rename from lib/libc/sys/setpgid.2
rename to lib/libsys/setpgid.2
diff --git a/lib/libc/sys/setregid.2 b/lib/libsys/setregid.2
similarity index 100%
rename from lib/libc/sys/setregid.2
rename to lib/libsys/setregid.2
diff --git a/lib/libc/sys/setresuid.2 b/lib/libsys/setresuid.2
similarity index 100%
rename from lib/libc/sys/setresuid.2
rename to lib/libsys/setresuid.2
diff --git a/lib/libc/sys/setreuid.2 b/lib/libsys/setreuid.2
similarity index 100%
rename from lib/libc/sys/setreuid.2
rename to lib/libsys/setreuid.2
diff --git a/lib/libc/sys/setsid.2 b/lib/libsys/setsid.2
similarity index 100%
rename from lib/libc/sys/setsid.2
rename to lib/libsys/setsid.2
diff --git a/lib/libc/sys/setuid.2 b/lib/libsys/setuid.2
similarity index 100%
rename from lib/libc/sys/setuid.2
rename to lib/libsys/setuid.2
diff --git a/lib/libc/sys/shm_open.2 b/lib/libsys/shm_open.2
similarity index 100%
rename from lib/libc/sys/shm_open.2
rename to lib/libsys/shm_open.2
diff --git a/lib/libc/sys/shm_open.c b/lib/libsys/shm_open.c
similarity index 100%
rename from lib/libc/sys/shm_open.c
rename to lib/libsys/shm_open.c
diff --git a/lib/libc/sys/shmat.2 b/lib/libsys/shmat.2
similarity index 100%
rename from lib/libc/sys/shmat.2
rename to lib/libsys/shmat.2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libsys/shmctl.2
similarity index 100%
rename from lib/libc/sys/shmctl.2
rename to lib/libsys/shmctl.2
diff --git a/lib/libc/sys/shmget.2 b/lib/libsys/shmget.2
similarity index 100%
rename from lib/libc/sys/shmget.2
rename to lib/libsys/shmget.2
diff --git a/lib/libc/sys/shutdown.2 b/lib/libsys/shutdown.2
similarity index 100%
rename from lib/libc/sys/shutdown.2
rename to lib/libsys/shutdown.2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libsys/sigaction.2
similarity index 100%
rename from lib/libc/sys/sigaction.2
rename to lib/libsys/sigaction.2
diff --git a/lib/libc/sys/sigaction.c b/lib/libsys/sigaction.c
similarity index 100%
rename from lib/libc/sys/sigaction.c
rename to lib/libsys/sigaction.c
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libsys/sigaltstack.2
similarity index 100%
rename from lib/libc/sys/sigaltstack.2
rename to lib/libsys/sigaltstack.2
diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libsys/sigfastblock.2
similarity index 100%
rename from lib/libc/sys/sigfastblock.2
rename to lib/libsys/sigfastblock.2
diff --git a/lib/libc/sys/sigpending.2 b/lib/libsys/sigpending.2
similarity index 100%
rename from lib/libc/sys/sigpending.2
rename to lib/libsys/sigpending.2
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libsys/sigprocmask.2
similarity index 100%
rename from lib/libc/sys/sigprocmask.2
rename to lib/libsys/sigprocmask.2
diff --git a/lib/libc/sys/sigprocmask.c b/lib/libsys/sigprocmask.c
similarity index 100%
rename from lib/libc/sys/sigprocmask.c
rename to lib/libsys/sigprocmask.c
diff --git a/lib/libc/sys/sigqueue.2 b/lib/libsys/sigqueue.2
similarity index 100%
rename from lib/libc/sys/sigqueue.2
rename to lib/libsys/sigqueue.2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libsys/sigreturn.2
similarity index 100%
rename from lib/libc/sys/sigreturn.2
rename to lib/libsys/sigreturn.2
diff --git a/lib/libc/sys/sigstack.2 b/lib/libsys/sigstack.2
similarity index 100%
rename from lib/libc/sys/sigstack.2
rename to lib/libsys/sigstack.2
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libsys/sigsuspend.2
similarity index 100%
rename from lib/libc/sys/sigsuspend.2
rename to lib/libsys/sigsuspend.2
diff --git a/lib/libc/sys/sigsuspend.c b/lib/libsys/sigsuspend.c
similarity index 100%
rename from lib/libc/sys/sigsuspend.c
rename to lib/libsys/sigsuspend.c
diff --git a/lib/libc/sys/sigtimedwait.c b/lib/libsys/sigtimedwait.c
similarity index 100%
rename from lib/libc/sys/sigtimedwait.c
rename to lib/libsys/sigtimedwait.c
diff --git a/lib/libc/sys/sigwait.2 b/lib/libsys/sigwait.2
similarity index 100%
rename from lib/libc/sys/sigwait.2
rename to lib/libsys/sigwait.2
diff --git a/lib/libc/sys/sigwait.c b/lib/libsys/sigwait.c
similarity index 100%
rename from lib/libc/sys/sigwait.c
rename to lib/libsys/sigwait.c
diff --git a/lib/libc/sys/sigwaitinfo.2 b/lib/libsys/sigwaitinfo.2
similarity index 100%
rename from lib/libc/sys/sigwaitinfo.2
rename to lib/libsys/sigwaitinfo.2
diff --git a/lib/libc/sys/sigwaitinfo.c b/lib/libsys/sigwaitinfo.c
similarity index 100%
rename from lib/libc/sys/sigwaitinfo.c
rename to lib/libsys/sigwaitinfo.c
diff --git a/lib/libc/sys/socket.2 b/lib/libsys/socket.2
similarity index 100%
rename from lib/libc/sys/socket.2
rename to lib/libsys/socket.2
diff --git a/lib/libc/sys/socketpair.2 b/lib/libsys/socketpair.2
similarity index 100%
rename from lib/libc/sys/socketpair.2
rename to lib/libsys/socketpair.2
diff --git a/lib/libc/sys/stat.2 b/lib/libsys/stat.2
similarity index 100%
rename from lib/libc/sys/stat.2
rename to lib/libsys/stat.2
diff --git a/lib/libc/sys/stat.c b/lib/libsys/stat.c
similarity index 100%
rename from lib/libc/sys/stat.c
rename to lib/libsys/stat.c
diff --git a/lib/libc/sys/statfs.2 b/lib/libsys/statfs.2
similarity index 100%
rename from lib/libc/sys/statfs.2
rename to lib/libsys/statfs.2
diff --git a/lib/libc/sys/swapcontext.c b/lib/libsys/swapcontext.c
similarity index 100%
rename from lib/libc/sys/swapcontext.c
rename to lib/libsys/swapcontext.c
diff --git a/lib/libc/sys/swapon.2 b/lib/libsys/swapon.2
similarity index 100%
rename from lib/libc/sys/swapon.2
rename to lib/libsys/swapon.2
diff --git a/lib/libc/sys/symlink.2 b/lib/libsys/symlink.2
similarity index 100%
rename from lib/libc/sys/symlink.2
rename to lib/libsys/symlink.2
diff --git a/lib/libc/sys/sync.2 b/lib/libsys/sync.2
similarity index 100%
rename from lib/libc/sys/sync.2
rename to lib/libsys/sync.2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libsys/sysarch.2
similarity index 100%
rename from lib/libc/sys/sysarch.2
rename to lib/libsys/sysarch.2
diff --git a/lib/libc/sys/syscall.2 b/lib/libsys/syscall.2
similarity index 100%
rename from lib/libc/sys/syscall.2
rename to lib/libsys/syscall.2
diff --git a/lib/libc/sys/thr_exit.2 b/lib/libsys/thr_exit.2
similarity index 100%
rename from lib/libc/sys/thr_exit.2
rename to lib/libsys/thr_exit.2
diff --git a/lib/libc/sys/thr_kill.2 b/lib/libsys/thr_kill.2
similarity index 100%
rename from lib/libc/sys/thr_kill.2
rename to lib/libsys/thr_kill.2
diff --git a/lib/libc/sys/thr_new.2 b/lib/libsys/thr_new.2
similarity index 100%
rename from lib/libc/sys/thr_new.2
rename to lib/libsys/thr_new.2
diff --git a/lib/libc/sys/thr_self.2 b/lib/libsys/thr_self.2
similarity index 100%
rename from lib/libc/sys/thr_self.2
rename to lib/libsys/thr_self.2
diff --git a/lib/libc/sys/thr_set_name.2 b/lib/libsys/thr_set_name.2
similarity index 100%
rename from lib/libc/sys/thr_set_name.2
rename to lib/libsys/thr_set_name.2
diff --git a/lib/libc/sys/thr_suspend.2 b/lib/libsys/thr_suspend.2
similarity index 100%
rename from lib/libc/sys/thr_suspend.2
rename to lib/libsys/thr_suspend.2
diff --git a/lib/libc/sys/thr_wake.2 b/lib/libsys/thr_wake.2
similarity index 100%
rename from lib/libc/sys/thr_wake.2
rename to lib/libsys/thr_wake.2
diff --git a/lib/libc/sys/timer_create.2 b/lib/libsys/timer_create.2
similarity index 100%
rename from lib/libc/sys/timer_create.2
rename to lib/libsys/timer_create.2
diff --git a/lib/libc/sys/timer_delete.2 b/lib/libsys/timer_delete.2
similarity index 100%
rename from lib/libc/sys/timer_delete.2
rename to lib/libsys/timer_delete.2
diff --git a/lib/libc/sys/timer_settime.2 b/lib/libsys/timer_settime.2
similarity index 100%
rename from lib/libc/sys/timer_settime.2
rename to lib/libsys/timer_settime.2
diff --git a/lib/libc/sys/timerfd.2 b/lib/libsys/timerfd.2
similarity index 100%
rename from lib/libc/sys/timerfd.2
rename to lib/libsys/timerfd.2
diff --git a/lib/libc/sys/truncate.2 b/lib/libsys/truncate.2
similarity index 100%
rename from lib/libc/sys/truncate.2
rename to lib/libsys/truncate.2
diff --git a/lib/libc/sys/umask.2 b/lib/libsys/umask.2
similarity index 100%
rename from lib/libc/sys/umask.2
rename to lib/libsys/umask.2
diff --git a/lib/libc/sys/undelete.2 b/lib/libsys/undelete.2
similarity index 100%
rename from lib/libc/sys/undelete.2
rename to lib/libsys/undelete.2
diff --git a/lib/libc/sys/unlink.2 b/lib/libsys/unlink.2
similarity index 100%
rename from lib/libc/sys/unlink.2
rename to lib/libsys/unlink.2
diff --git a/lib/libc/sys/utimensat.2 b/lib/libsys/utimensat.2
similarity index 100%
rename from lib/libc/sys/utimensat.2
rename to lib/libsys/utimensat.2
diff --git a/lib/libc/sys/utimes.2 b/lib/libsys/utimes.2
similarity index 100%
rename from lib/libc/sys/utimes.2
rename to lib/libsys/utimes.2
diff --git a/lib/libc/sys/utrace.2 b/lib/libsys/utrace.2
similarity index 100%
rename from lib/libc/sys/utrace.2
rename to lib/libsys/utrace.2
diff --git a/lib/libc/sys/uuidgen.2 b/lib/libsys/uuidgen.2
similarity index 100%
rename from lib/libc/sys/uuidgen.2
rename to lib/libsys/uuidgen.2
diff --git a/lib/libc/sys/vadvise.c b/lib/libsys/vadvise.c
similarity index 100%
rename from lib/libc/sys/vadvise.c
rename to lib/libsys/vadvise.c
diff --git a/lib/libc/sys/vfork.2 b/lib/libsys/vfork.2
similarity index 100%
rename from lib/libc/sys/vfork.2
rename to lib/libsys/vfork.2
diff --git a/lib/libc/sys/wait.2 b/lib/libsys/wait.2
similarity index 100%
rename from lib/libc/sys/wait.2
rename to lib/libsys/wait.2
diff --git a/lib/libc/sys/wait4.c b/lib/libsys/wait4.c
similarity index 100%
rename from lib/libc/sys/wait4.c
rename to lib/libsys/wait4.c
diff --git a/lib/libc/sys/wait6.c b/lib/libsys/wait6.c
similarity index 100%
rename from lib/libc/sys/wait6.c
rename to lib/libsys/wait6.c
diff --git a/lib/libc/sys/write.2 b/lib/libsys/write.2
similarity index 100%
rename from lib/libc/sys/write.2
rename to lib/libsys/write.2
diff --git a/lib/libc/sys/write.c b/lib/libsys/write.c
similarity index 100%
rename from lib/libc/sys/write.c
rename to lib/libsys/write.c
diff --git a/lib/libc/sys/writev.c b/lib/libsys/writev.c
similarity index 100%
rename from lib/libc/sys/writev.c
rename to lib/libsys/writev.c