Re-enable musl-defined wrappers

In the previous version, wrappers over system calls (e.g. `read ()`)
were defined in syscall shim layer. Since we want to maintain musl as
vanilla as possible, we have re-introduced these wrappers.

Signed-off-by: Dragos Iulian Argint <dragosargint21@gmail.com>
Reviewed-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #5

diff --git a/Makefile.uk.musl.fcntl b/Makefile.uk.musl.fcntl
index 78a94c81c0258aa8090cdf644386645ca6956077..d6af5df4e66b799dd6581df4f0c94424884dd9e5 100644 (file)
--- a/Makefile.uk.musl.fcntl
+++ b/Makefile.uk.musl.fcntl
@@ -4,11 +4,11 @@ LIBMUSL_FCNTL_HDRS-y += $(LIBMUSL)/src/internal/libc.h
 LIBMUSL_FCNTL_HDRS-y += $(LIBMUSL)/include/stdarg.h
 LIBMUSL_FCNTL_HDRS-y += $(LIBMUSL)/src/internal/syscall.h
 
-#LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/creat.c
-#LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/fcntl.c
-#LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/open.c
-#LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/openat.c
-#LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/posix_fadvise.c
+LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/creat.c
+LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/fcntl.c
+LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/open.c
+LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/openat.c
+LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/posix_fadvise.c
 LIBMUSL_FCNTL_SRCS-y += $(LIBMUSL)/src/fcntl/posix_fallocate.c
 
 $(eval $(call _libmusl_import_lib,fcntl,$(LIBMUSL_FCNTL_HDRS-y),$(LIBMUSL_FCNTL_SRCS-y)))

diff --git a/Makefile.uk.musl.linux b/Makefile.uk.musl.linux
index d797a08be2d70c6e4f15bdd0a571e349079eb629..0bdd2a06e9969b184d53197fac28d250965d4459 100644 (file)
--- a/Makefile.uk.musl.linux
+++ b/Makefile.uk.musl.linux
@@ -43,24 +43,24 @@ LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/arch_prctl.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/brk.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/cache.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/cap.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/chroot.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/chroot.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/clock_adjtime.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/clone.c|linux
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/epoll.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/eventfd.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/fallocate.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/fallocate.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/fanotify.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/flock.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/flock.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/inotify.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/ioperm.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/iopl.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/klogctl.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/module.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/mount.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/mount.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/personality.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/pivot_root.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/ppoll.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/prctl.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/ppoll.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/prctl.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/prlimit.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/process_vm.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/ptrace.c
@@ -77,7 +77,7 @@ LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/setfsuid.c
 ifneq ($(CONFIG_LIBPOSIX_USER),y)
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/setgroups.c
 endif
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sethostname.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sethostname.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/setns.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/settimeofday.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/signalfd.c
@@ -90,11 +90,11 @@ LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sysinfo.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/tee.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/timerfd.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/unshare.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/utimes.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/utimes.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/vhangup.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/vmsplice.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/wait3.c
-#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/wait4.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/wait3.c
+LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/wait4.c
 LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/xattr.c
 #LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/x32/sysinfo.c
 

diff --git a/Makefile.uk.musl.misc b/Makefile.uk.musl.misc
index c82827c15e67da19c56cecc1a1c1fff69a6cd098..e1bf0f23fcca5330c9233bfdeae06d8beb6e2ab9 100644 (file)
--- a/Makefile.uk.musl.misc
+++ b/Makefile.uk.musl.misc
@@ -51,7 +51,7 @@ LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getdomainname.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/gethostid.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getopt.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getopt_long.c
-#LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getpriority.c
+LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getpriority.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getrlimit.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getrusage.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getsubopt.c
@@ -59,7 +59,7 @@ ifneq ($(CONFIG_LIBPOSIX_USER),y)
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getresgid.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getresuid.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/initgroups.c
-#LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/ioctl.c
+LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/ioctl.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/issetugid.c
 endif
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/lockf.c
@@ -71,7 +71,7 @@ LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/ptsname.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/pty.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/realpath.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setdomainname.c
-#LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setpriority.c
+LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setpriority.c
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setrlimit.c
 #LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syscall.c|misc
 LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syslog.c

