From: Andrei Tatar Date: Wed, 5 Feb 2025 15:40:27 +0000 (+0100) Subject: lib/posix-*: Makefile: guard syscalls behind fdtab X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d4394a1c7e5124633668c55ca5267c9914798019;p=unikraft%2Funikraft.git lib/posix-*: Makefile: guard syscalls behind fdtab This change adds configuration guards around syscall declarations in Makefiles that depend on posix-fdtab to be enabled. This allows builds of these libs with syscall_shim but fdtab disabled, decoupling them from the fdtab completely. Signed-off-by: Andrei Tatar Approved-by: Sergiu Moga Reviewed-by: Sergiu Moga GitHub-Closes: #1574 --- diff --git a/lib/posix-eventfd/Makefile.uk b/lib/posix-eventfd/Makefile.uk index e89d1c065..701c0e187 100644 --- a/lib/posix-eventfd/Makefile.uk +++ b/lib/posix-eventfd/Makefile.uk @@ -5,5 +5,7 @@ CXXINCLUDES-$(CONFIG_LIBPOSIX_EVENTFD) += -I$(LIBPOSIX_EVENTFD_BASE)/include LIBPOSIX_EVENTFD_SRCS-y += $(LIBPOSIX_EVENTFD_BASE)/eventfd.c +ifeq ($(CONFIG_LIBPOSIX_FDTAB), y) UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_EVENTFD) += eventfd-1 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_EVENTFD) += eventfd2-2 +endif diff --git a/lib/posix-fdio/Makefile.uk b/lib/posix-fdio/Makefile.uk index 86b22f233..3a5665768 100644 --- a/lib/posix-fdio/Makefile.uk +++ b/lib/posix-fdio/Makefile.uk @@ -8,6 +8,7 @@ LIBPOSIX_FDIO_SRCS-y += $(LIBPOSIX_FDIO_BASE)/fdstat.c LIBPOSIX_FDIO_SRCS-y += $(LIBPOSIX_FDIO_BASE)/fdctl.c LIBPOSIX_FDIO_SRCS-$(CONFIG_LIBPOSIX_FDTAB) += $(LIBPOSIX_FDIO_BASE)/fd-shim.c +ifeq ($(CONFIG_LIBPOSIX_FDTAB), y) UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += preadv2-5 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += preadv-4 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += pread64-4 @@ -24,3 +25,4 @@ UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += fstat-2 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += fcntl-3 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FDIO) += ioctl-3 +endif diff --git a/lib/posix-pipe/Makefile.uk b/lib/posix-pipe/Makefile.uk index 148e90c1e..d67d88119 100644 --- a/lib/posix-pipe/Makefile.uk +++ b/lib/posix-pipe/Makefile.uk @@ -5,5 +5,7 @@ CXXINCLUDES-$(CONFIG_LIBPOSIX_PIPE) += -I$(LIBPOSIX_PIPE_BASE)/include LIBPOSIX_PIPE_SRCS-y += $(LIBPOSIX_PIPE_BASE)/pipe.c +ifeq ($(CONFIG_LIBPOSIX_FDTAB), y) UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_PIPE) += pipe-1 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_PIPE) += pipe2-2 +endif diff --git a/lib/posix-socket/Makefile.uk b/lib/posix-socket/Makefile.uk index 69fce8e80..5601e3906 100644 --- a/lib/posix-socket/Makefile.uk +++ b/lib/posix-socket/Makefile.uk @@ -12,6 +12,7 @@ LIBPOSIX_SOCKET_SRCS-y += $(LIBPOSIX_SOCKET_BASE)/driver.c LIBPOSIX_SOCKET_SRCS-y += $(LIBPOSIX_SOCKET_BASE)/socket.c LIBPOSIX_SOCKET_SRCS-y += $(LIBPOSIX_SOCKET_BASE)/driver_list.ld +ifeq ($(CONFIG_LIBPOSIX_FDTAB), y) UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += socket-3 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += accept-3 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += accept4-4 @@ -28,3 +29,4 @@ UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += sendto-6 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += sendmsg-3 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += socketpair-4 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_SOCKET) += shutdown-2 +endif diff --git a/lib/posix-timerfd/Makefile.uk b/lib/posix-timerfd/Makefile.uk index e5f010ce4..7b5b00bf5 100644 --- a/lib/posix-timerfd/Makefile.uk +++ b/lib/posix-timerfd/Makefile.uk @@ -5,6 +5,8 @@ CXXINCLUDES-$(CONFIG_LIBPOSIX_TIMERFD) += -I$(LIBPOSIX_TIMERFD_BASE)/include LIBPOSIX_TIMERFD_SRCS-y += $(LIBPOSIX_TIMERFD_BASE)/timerfd.c +ifeq ($(CONFIG_LIBPOSIX_FDTAB), y) UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_TIMERFD) += timerfd_create-2 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_TIMERFD) += timerfd_settime-4 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_TIMERFD) += timerfd_gettime-2 +endif