From 4fc3eca4aa5ae6a5aeaef5e612625be1f394551b Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 6 May 2019 14:06:50 +0200 Subject: [PATCH] base-hw: fix compile errors with GCC 8.3.0 Fixes #3326 --- .../src/core/spec/arm_v7/trustzone/kernel/vm.cc | 2 +- .../core/spec/arm_v7/virtualization/kernel/vm.cc | 2 +- .../src/core/spec/x86_64/muen/kernel/vm.cc | 2 +- .../src/include/hw/spec/x86_64/acpi_rsdp.h | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc index 0a6f7f8e9..a1ae65eb9 100644 --- a/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/trustzone/kernel/vm.cc @@ -25,7 +25,7 @@ Kernel::Vm::Vm(void * const state, void * const /* table */) : Cpu_job(Cpu_priority::MIN, 0), - _state((Genode::Vm_state * const)state), + _state((Genode::Vm_state *)state), _context(context), _table(0) { affinity(cpu_pool().primary_cpu()); diff --git a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc index 0a4d8e4f7..a256d366b 100644 --- a/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/arm_v7/virtualization/kernel/vm.cc @@ -210,7 +210,7 @@ Kernel::Vm::Vm(void * const state, void * const table) : Cpu_job(Cpu_priority::MIN, 0), _id(alloc().alloc()), - _state((Genode::Vm_state * const)state), + _state((Genode::Vm_state *)state), _context(context), _table(table) { diff --git a/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc index 0e776e009..a6aa645de 100644 --- a/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc +++ b/repos/base-hw/src/core/spec/x86_64/muen/kernel/vm.cc @@ -23,7 +23,7 @@ Kernel::Vm::Vm(void * const state, Kernel::Signal_context * const context, void * const) : Cpu_job(Cpu_priority::MIN, 0), - _state((Genode::Vm_state * const) state), + _state((Genode::Vm_state *) state), _context(context), _table(nullptr) { diff --git a/repos/base-hw/src/include/hw/spec/x86_64/acpi_rsdp.h b/repos/base-hw/src/include/hw/spec/x86_64/acpi_rsdp.h index 849157cd7..dfc723c10 100644 --- a/repos/base-hw/src/include/hw/spec/x86_64/acpi_rsdp.h +++ b/repos/base-hw/src/include/hw/spec/x86_64/acpi_rsdp.h @@ -22,14 +22,14 @@ namespace Hw { struct Hw::Acpi_rsdp { - Genode::uint64_t signature; - Genode::uint8_t checksum; - char oem[6]; - Genode::uint8_t revision; - Genode::uint32_t rsdt; - Genode::uint32_t length; - Genode::uint64_t xsdt; - Genode::uint32_t reserved; + Genode::uint64_t signature { 0 }; + Genode::uint8_t checksum { 0 }; + char oem[6] { 0 }; + Genode::uint8_t revision { 0 }; + Genode::uint32_t rsdt { 0 }; + Genode::uint32_t length { 0 }; + Genode::uint64_t xsdt { 0 }; + Genode::uint32_t reserved { 0 }; bool valid() { const char sign[] = "RSD PTR ";