diff --git a/Makefile.uk.musl.process b/Makefile.uk.musl.process
index 3668708ae0dc2b335fd276eeb8adf70cc62c748b..3211d6de673af59856c95c15f862b5ec6a7be586 100644 (file)
--- a/Makefile.uk.musl.process
+++ b/Makefile.uk.musl.process
@@ -18,10 +18,10 @@ LIBMUSL_PROCESS_HDRS-y += $(LIBMUSL)/include/unistd.h
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execle.c
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execlp.c
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execv.c
-#LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execve.c
+LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execve.c
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/execvp.c
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/fexecve.c
-#LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/fork.c
+LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/fork.c
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/posix_spawn.c
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/posix_spawn_file_actions_addclose.c
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/posix_spawn_file_actions_adddup2.c
@@ -43,7 +43,7 @@ LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/posix_spawnattr_setsigmask.c
 #LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/system.c
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/wait.c
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/waitid.c
-#LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/waitpid.c
+LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/waitpid.c
 
 ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_PROCESS_SRCS-y += $(LIBMUSL)/src/process/i386/vfork.s|i386

diff --git a/Makefile.uk.musl.signal b/Makefile.uk.musl.signal
index a7af11f99fb801a090fc28fb2b67940ee1b7b1c7..bf09ccb4a1c1cc2e6a32873226bd84c1e6cda555 100644 (file)
--- a/Makefile.uk.musl.signal
+++ b/Makefile.uk.musl.signal
@@ -28,7 +28,7 @@ LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/killpg.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/psiginfo.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/psignal.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/raise.c
-#LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/setitimer.c
+LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/setitimer.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/sigaction.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/sigaddset.c
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/sigaltstack.c

diff --git a/Makefile.uk.musl.stat b/Makefile.uk.musl.stat
index 5ecc50bed402d539441f0b57b8beee9aa7995a39..8b3410ef023c34ba660a1751a083b3a75bf3bb31 100644 (file)
--- a/Makefile.uk.musl.stat
+++ b/Makefile.uk.musl.stat
@@ -7,25 +7,25 @@ LIBMUSL_STAT_HDRS-y += $(LIBMUSL)/include/sys/stat.h
 LIBMUSL_STAT_HDRS-y += $(LIBMUSL)/include/sys/statvfs.h
 LIBMUSL_STAT_HDRS-y += $(LIBMUSL)/include/sys/time.h
 
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/__xstat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/chmod.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fchmod.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/__xstat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/chmod.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fchmod.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fchmodat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fstat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fstatat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/futimens.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fstat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/fstatat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/futimens.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/futimesat.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/lchmod.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/lstat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkdir.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/lstat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkdir.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkdirat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkfifo.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkfifo.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mkfifoat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mknod.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mknod.c
 LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/mknodat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/stat.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/statvfs.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/umask.c
-#LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/utimensat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/stat.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/statvfs.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/umask.c
+LIBMUSL_STAT_SRCS-y += $(LIBMUSL)/src/stat/utimensat.c
 
 $(eval $(call _libmusl_import_lib,stat,$(LIBMUSL_STAT_HDRS-y),$(LIBMUSL_STAT_SRCS-y)))

diff --git a/Makefile.uk.musl.stdio b/Makefile.uk.musl.stdio
index 8e4417ec576ceaf7f65e33c99a0c4ad2217a49c3..a3d3c1033cae300de7ef960a76dbdaa826181fc8 100644 (file)
--- a/Makefile.uk.musl.stdio
+++ b/Makefile.uk.musl.stdio
@@ -108,7 +108,7 @@ LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/putw.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/putwc.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/putwchar.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/remove.c
-#LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/rename.c
+LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/rename.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/rewind.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/scanf.c
 LIBMUSL_STDIO_SRCS-y += $(LIBMUSL)/src/stdio/setbuf.c

