Skip to content

Commit

Permalink
Synchronize musl with POSIX internal libs
Browse files Browse the repository at this point in the history
Signed-off-by: gaulthier gain <[email protected]>
Tested-by: Unikraft CI <[email protected]>
GitHub-Pull-Request: unikraft#3
  • Loading branch information
gaulthiergain authored and unikraft-bot committed Oct 13, 2021
1 parent 4da3806 commit 2479507
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 8 deletions.
2 changes: 2 additions & 0 deletions Makefile.uk.musl.ldso
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ifneq ($(CONFIG_LIBPOSIX_LIBDL),y)
LIBMUSL_LDSO_HDRS-y += $(LIBMUSL)/include/dlfcn.h
LIBMUSL_LDSO_HDRS-y += $(LIBMUSL)/include/elf.h
LIBMUSL_LDSO_HDRS-y += $(LIBMUSL)/src/internal/libc.h
Expand Down Expand Up @@ -31,6 +32,7 @@ LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/tlsdesc.c
LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/dlsym.c
endif

endif
#LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/dlsym.s
#LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/tlsdesc.s
#LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/microblaze/dlsym.s
Expand Down
4 changes: 3 additions & 1 deletion Makefile.uk.musl.linux
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,12 @@ LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/readahead.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/reboot.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/remap_file_pages.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sbrk.c
#LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sendfile.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/sendfile.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/setfsgid.c
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/setns.c
LIBMUSL_LINUX_SRCS-y += $(LIBMUSL)/src/linux/settimeofday.c
Expand Down
6 changes: 4 additions & 2 deletions Makefile.uk.musl.misc
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,16 @@ 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/getresgid.c
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/getresuid.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
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/issetugid.c
endif
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/lockf.c
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/login_tty.c
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/mntent.c
Expand Down
7 changes: 6 additions & 1 deletion Makefile.uk.musl.passwd
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,23 @@ LIBMUSL_PASSWD_HDRS-y += $(LIBMUSL)/include/sys/socket.h
LIBMUSL_PASSWD_HDRS-y += $(LIBMUSL)/include/sys/stat.h
LIBMUSL_PASSWD_HDRS-y += $(LIBMUSL)/include/unistd.h


ifneq ($(CONFIG_LIBPOSIX_USER),y)
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/fgetgrent.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/fgetpwent.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/fgetspent.c

LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgr_a.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgr_r.c

LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgrent.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgrent_a.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgrouplist.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getpw_a.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getpw_r.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getpwent.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getpwent_a.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getgrouplist.c
endif
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getspent.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getspnam.c
LIBMUSL_PASSWD_SRCS-y += $(LIBMUSL)/src/passwd/getspnam_r.c
Expand Down
2 changes: 1 addition & 1 deletion Makefile.uk.musl.time
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ LIBMUSL_TIME_SRCS-y += $(LIBMUSL)/src/time/getdate.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/mktime.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
Expand Down
12 changes: 9 additions & 3 deletions Makefile.uk.musl.unistd
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,23 @@ LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/fchownat.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
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getgid.c
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getgroups.c
#LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/gethostname.c
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin.c
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin_r.c
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getuid.c
else
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/getuid.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
Expand All @@ -71,6 +75,7 @@ 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/renameat.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
Expand All @@ -80,9 +85,10 @@ 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/setsid.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/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/symlinkat.c
Expand Down

0 comments on commit 2479507

Please sign in to comment.