From 4193279560a81c13e68b1c98621488c201cea759 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 29 Jun 2023 12:41:28 +0200
Subject: [PATCH] base: remove entrypoint.cc from core

Since component.cc is no longer linked to core, we can also remove
entrypoint.cc, which was merely a dependency of component.cc.

Related to issue #4784
---
 repos/base/include/base/entrypoint.h  | 2 +-
 repos/base/lib/mk/base-common.inc     | 2 --
 repos/base/lib/mk/base.inc            | 2 ++
 repos/base/src/core/main.cc           | 4 ----
 repos/base/src/lib/base/entrypoint.cc | 6 ++++++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/repos/base/include/base/entrypoint.h b/repos/base/include/base/entrypoint.h
index 44f21086ea..d1a217d3c9 100644
--- a/repos/base/include/base/entrypoint.h
+++ b/repos/base/include/base/entrypoint.h
@@ -76,7 +76,7 @@ class Genode::Entrypoint : Noncopyable
 				ep(ep)
 			{ start(); }
 
-			void entry() override { ep._process_incoming_signals(); }
+			void entry() override;
 		};
 
 		Env &_env;
diff --git a/repos/base/lib/mk/base-common.inc b/repos/base/lib/mk/base-common.inc
index 28da804027..fc66779e1d 100644
--- a/repos/base/lib/mk/base-common.inc
+++ b/repos/base/lib/mk/base-common.inc
@@ -22,13 +22,11 @@ SRC_CC += raw_output.cc
 SRC_CC += rpc_entrypoint.cc
 SRC_CC += signal_common.cc
 SRC_CC += sleep.cc
-SRC_CC += entrypoint.cc
 SRC_CC += region_map_client.cc
 SRC_CC += rm_session_client.cc
 SRC_CC += stack_allocator.cc
 SRC_CC += trace.cc
 SRC_CC += trace_buffer.cc
-SRC_CC += root_proxy.cc
 SRC_CC += env_session_id_space.cc
 SRC_CC += stack_protector.cc
 SRC_CC += xml_generator.cc
diff --git a/repos/base/lib/mk/base.inc b/repos/base/lib/mk/base.inc
index d81658b6b7..80a88f4cd6 100644
--- a/repos/base/lib/mk/base.inc
+++ b/repos/base/lib/mk/base.inc
@@ -1,6 +1,8 @@
 SRC_CC += component.cc
 SRC_CC += default_log.cc
+SRC_CC += entrypoint.cc
 SRC_CC += platform.cc stack_area.cc
+SRC_CC += root_proxy.cc
 SRC_CC += rpc_cap_alloc.cc heartbeat.cc
 SRC_CC += vm.cc
 
diff --git a/repos/base/src/core/main.cc b/repos/base/src/core/main.cc
index f505113fe8..8bba90ce3b 100644
--- a/repos/base/src/core/main.cc
+++ b/repos/base/src/core/main.cc
@@ -221,10 +221,6 @@ namespace Genode {
 }
 
 
-/* expected by entrypoint.cc */
-Genode::size_t Component::stack_size() { return 64*1024; }
-
-
 void Genode::bootstrap_component(Genode::Platform &)
 {
 	init_exception_handling(*core_env().pd_session(), core_env().local_rm());
diff --git a/repos/base/src/lib/base/entrypoint.cc b/repos/base/src/lib/base/entrypoint.cc
index 33fa699b08..f3b6dd6434 100644
--- a/repos/base/src/lib/base/entrypoint.cc
+++ b/repos/base/src/lib/base/entrypoint.cc
@@ -72,6 +72,12 @@ void Entrypoint::Signal_proxy_component::signal()
 }
 
 
+void Entrypoint::Signal_proxy_thread::entry()
+{
+	ep._process_incoming_signals();
+}
+
+
 void Entrypoint::_dispatch_signal(Signal &sig)
 {
 	Signal_dispatcher_base *dispatcher = 0;