From 5a2e7a8d66ed69a8b2d375c316b2ca6bfe69e82f Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 6 May 2019 14:13:58 +0200 Subject: [PATCH] base-sel4: fix compile errors with GCC 8.3.0 Fixes #3328 --- repos/base-sel4/src/core/platform.cc | 2 +- repos/base-sel4/src/core/ram_dataspace_support.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/base-sel4/src/core/platform.cc b/repos/base-sel4/src/core/platform.cc index c79cfd1e2a..1d9a07498f 100644 --- a/repos/base-sel4/src/core/platform.cc +++ b/repos/base-sel4/src/core/platform.cc @@ -386,7 +386,7 @@ void Platform::_init_rom_modules() addr_t const boot_info_extra = boot_info_page + 4096; seL4_BootInfoHeader const * element = reinterpret_cast(boot_info_extra); - seL4_BootInfoHeader const * const last = reinterpret_cast(boot_info_extra + bi.extraLen); + seL4_BootInfoHeader const * const last = reinterpret_cast(boot_info_extra + bi.extraLen); for (seL4_BootInfoHeader const *next = nullptr; (next = reinterpret_cast(reinterpret_cast(element) + element->len)) && diff --git a/repos/base-sel4/src/core/ram_dataspace_support.cc b/repos/base-sel4/src/core/ram_dataspace_support.cc index 7b7608911c..f5ccb4dd4a 100644 --- a/repos/base-sel4/src/core/ram_dataspace_support.cc +++ b/repos/base-sel4/src/core/ram_dataspace_support.cc @@ -49,7 +49,7 @@ void Ram_dataspace_factory::_clear_ds (Dataspace_component &ds) if (!virt_addr_ptr) ASSERT_NEVER_CALLED; - addr_t const virt_addr = reinterpret_cast(virt_addr_ptr); + addr_t const virt_addr = reinterpret_cast(virt_addr_ptr); /* map each page of dataspace one at a time and clear it */ for (addr_t offset = 0; offset < page_rounded_size; offset += get_page_size())