diff --git a/Makefile.uk.musl.time b/Makefile.uk.musl.time
index 363c089ff8a565925de3d919f202016c8b5a9f64..d8b2d3c266fbdea715316f369eae8ff01e2bb149 100644 (file)
--- a/Makefile.uk.musl.time
+++ b/Makefile.uk.musl.time
@@ -40,26 +40,26 @@ LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/asctime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/asctime_r.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_getcpuclockid.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_getres.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_getres.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_gettime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_nanosleep.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_settime.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/clock_settime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/ctime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/ctime_r.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/difftime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/ftime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/getdate.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/gettimeofday.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/gettimeofday.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/gmtime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/gmtime_r.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/localtime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/localtime_r.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/mktime.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/nanosleep.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/nanosleep.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/strftime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/strptime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/time.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timegm.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timegm.c
 
 ifneq ($(CONFIG_LIBUKTIME),y)
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timer_create.c
@@ -69,9 +69,9 @@ LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timer_settime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timer_getoverrun.c
 endif
 
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/times.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/times.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/timespec_get.c
-#LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/utime.c
+LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/utime.c
 LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/wcsftime.c
 
 $(eval $(call _libmusl_import_lib,time,$(LIBMUSL_TIME_HDRS-y),$(LIBMUSL_TIME_SRCS-y)))

diff --git a/Makefile.uk.musl.unistd b/Makefile.uk.musl.unistd
index 4a4a0901936165de97c973f8741e142b0ecd8231..60b86641f04aecb9dfffb39011929a70adfea495 100644 (file)
--- a/Makefile.uk.musl.unistd
+++ b/Makefile.uk.musl.unistd
@@ -20,24 +20,24 @@ LIBMUSL_UNISTD_HDRS-y += $(LIBMUSL)/include/time.h
 LIBMUSL_UNISTD_HDRS-y += $(LIBMUSL)/include/unistd.h
 
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/_exit.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/access.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/access.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/acct.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/alarm.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/chdir.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/chown.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/close.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/chdir.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/chown.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/close.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ctermid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/dup.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/dup2.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/dup.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/dup2.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/dup3.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/faccessat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchdir.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchown.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/faccessat.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchdir.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchown.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchownat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fdatasync.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fsync.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ftruncate.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getcwd.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fdatasync.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fsync.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ftruncate.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getcwd.c
 ifneq ($(CONFIG_LIBPOSIX_USER),y)
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getegid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/geteuid.c
@@ -52,60 +52,60 @@ ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/gethostname.c
 endif
 
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpgid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpgrp.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getppid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getsid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpgid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpgrp.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getpid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getppid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getsid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/isatty.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/lchown.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/link.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/lchown.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/link.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/linkat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/lseek.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/nice.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/lseek.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/nice.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pause.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pipe.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pipe2.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pipe.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pipe2.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/posix_close.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pread.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/preadv.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pwrite.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pwritev.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/read.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/readlink.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pread.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/preadv.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pwrite.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/pwritev.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/read.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/readlink.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/readlinkat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/readv.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/readv.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/renameat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/rmdir.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/rmdir.c
 ifneq ($(CONFIG_LIBPOSIX_USER),y)
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setegid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/seteuid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setgid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setpgid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setpgrp.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setpgid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setpgrp.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setregid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setresgid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setresuid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setreuid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setuid.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setsid.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setsid.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/setxid.c
 endif
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/sleep.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/symlink.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/sleep.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/symlink.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/symlinkat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/sync.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/tcgetpgrp.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/tcsetpgrp.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/truncate.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/sync.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/tcgetpgrp.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/tcsetpgrp.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/truncate.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ttyname.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ttyname_r.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/ualarm.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/unlink.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/unlink.c
 LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/unlinkat.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/usleep.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/write.c
-#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/writev.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/usleep.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/write.c
+LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/writev.c
 
 #LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/mips/pipe.s
 #LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/mips64/pipe.s