From abb2045e171e063a30e57de095e99a20a3ba2f5a Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 14 Mar 2024 09:26:26 +0100 Subject: [PATCH] Remove exec_static_constructors from dde_linux drivers This is a follow-up commit to "lx_emul: generate initcalls during build". Issue #5096 --- repos/dde_linux/src/app/wireguard/main.cc | 6 ------ repos/dde_linux/src/test/driver_time/main.cc | 2 -- repos/pc/src/drivers/framebuffer/intel/pc/main.cc | 1 - repos/pc/src/drivers/nic/pc/main.cc | 2 -- 4 files changed, 11 deletions(-) diff --git a/repos/dde_linux/src/app/wireguard/main.cc b/repos/dde_linux/src/app/wireguard/main.cc index cf8279e3b4..4838777cfb 100644 --- a/repos/dde_linux/src/app/wireguard/main.cc +++ b/repos/dde_linux/src/app/wireguard/main.cc @@ -92,12 +92,6 @@ class Wireguard::Main : private Entrypoint::Io_progress_handler, { Lx_kit::initialize(_env, _signal_handler); - /* - * We have to call the static constructors because otherwise the - * initcall list of the LX kit won't get populated. - */ - _env.exec_static_constructors(); - _config_rom.sigh(_config_handler); _handle_config(); diff --git a/repos/dde_linux/src/test/driver_time/main.cc b/repos/dde_linux/src/test/driver_time/main.cc index f51a572938..e82bb89efd 100644 --- a/repos/dde_linux/src/test/driver_time/main.cc +++ b/repos/dde_linux/src/test/driver_time/main.cc @@ -44,8 +44,6 @@ struct Test::Driver { Lx_kit::initialize(env, _signal_handler); - env.exec_static_constructors(); - try { Attached_rom_dataspace info(env, "platform_info"); tsc_freq_khz = info.xml().sub_node("hardware").sub_node("tsc") diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/main.cc b/repos/pc/src/drivers/framebuffer/intel/pc/main.cc index 0d3e6170d9..f8a57f2d01 100644 --- a/repos/pc/src/drivers/framebuffer/intel/pc/main.cc +++ b/repos/pc/src/drivers/framebuffer/intel/pc/main.cc @@ -119,7 +119,6 @@ struct Framebuffer::Driver Driver(Env &env) : env(env) { Lx_kit::initialize(env, scheduler_handler); - env.exec_static_constructors(); config.sigh(config_handler); } diff --git a/repos/pc/src/drivers/nic/pc/main.cc b/repos/pc/src/drivers/nic/pc/main.cc index b7c320e08b..f81f6e0dda 100644 --- a/repos/pc/src/drivers/nic/pc/main.cc +++ b/repos/pc/src/drivers/nic/pc/main.cc @@ -64,8 +64,6 @@ struct Pc::Main { Lx_kit::initialize(env, _signal_handler); - env.exec_static_constructors(); - genode_mac_address_reporter_init(env, Lx_kit::env().heap); genode_uplink_init(genode_env_ptr(env),