diff --git a/repos/libports/lib/mk/libc.mk b/repos/libports/lib/mk/libc.mk index b634f4fc10..da03546f38 100644 --- a/repos/libports/lib/mk/libc.mk +++ b/repos/libports/lib/mk/libc.mk @@ -17,7 +17,7 @@ SRC_CC = atexit.cc dummies.cc rlimit.cc sysctl.cc \ plugin.cc plugin_registry.cc select.cc exit.cc environ.cc sleep.cc \ pread_pwrite.cc readv_writev.cc poll.cc \ vfs_plugin.cc dynamic_linker.cc signal.cc \ - socket_operations.cc socket_fs_plugin.cc syscall.cc legacy.cc \ + socket_operations.cc socket_fs_plugin.cc syscall.cc \ getpwent.cc getrandom.cc fork.cc execve.cc kernel.cc component.cc \ genode.cc diff --git a/repos/libports/recipes/api/libc/content.mk b/repos/libports/recipes/api/libc/content.mk index 3d664a812d..20a582ffeb 100644 --- a/repos/libports/recipes/api/libc/content.mk +++ b/repos/libports/recipes/api/libc/content.mk @@ -16,7 +16,6 @@ include: cp -r $(PORT_DIR)/include/* $@/ cp -r $(REP_DIR)/include/libc $@/ cp -r $(REP_DIR)/include/libc-genode $@/ - cp $(REP_DIR)/src/lib/libc/internal/legacy.h $@/libc/ content: lib/mk/ldso_so_support.mk src/lib/ldso/so_support.c diff --git a/repos/libports/src/lib/libc/fork.cc b/repos/libports/src/lib/libc/fork.cc index c0c5b33360..e98968ede3 100644 --- a/repos/libports/src/lib/libc/fork.cc +++ b/repos/libports/src/lib/libc/fork.cc @@ -34,7 +34,6 @@ /* libc-internal includes */ #include #include -#include #include #include #include diff --git a/repos/libports/src/lib/libc/getpwent.cc b/repos/libports/src/lib/libc/getpwent.cc index bb2c728174..a5c867d786 100644 --- a/repos/libports/src/lib/libc/getpwent.cc +++ b/repos/libports/src/lib/libc/getpwent.cc @@ -21,7 +21,6 @@ #include /* libc-local includes */ -#include #include #include diff --git a/repos/libports/src/lib/libc/internal/kernel.h b/repos/libports/src/lib/libc/internal/kernel.h index 4e4a02bc73..e6ad419c52 100644 --- a/repos/libports/src/lib/libc/internal/kernel.h +++ b/repos/libports/src/lib/libc/internal/kernel.h @@ -502,22 +502,6 @@ struct Libc::Kernel final : Vfs::Io_response_handler, : _pthreads.suspend_myself(check, timeout_ms); } - void dispatch_pending_io_signals() - { - if (!_main_context()) return; - - if (!_setjmp(_user_context)) { - _valid_user_context = true; - _dispatch_pending_io_signals = true; - _resume_main_once = true; /* afterwards resume main */ - _switch_to_kernel(); - } else { - _valid_user_context = false; - _dispatch_pending_io_signals = false; - _signal.execute_signal_handlers(); - } - } - /** * Monitor interface */ diff --git a/repos/libports/src/lib/libc/internal/legacy.h b/repos/libports/src/lib/libc/internal/legacy.h deleted file mode 100644 index 3078aa53f9..0000000000 --- a/repos/libports/src/lib/libc/internal/legacy.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * \brief Globally available accessors to Libc kernel functionality - * \author Norman Feske - * \date 2019-09-18 - */ - -/* - * Copyright (C) 2016-2019 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef _LIBC__INTERNAL__LEGACY_H_ -#define _LIBC__INTERNAL__LEGACY_H_ - -/* Genode includes */ -#include /* needed for 'watch' */ - -/* libc-internal includes */ -#include - -namespace Libc { - - /* - * XXX called only by 'Libc::Vfs_plugin::read' - */ - void dispatch_pending_io_signals(); -} - -#endif /* _LIBC__INTERNAL__LEGACY_H_ */ diff --git a/repos/libports/src/lib/libc/internal/pthread_pool.h b/repos/libports/src/lib/libc/internal/pthread_pool.h index ac8ed68e4f..c4f396905a 100644 --- a/repos/libports/src/lib/libc/internal/pthread_pool.h +++ b/repos/libports/src/lib/libc/internal/pthread_pool.h @@ -16,7 +16,6 @@ #define _LIBC__INTERNAL__PTHREAD_POOL_H_ /* libc-internal includes */ -#include #include namespace Libc { class Pthread_pool; } diff --git a/repos/libports/src/lib/libc/legacy.cc b/repos/libports/src/lib/libc/legacy.cc deleted file mode 100644 index c42d1fa092..0000000000 --- a/repos/libports/src/lib/libc/legacy.cc +++ /dev/null @@ -1,26 +0,0 @@ -/* - * \brief Globally available accessors to Libc kernel functionality - * \author Norman Feske - * \date 2019-09-18 - * - * XXX eliminate the need for these functions, or - * turn them into regular members of 'Libc::Kernel' - */ - -/* - * Copyright (C) 2019 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* libc-internal includes */ -#include -#include - - -void Libc::dispatch_pending_io_signals() -{ - Kernel::kernel().dispatch_pending_io_signals(); -} - diff --git a/repos/libports/src/lib/libc/time.cc b/repos/libports/src/lib/libc/time.cc index 2000304ab2..0ec663caa4 100644 --- a/repos/libports/src/lib/libc/time.cc +++ b/repos/libports/src/lib/libc/time.cc @@ -27,7 +27,6 @@ #include /* libc-internal includes */ -#include #include #include #include diff --git a/repos/libports/src/lib/libc/vfs_plugin.cc b/repos/libports/src/lib/libc/vfs_plugin.cc index 35a2e8c681..dbdbe16056 100644 --- a/repos/libports/src/lib/libc/vfs_plugin.cc +++ b/repos/libports/src/lib/libc/vfs_plugin.cc @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -951,9 +950,6 @@ ssize_t Libc::Vfs_plugin::write(File_descriptor *fd, const void *buf, ssize_t Libc::Vfs_plugin::read(File_descriptor *fd, void *buf, ::size_t count) { - /* TODO why is this required? */ - dispatch_pending_io_signals(); - if ((fd->flags & O_ACCMODE) == O_WRONLY) { return Errno(EBADF); }