ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 10:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpica: remove static constructor from lib

Browse Source 
Issue #5083
This commit is contained in:
Christian Helmuth 2023-12-18 11:38:01 +01:00
parent 87993a864c
commit a5b8090e14
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/libports/src/app/acpica/os.cc
View File

@ -440,8 +440,5 @@ ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 irq, ACPI_OSD_HANDLER handler,
void Component::construct(Env &env)
{
/* XXX execute constructors of global statics */
env.exec_static_constructors();
static Acpica::Main main(env);
}

6
repos/libports/src/lib/acpica/env.cc
View File

@ -29,7 +29,7 @@ struct Acpica::Env
Env(Genode::Env &env, Genode::Allocator &heap) : env(env), heap(heap) { }
};
static Genode::Constructible<Acpica::Env> instance;
static Acpica::Env * instance;
Genode::Allocator & Acpica::heap() { return instance->heap; }
@ -38,5 +38,7 @@ Genode::Env & Acpica::env() { return instance->env; }
void Acpica::init(Genode::Env &env, Genode::Allocator &heap)
{
instance.construct(env, heap);
static Acpica::Env _instance { env, heap };
instance = &_instance;
}